Skip to content

Commit

Permalink
Merge pull request #78 from Gizra/77-coding-standards
Browse files Browse the repository at this point in the history
Fix coding standards
  • Loading branch information
jhedstrom authored Mar 6, 2017
2 parents 764bc74 + 35e826a commit 9da6795
Show file tree
Hide file tree
Showing 14 changed files with 5 additions and 37 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ php:

env:
matrix:
- DRUPAL_CORE=8.2.x
- DRUPAL_CORE=8.3.x
- DRUPAL_CORE=8.4.x
global:
MODULE_NAME='message_subscribe'
CODER_VERSION='8.2.*'
Expand Down Expand Up @@ -72,7 +72,7 @@ before_script:

script:
# Coding standards.
- $HOME/.composer/vendor/bin/phpcs --report=full --standard=Drupal $TESTDIR
- $HOME/.composer/vendor/bin/phpcs --report=full --standard=Drupal --severity=error $TESTDIR
# Run the PHPUnit tests which also include the kernel tests.
- ./vendor/phpunit/phpunit/phpunit -c ./core/phpunit.xml.dist ./modules/$MODULE_NAME
# Run legacy simpletests.
Expand Down
2 changes: 0 additions & 2 deletions message_subscribe.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: 'Message subscribe'
description: 'Subscribe API for the Message and Message notify modules.'
core: 8.x
package: Message
php: 5.2.4
project: message_subscribe
dependencies:
- flag
- message
Expand Down
2 changes: 1 addition & 1 deletion message_subscribe_email/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ MAIN CONCEPTS
3) You can use message_subscribe_get_subscribers() to get the list of email
subscribers.
4) Use message_subscribe_send_message() to handle emailing the list of
subscribers.
subscribers.
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ settings:
on_label: Email
off_label: 'Don''t email'
field_type: boolean

Original file line number Diff line number Diff line change
Expand Up @@ -361,4 +361,3 @@ display:
- 'user.node_grants:view'
- user.permissions
tags: { }

Original file line number Diff line number Diff line change
Expand Up @@ -333,4 +333,3 @@ display:
- url.query_args
- user.permissions
tags: { }

Original file line number Diff line number Diff line change
Expand Up @@ -341,4 +341,3 @@ display:
- url.query_args
- user.permissions
tags: { }

1 change: 0 additions & 1 deletion message_subscribe_email/message_subscribe_email.info.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: 'Message subscribe email'
core: 8.x
project: message_subscribe
package: Message
dependencies:
- message_subscribe_ui
Expand Down
24 changes: 1 addition & 23 deletions message_subscribe_email/message_subscribe_email.install
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

/**
* @file
* Install, update, and uninstall functions for the message_subscribe_email module.
* Install hooks for the message_subscribe_email module.
*/

use Drupal\Core\Entity\Entity\EntityFormDisplay;

/**
* Implements hook_install().
*
Expand Down Expand Up @@ -48,23 +46,3 @@ function message_subscribe_email_install() {
}
}
}

/**
* Implements hook_uninstall().
*/
function message_subscribe_email_uninstall() {
// Revert message to default values if they haven't been changed.
$variables = [
'message_subscribe_node' => 'subscribe_node_email:default',
'message_subscribe_term' => 'subscribe_taxonomy_term_email:default',
'message_subscribe_user' => 'subscribe_user_email:default',
// Revert OG in case it exists.
'message_subscribe_og' => 'subscribe_node_email:default',
];

foreach ($variables as $name => $value) {
// if (variable_get($name) == $value) {
// variable_del($name);
// }
}
}
1 change: 1 addition & 0 deletions message_subscribe_email/message_subscribe_email.module
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* @file
* Code for the message subscribe email feature.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use Drupal\Tests\message_subscribe\Kernel\MessageSubscribeTestBase;

/**
* @file
* Test base for message subscribe email tests.
*/
abstract class MessageSubscribeEmailTestBase extends MessageSubscribeTestBase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,4 +299,3 @@ display:
- 'user.node_grants:view'
- user.permissions
tags: { }

Original file line number Diff line number Diff line change
Expand Up @@ -271,4 +271,3 @@ display:
- url.query_args
- user.permissions
tags: { }

Original file line number Diff line number Diff line change
Expand Up @@ -279,4 +279,3 @@ display:
- url.query_args
- user.permissions
tags: { }

0 comments on commit 9da6795

Please sign in to comment.