diff --git a/core/modules/action/action.api.php b/core/modules/action/action.api.php
index bdd7c0f..e1a3f4c 100644
--- a/core/modules/action/action.api.php
+++ b/core/modules/action/action.api.php
@@ -8,7 +8,7 @@
 /**
  * Executes code after an action is deleted.
  *
- * @param $aid
+ * @param string $aid
  *   The action ID.
  */
 function hook_action_delete($aid) {
diff --git a/core/modules/action/src/ActionFormBase.php b/core/modules/action/src/ActionFormBase.php
index 0b972d4..8f7203c 100644
--- a/core/modules/action/src/ActionFormBase.php
+++ b/core/modules/action/src/ActionFormBase.php
@@ -101,7 +101,7 @@ public function form(array $form, FormStateInterface $form_state) {
    * Determines if the action already exists.
    *
    * @param string $id
-   *   The action ID
+   *   The action ID.
    *
    * @return bool
    *   TRUE if the action exists, FALSE otherwise.
diff --git a/core/modules/action/src/ActionListBuilder.php b/core/modules/action/src/ActionListBuilder.php
index 6d8a14d..5e6312d 100644
--- a/core/modules/action/src/ActionListBuilder.php
+++ b/core/modules/action/src/ActionListBuilder.php
@@ -23,6 +23,8 @@
 class ActionListBuilder extends ConfigEntityListBuilder {
 
   /**
+   * Whether or not to have configurable actions.
+   *
    * @var bool
    */
   protected $hasConfigurableActions = FALSE;
diff --git a/core/modules/action/src/Form/ActionAdminManageForm.php b/core/modules/action/src/Form/ActionAdminManageForm.php
index 0c42f18..1c822de 100644
--- a/core/modules/action/src/Form/ActionAdminManageForm.php
+++ b/core/modules/action/src/Form/ActionAdminManageForm.php
@@ -76,7 +76,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#empty_option' => $this->t('Choose an advanced action'),
     );
     $form['parent']['actions'] = array(
-      '#type' => 'actions'
+      '#type' => 'actions',
     );
     $form['parent']['actions']['submit'] = array(
       '#type' => 'submit',
diff --git a/core/modules/action/src/Plugin/Action/EmailAction.php b/core/modules/action/src/Plugin/Action/EmailAction.php
index e56a887..7865993 100644
--- a/core/modules/action/src/Plugin/Action/EmailAction.php
+++ b/core/modules/action/src/Plugin/Action/EmailAction.php
@@ -53,13 +53,14 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug
   protected $logger;
 
   /**
-   * The mail manager
+   * The mail manager.
    *
    * @var \Drupal\Core\Mail\MailManagerInterface
    */
   protected $mailManager;
 
-  /** The language manager.
+  /**
+   * The language manager.
    *
    * @var \Drupal\Core\Language\LanguageManagerInterface
    */
@@ -87,9 +88,9 @@ class EmailAction extends ConfigurableActionBase implements ContainerFactoryPlug
    *   The entity manager.
    * @param \Psr\Log\LoggerInterface $logger
    *   A logger instance.
-   * @param \Drupal\Core\Mail\MailManagerInterface
+   * @param \Drupal\Core\Mail\MailManagerInterface $mail_manager
    *   The mail manager.
-   * @param \Drupal\Core\Language\LanguageManagerInterface
+   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
    * @param \Egulias\EmailValidator\EmailValidator $email_validator
    *   The email validator.
@@ -195,7 +196,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
    */
   public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
     if (!$this->emailValidator->isValid($form_state->getValue('recipient')) && strpos($form_state->getValue('recipient'), ':mail') === FALSE) {
-      // We want the literal %author placeholder to be emphasized in the error message.
+      // We want the %author placeholder to be emphasized in the error message.
       $form_state->setErrorByName('recipient', t('Enter a valid email address or use a token email address such as %author.', array('%author' => '[node:author:mail]')));
     }
   }
diff --git a/core/modules/action/src/Plugin/Action/MessageAction.php b/core/modules/action/src/Plugin/Action/MessageAction.php
index c87b606..d8f26c9 100644
--- a/core/modules/action/src/Plugin/Action/MessageAction.php
+++ b/core/modules/action/src/Plugin/Action/MessageAction.php
@@ -28,6 +28,8 @@
 class MessageAction extends ConfigurableActionBase implements ContainerFactoryPluginInterface {
 
   /**
+   * The token service.
+   *
    * @var \Drupal\Core\Utility\Token
    */
   protected $token;
diff --git a/core/modules/action/src/Plugin/migrate/source/d6/Action.php b/core/modules/action/src/Plugin/migrate/source/d6/Action.php
index 2ca7741..fffe69a 100644
--- a/core/modules/action/src/Plugin/migrate/source/d6/Action.php
+++ b/core/modules/action/src/Plugin/migrate/source/d6/Action.php
@@ -30,7 +30,7 @@ public function query() {
         'parameters',
         'description',
       )
-    );
+      );
     return $query;
   }
 
diff --git a/core/modules/action/src/Tests/ActionUninstallTest.php b/core/modules/action/src/Tests/ActionUninstallTest.php
index bec61d1..3027737 100644
--- a/core/modules/action/src/Tests/ActionUninstallTest.php
+++ b/core/modules/action/src/Tests/ActionUninstallTest.php
@@ -13,6 +13,7 @@
  * Tests that uninstalling actions does not remove other module's actions.
  *
  * @group action
+ *
  * @see \Drupal\action\Plugin\views\field\BulkForm
  */
 class ActionUninstallTest extends WebTestBase {
@@ -30,7 +31,7 @@ class ActionUninstallTest extends WebTestBase {
   public function testActionUninstall() {
     \Drupal::service('module_installer')->uninstall(array('action'));
 
-    $this->assertTrue(entity_load('action', 'user_block_user_action', TRUE), 'Configuration entity \'user_block_user_action\' still exists after uninstalling action module.' );
+    $this->assertTrue(entity_load('action', 'user_block_user_action', TRUE), 'Configuration entity \'user_block_user_action\' still exists after uninstalling action module.');
 
     $admin_user = $this->drupalCreateUser(array('administer users'));
     $this->drupalLogin($admin_user);
diff --git a/core/modules/action/src/Tests/BulkFormTest.php b/core/modules/action/src/Tests/BulkFormTest.php
index 88892c4..9eb6021 100644
--- a/core/modules/action/src/Tests/BulkFormTest.php
+++ b/core/modules/action/src/Tests/BulkFormTest.php
@@ -14,6 +14,7 @@
  * Tests the views bulk form test.
  *
  * @group action
+ *
  * @see \Drupal\action\Plugin\views\field\BulkForm
  */
 class BulkFormTest extends WebTestBase {
diff --git a/core/modules/action/src/Tests/ConfigurationTest.php b/core/modules/action/src/Tests/ConfigurationTest.php
index bff2023..a225960 100644
--- a/core/modules/action/src/Tests/ConfigurationTest.php
+++ b/core/modules/action/src/Tests/ConfigurationTest.php
@@ -11,8 +11,7 @@
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Tests complex actions configuration by adding, editing, and deleting a
- * complex action.
+ * Test actions configuration by adding, editing, and deleting a complex action.
  *
  * @group action
  */
@@ -28,7 +27,7 @@ class ConfigurationTest extends WebTestBase {
   /**
    * Tests configuration of advanced actions through administration interface.
    */
-  function testActionConfiguration() {
+  public function testActionConfiguration() {
     // Create a user with permission to view the actions administration pages.
     $user = $this->drupalCreateUser(array('administer actions'));
     $this->drupalLogin($user);
@@ -89,4 +88,5 @@ function testActionConfiguration() {
     $action = entity_load('action', $aid);
     $this->assertFalse($action, 'Make sure the action is gone after being deleted.');
   }
+
 }
diff --git a/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php b/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php
index 48b1c07..2578d15 100644
--- a/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php
+++ b/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php
@@ -16,6 +16,9 @@
  */
 class ActionLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     $this->directoryList = array('action' => 'core/modules/action');
     parent::setUp();
diff --git a/core/modules/action/tests/src/Unit/Plugin/migrate/source/d6/ActionTest.php b/core/modules/action/tests/src/Unit/Plugin/migrate/source/d6/ActionTest.php
index 148865a..9511f4f 100644
--- a/core/modules/action/tests/src/Unit/Plugin/migrate/source/d6/ActionTest.php
+++ b/core/modules/action/tests/src/Unit/Plugin/migrate/source/d6/ActionTest.php
@@ -30,7 +30,6 @@ class ActionTest extends MigrateSqlSourceTestCase {
   );
 
   // We need to set up the database contents; it's easier to do that below.
-
   protected $expectedResults = array(
     array(
       'aid' => '1',
@@ -50,15 +49,15 @@ class ActionTest extends MigrateSqlSourceTestCase {
       'aid' => 'comment_publish_action',
       'type' => 'comment',
       'callback' => 'comment_publish_action',
-      'parameters' => null,
-      'description' => null,
+      'parameters' => NULL,
+      'description' => NULL,
     ),
     array(
       'aid' => 'node_publish_action',
       'type' => 'comment',
       'callback' => 'node_publish_action',
-      'parameters' => null,
-      'description' => null,
+      'parameters' => NULL,
+      'description' => NULL,
     ),
   );