diff --git a/pathauto.install b/pathauto.install
index ae91fdb..f47eabc 100644
--- a/pathauto.install
+++ b/pathauto.install
@@ -134,7 +134,7 @@ function pathauto_update_8100() {
           $language = NULL;
           preg_match('/^(.*)_([a-z-]*)$/', $bundle, $matches);
           if (count($matches) == 3) {
-            list(, $extracted_bundle, $langcode) = $matches;
+            [, $extracted_bundle, $langcode] = $matches;
             $language = $language_manager->getLanguage($langcode);
           }
           // Validate bundle, langcode and language.
@@ -173,7 +173,7 @@ function pathauto_update_8100() {
             'negate' => FALSE,
             'context_mapping' => [
               'language' => $language_mapping,
-            ]
+            ],
           ]);
 
           // Add the context relationship for this language.
diff --git a/src/AliasCleaner.php b/src/AliasCleaner.php
index 20cdb6d..37e5b0b 100644
--- a/src/AliasCleaner.php
+++ b/src/AliasCleaner.php
@@ -246,7 +246,6 @@ class AliasCleaner implements AliasCleanerInterface {
       $output = strtr($output, $this->cleanStringCache['punctuation']);
     }
 
-
     // Reduce strings to letters and numbers.
     if ($this->cleanStringCache['reduce_ascii']) {
       $output = preg_replace('/[^a-zA-Z0-9\/]+/', $this->cleanStringCache['separator'], $output);
diff --git a/src/Commands/PathautoCommands.php b/src/Commands/PathautoCommands.php
index 9821ebf..8abf212 100644
--- a/src/Commands/PathautoCommands.php
+++ b/src/Commands/PathautoCommands.php
@@ -105,7 +105,7 @@ class PathautoCommands extends DrushCommands {
   }
 
   /**
-   * Delete URL aliases
+   * Delete URL aliases.
    *
    * @command pathauto:aliases-delete
    *
diff --git a/src/Entity/PathautoPattern.php b/src/Entity/PathautoPattern.php
index 2bcfe0d..7c25512 100644
--- a/src/Entity/PathautoPattern.php
+++ b/src/Entity/PathautoPattern.php
@@ -400,7 +400,7 @@ class PathautoPattern extends ConfigEntityBase implements PathautoPatternInterfa
    * object.
    *
    * @param string $token
-   *   A ":" delimited set of tokens representing
+   *   A ":" delimited set of tokens representing.
    * @param \Drupal\Core\Plugin\Context\ContextInterface[] $contexts
    *   The array of available contexts.
    *
@@ -415,7 +415,7 @@ class PathautoPattern extends ConfigEntityBase implements PathautoPatternInterfa
       return $contexts[$token];
     }
     else {
-      list($base, $property_path) = explode(':', $token, 2);
+      [$base, $property_path] = explode(':', $token, 2);
       // A base must always be set. This method recursively calls itself
       // setting bases for this reason.
       if (!empty($contexts[$base])) {
diff --git a/src/Form/PatternEditForm.php b/src/Form/PatternEditForm.php
index a8dbf8e..2db7640 100644
--- a/src/Form/PatternEditForm.php
+++ b/src/Form/PatternEditForm.php
@@ -110,7 +110,7 @@ class PatternEditForm extends EntityForm {
       '#suffix' => '</div>',
     ];
 
-    // if there is no type yet, stop here.
+    // If there is no type yet, stop here.
     if ($this->entity->getType()) {
 
       $alias_type = $this->entity->getAliasType();
@@ -237,7 +237,7 @@ class PatternEditForm extends EntityForm {
             'negate' => FALSE,
             'context_mapping' => [
               $entity_type => $entity_type,
-            ]
+            ],
           ]
         );
       }
@@ -252,7 +252,7 @@ class PatternEditForm extends EntityForm {
             'negate' => FALSE,
             'context_mapping' => [
               'language' => $language_mapping,
-            ]
+            ],
           ]
         );
         $entity->addRelationship($language_mapping, $this->t('Language'));
diff --git a/src/PathautoFieldItemList.php b/src/PathautoFieldItemList.php
index 300675c..9c378ed 100644
--- a/src/PathautoFieldItemList.php
+++ b/src/PathautoFieldItemList.php
@@ -4,6 +4,9 @@ namespace Drupal\pathauto;
 
 use Drupal\path\Plugin\Field\FieldType\PathFieldItemList;
 
+/**
+ *
+ */
 class PathautoFieldItemList extends PathFieldItemList {
 
   /**
diff --git a/src/PathautoGeneratorInterface.php b/src/PathautoGeneratorInterface.php
index 1c19bcb..afb52e9 100644
--- a/src/PathautoGeneratorInterface.php
+++ b/src/PathautoGeneratorInterface.php
@@ -73,13 +73,13 @@ interface PathautoGeneratorInterface {
   /**
    * Creates or updates an alias for the given entity.
    *
-   * @param EntityInterface $entity
+   * @param \Drupal\Core\Entity\EntityInterface $entity
    *   Entity for which to update the alias.
    * @param string $op
    *   The operation performed (insert, update)
    * @param array $options
    *   - force: will force updating the path
-   *   - language: the language for which to create the alias
+   *   - language: the language for which to create the alias.
    *
    * @return array|null
    *   - An array with alias data in case the alias has been created or updated.
diff --git a/src/PathautoPatternListBuilder.php b/src/PathautoPatternListBuilder.php
index dd3ed4e..eb35e07 100644
--- a/src/PathautoPatternListBuilder.php
+++ b/src/PathautoPatternListBuilder.php
@@ -37,7 +37,7 @@ class PathautoPatternListBuilder extends DraggableListBuilder {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    /* @var \Drupal\pathauto\PathautoPatternInterface $entity */
+    /** @var \Drupal\pathauto\PathautoPatternInterface $entity */
     $row['label'] = $entity->label();
     $row['pattern']['#markup'] = $entity->getPattern();
     $row['type']['#markup'] = $entity->getAliasType()->getLabel();
diff --git a/src/PathautoWidget.php b/src/PathautoWidget.php
index 392e8e8..f048d87 100644
--- a/src/PathautoWidget.php
+++ b/src/PathautoWidget.php
@@ -24,18 +24,18 @@ class PathautoWidget extends PathWidget {
     // @todo Impossible to do this in widget, use another solution
     /*
     $form['path'] += array(
-      '#type' => 'fieldset',
-      '#title' => $this->t('URL path settings'),
-      '#collapsible' => TRUE,
-      '#collapsed' => empty($form['path']['alias']),
-      '#group' => 'additional_settings',
-      '#attributes' => array(
-        'class' => array('path-form'),
-      ),
-      '#access' => \Drupal::currentUser()->hasPermission('create url aliases') || \Drupal::currentUser()->hasPermission('administer url aliases'),
-      '#weight' => 30,
-      '#tree' => TRUE,
-      '#element_validate' => array('path_form_element_validate'),
+    '#type' => 'fieldset',
+    '#title' => $this->t('URL path settings'),
+    '#collapsible' => TRUE,
+    '#collapsed' => empty($form['path']['alias']),
+    '#group' => 'additional_settings',
+    '#attributes' => array(
+    'class' => array('path-form'),
+    ),
+    '#access' => \Drupal::currentUser()->hasPermission('create url aliases') || \Drupal::currentUser()->hasPermission('administer url aliases'),
+    '#weight' => 30,
+    '#tree' => TRUE,
+    '#element_validate' => array('path_form_element_validate'),
     );*/
 
     $pattern = \Drupal::service('pathauto.generator')->getPatternByEntity($entity);
diff --git a/src/Plugin/Deriver/EntityAliasTypeDeriver.php b/src/Plugin/Deriver/EntityAliasTypeDeriver.php
index 37f751c..bde643a 100644
--- a/src/Plugin/Deriver/EntityAliasTypeDeriver.php
+++ b/src/Plugin/Deriver/EntityAliasTypeDeriver.php
@@ -86,7 +86,7 @@ class EntityAliasTypeDeriver extends DeriverBase implements ContainerDeriverInte
         $this->derivatives[$entity_type_id]['types'] = [$this->tokenEntityMapper->getTokenTypeForEntityType($entity_type_id)];
         $this->derivatives[$entity_type_id]['provider'] = $entity_type->getProvider();
         $this->derivatives[$entity_type_id]['context_definitions'] = [
-          $entity_type_id => new EntityContextDefinition("entity:$entity_type_id", $this->t('@label being aliased', ['@label' => $entity_type->getLabel()]))
+          $entity_type_id => new EntityContextDefinition("entity:$entity_type_id", $this->t('@label being aliased', ['@label' => $entity_type->getLabel()])),
         ];
       }
     }
diff --git a/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php b/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php
index efd4430..ac675d0 100644
--- a/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php
+++ b/src/Plugin/pathauto/AliasType/EntityAliasTypeBase.php
@@ -281,8 +281,8 @@ class EntityAliasTypeBase extends PluginBase implements AliasTypeInterface, Alia
 
     if (!empty($options['message'])) {
       $this->messenger->addMessage($this->formatPlural(count($ids), 'Updated 1 %label URL alias.', 'Updated @count %label URL aliases.'), [
-          '%label' => $this->getLabel(),
-        ]);
+        '%label' => $this->getLabel(),
+      ]);
     }
 
     return $updates;
diff --git a/tests/modules/pathauto_custom_punctuation_test/pathauto_custom_punctuation_test.module b/tests/modules/pathauto_custom_punctuation_test/pathauto_custom_punctuation_test.module
index ae95a13..6649abd 100644
--- a/tests/modules/pathauto_custom_punctuation_test/pathauto_custom_punctuation_test.module
+++ b/tests/modules/pathauto_custom_punctuation_test/pathauto_custom_punctuation_test.module
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * @file
+ */
+
 /**
  * Implements hook_pathauto_punctuation_chars_alter().
  */
diff --git a/tests/src/Functional/PathautoBulkUpdateTest.php b/tests/src/Functional/PathautoBulkUpdateTest.php
index 14a09a9..ade5a35 100644
--- a/tests/src/Functional/PathautoBulkUpdateTest.php
+++ b/tests/src/Functional/PathautoBulkUpdateTest.php
@@ -5,8 +5,6 @@ namespace Drupal\Tests\pathauto\Functional;
 use Drupal\pathauto\PathautoGeneratorInterface;
 use Drupal\pathauto\PathautoState;
 use Drupal\Tests\BrowserTestBase;
-use Drupal\Component\Render\FormattableMarkup;
-
 
 /**
  * Bulk update functionality tests.
@@ -17,7 +15,7 @@ class PathautoBulkUpdateTest extends BrowserTestBase {
 
   use PathautoTestHelperTrait;
 
- /**
+  /**
    * {@inheritdoc}
    */
   protected $defaultTheme = 'stark';
@@ -72,6 +70,9 @@ class PathautoBulkUpdateTest extends BrowserTestBase {
     $this->patterns['forum'] = $this->createPattern('forum', '/forums/[term:name]');
   }
 
+  /**
+   *
+   */
   public function testBulkUpdate() {
     // Create some nodes.
     $this->nodes = [];
diff --git a/tests/src/Functional/PathautoEnablingEntityTypesTest.php b/tests/src/Functional/PathautoEnablingEntityTypesTest.php
index d310ed4..4dd8c58 100644
--- a/tests/src/Functional/PathautoEnablingEntityTypesTest.php
+++ b/tests/src/Functional/PathautoEnablingEntityTypesTest.php
@@ -72,7 +72,7 @@ class PathautoEnablingEntityTypesTest extends BrowserTestBase {
     $edit = [
       'enabled_entity_types[comment]' => TRUE,
     ];
-    $this->submitForm($edit, "Save configuration" );
+    $this->submitForm($edit, "Save configuration");
     $this->createPattern('comment', '/comment/[comment:body]');
 
     // Create a node, a comment type and a comment entity.
diff --git a/tests/src/Functional/PathautoNodeWebTest.php b/tests/src/Functional/PathautoNodeWebTest.php
index 1fcad57..daa4c12 100644
--- a/tests/src/Functional/PathautoNodeWebTest.php
+++ b/tests/src/Functional/PathautoNodeWebTest.php
@@ -8,7 +8,6 @@ use Drupal\pathauto\PathautoState;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Component\Render\FormattableMarkup;
 
-
 /**
  * Tests pathauto node UI integration.
  *
@@ -118,7 +117,7 @@ class PathautoNodeWebTest extends BrowserTestBase {
       'path[0][alias]' => '/should-not-get-created',
     ];
     $this->drupalGet('node/add/page');
-    $this->submitForm( $edit, 'Save');
+    $this->submitForm($edit, 'Save');
     $this->assertNoAliasExists(['alias' => 'should-not-get-created']);
     $node = $this->drupalGetNodeByTitle($title);
     $this->assertEntityAlias($node, '/content/automatic-title');
@@ -263,7 +262,6 @@ class PathautoNodeWebTest extends BrowserTestBase {
     $this->assertNull(\Drupal::keyValue('pathauto_state.node')->get($node->id()), 'Pathauto state was deleted');
   }
 
-
   /**
    * Tests that nodes without a Pathauto pattern can set custom aliases.
    */
diff --git a/tests/src/Functional/PathautoTestHelperTrait.php b/tests/src/Functional/PathautoTestHelperTrait.php
index 6473c85..fd40aa2 100644
--- a/tests/src/Functional/PathautoTestHelperTrait.php
+++ b/tests/src/Functional/PathautoTestHelperTrait.php
@@ -65,11 +65,14 @@ trait PathautoTestHelperTrait {
         'negate' => FALSE,
         'context_mapping' => [
           $entity_type => $entity_type,
-        ]
+        ],
       ]
     );
   }
 
+  /**
+   *
+   */
   public function assertToken($type, $object, $token, $expected) {
     $bubbleable_metadata = new BubbleableMetadata();
     $tokens = \Drupal::token()->generate($type, [$token => $token], [$type => $object], [], $bubbleable_metadata);
@@ -77,6 +80,9 @@ trait PathautoTestHelperTrait {
     $this->assertSame($tokens[$token], $expected, t("Token value for [@type:@token] was '@actual', expected value '@expected'.", ['@type' => $type, '@token' => $token, '@actual' => $tokens[$token], '@expected' => $expected]));
   }
 
+  /**
+   *
+   */
   public function saveEntityAlias(EntityInterface $entity, $alias, $langcode = NULL) {
     // By default, use the entity language.
     if (!$langcode) {
@@ -85,6 +91,9 @@ trait PathautoTestHelperTrait {
     return $this->createPathAlias('/' . $entity->toUrl()->getInternalPath(), $alias, $langcode);
   }
 
+  /**
+   *
+   */
   public function assertEntityAlias(EntityInterface $entity, $expected_alias, $langcode = NULL) {
     // By default, use the entity language.
     if (!$langcode) {
@@ -93,10 +102,16 @@ trait PathautoTestHelperTrait {
     $this->assertAlias('/' . $entity->toUrl()->getInternalPath(), $expected_alias, $langcode);
   }
 
+  /**
+   *
+   */
   public function assertEntityAliasExists(EntityInterface $entity) {
     return $this->assertAliasExists(['path' => '/' . $entity->toUrl()->getInternalPath()]);
   }
 
+  /**
+   *
+   */
   public function assertNoEntityAlias(EntityInterface $entity, $langcode = NULL) {
     // By default, use the entity language.
     if (!$langcode) {
@@ -105,6 +120,9 @@ trait PathautoTestHelperTrait {
     $this->assertEntityAlias($entity, '/' . $entity->toUrl()->getInternalPath(), $langcode);
   }
 
+  /**
+   *
+   */
   public function assertNoEntityAliasExists(EntityInterface $entity, $alias = NULL) {
     $path = ['path' => '/' . $entity->toUrl()->getInternalPath()];
     if (!empty($alias)) {
@@ -113,6 +131,9 @@ trait PathautoTestHelperTrait {
     $this->assertNoAliasExists($path);
   }
 
+  /**
+   *
+   */
   public function assertAlias($source, $expected_alias, $langcode = Language::LANGCODE_NOT_SPECIFIED) {
     \Drupal::service('path_alias.manager')->cacheClear($source);
     $entity_type_manager = \Drupal::entityTypeManager();
@@ -123,17 +144,26 @@ trait PathautoTestHelperTrait {
       ['%source' => $source, '@language' => $langcode]));
   }
 
+  /**
+   *
+   */
   public function assertAliasExists($conditions) {
     $path = $this->loadPathAliasByConditions($conditions);
     $this->assertNotEmpty($path, t('Alias with conditions @conditions found.', ['@conditions' => var_export($conditions, TRUE)]));
     return $path;
   }
 
+  /**
+   *
+   */
   public function assertNoAliasExists($conditions) {
     $alias = $this->loadPathAliasByConditions($conditions);
     $this->assertEmpty($alias, t('Alias with conditions @conditions not found.', ['@conditions' => var_export($conditions, TRUE)]));
   }
 
+  /**
+   *
+   */
   public function deleteAllAliases() {
     \Drupal::service('pathauto.alias_storage_helper')->deleteAll();
     \Drupal::service('path_alias.manager')->cacheClear();
@@ -156,6 +186,9 @@ trait PathautoTestHelperTrait {
     return $vocabulary;
   }
 
+  /**
+   *
+   */
   public function addTerm(VocabularyInterface $vocabulary, array $values = []) {
     $values += [
       'name' => mb_strtolower($this->randomMachineName(5)),
@@ -167,6 +200,9 @@ trait PathautoTestHelperTrait {
     return $term;
   }
 
+  /**
+   *
+   */
   public function assertEntityPattern($entity_type, $bundle, $langcode, $expected) {
 
     $values = [
@@ -179,9 +215,12 @@ trait PathautoTestHelperTrait {
     $this->assertSame($expected, $pattern->getPattern());
   }
 
+  /**
+   *
+   */
   public function drupalGetTermByName($name, $reset = FALSE) {
     if ($reset) {
-      // @todo - implement cache reset.
+      // @todo implement cache reset.
     }
     $terms = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->loadByProperties(['name' => $name]);
     return !empty($terms) ? reset($terms) : FALSE;
diff --git a/tests/src/FunctionalJavascript/PathautoLocaleTest.php b/tests/src/FunctionalJavascript/PathautoLocaleTest.php
index 478f42f..7e2fb59 100644
--- a/tests/src/FunctionalJavascript/PathautoLocaleTest.php
+++ b/tests/src/FunctionalJavascript/PathautoLocaleTest.php
@@ -9,7 +9,6 @@ use Drupal\pathauto\PathautoState;
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 use Drupal\Tests\pathauto\Functional\PathautoTestHelperTrait;
 
-
 /**
  * Test pathauto functionality with localization and translation.
  *
@@ -58,7 +57,8 @@ class PathautoLocaleTest extends WebDriverTestBase {
       'path' => [[
         'alias' => '/english-node',
         'pathauto' => FALSE,
-      ]],
+      ],
+      ],
     ];
     $node = $this->drupalCreateNode($node);
     $english_alias = $this->loadPathAliasByConditions(['alias' => '/english-node', 'langcode' => 'en']);
@@ -105,7 +105,7 @@ class PathautoLocaleTest extends WebDriverTestBase {
       'administer languages',
       'translate any entity',
       'administer content translation',
-      'create content translations'
+      'create content translations',
     ];
     $admin_user = $this->drupalCreateUser($permissions);
     $this->drupalLogin($admin_user);
diff --git a/tests/src/FunctionalJavascript/PathautoUiTest.php b/tests/src/FunctionalJavascript/PathautoUiTest.php
index e814b2c..d59242a 100644
--- a/tests/src/FunctionalJavascript/PathautoUiTest.php
+++ b/tests/src/FunctionalJavascript/PathautoUiTest.php
@@ -6,8 +6,6 @@ use Drupal\Core\Url;
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 use Drupal\pathauto\Entity\PathautoPattern;
 use Drupal\Tests\pathauto\Functional\PathautoTestHelperTrait;
-use Drupal\Component\Render\FormattableMarkup;
-
 
 /**
  * Test basic pathauto functionality.
@@ -59,6 +57,9 @@ class PathautoUiTest extends WebDriverTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   *
+   */
   public function testSettingsValidation() {
     $this->drupalGet('/admin/config/search/path/settings');
 
@@ -69,6 +70,9 @@ class PathautoUiTest extends WebDriverTestBase {
     $this->assertSession()->elementAttributeContains('css', '#edit-max-component-length', 'min', '1');
   }
 
+  /**
+   *
+   */
   public function testPatternsWorkflow() {
     $this->drupalPlaceBlock('local_tasks_block', ['id' => 'local-tasks-block']);
     $this->drupalPlaceBlock('local_actions_block');
@@ -99,7 +103,7 @@ class PathautoUiTest extends WebDriverTestBase {
     $edit += [
       'id' => 'page_pattern',
     ];
-    $this->submitForm( $edit, 'Save');
+    $this->submitForm($edit, 'Save');
 
     $this->assertSession()->pageTextContains('Path pattern is using the following invalid tokens: [user:name], [term:name].');
     $this->assertSession()->pageTextNotContains('The configuration options have been saved.');
diff --git a/tests/src/Kernel/PathautoEntityWithStringIdTest.php b/tests/src/Kernel/PathautoEntityWithStringIdTest.php
index 6f4e45d..ccdec54 100644
--- a/tests/src/Kernel/PathautoEntityWithStringIdTest.php
+++ b/tests/src/Kernel/PathautoEntityWithStringIdTest.php
@@ -76,7 +76,7 @@ class PathautoEntityWithStringIdTest extends KernelTestBase {
    * @dataProvider entityWithStringIdProvider
    *
    * @param string|int $id
-   *   The entity ID
+   *   The entity ID.
    * @param string $expected_key
    *   The expected key for 'pathauto_state.*' collections.
    */
@@ -111,19 +111,19 @@ class PathautoEntityWithStringIdTest extends KernelTestBase {
   public function entityWithStringIdProvider() {
     return [
       'ascii with less or equal 128 chars' => [
-        str_repeat('a', 128), str_repeat('a', 128)
+        str_repeat('a', 128), str_repeat('a', 128),
       ],
       'ascii with over 128 chars' => [
-        str_repeat('a', 191), Crypt::hashBase64(str_repeat('a', 191))
+        str_repeat('a', 191), Crypt::hashBase64(str_repeat('a', 191)),
       ],
       'non-ascii with less or equal 128 chars' => [
-        str_repeat('社', 128), Crypt::hashBase64(str_repeat('社', 128))
+        str_repeat('社', 128), Crypt::hashBase64(str_repeat('社', 128)),
       ],
       'non-ascii with over 128 chars' => [
-        str_repeat('社', 191), Crypt::hashBase64(str_repeat('社', 191))
+        str_repeat('社', 191), Crypt::hashBase64(str_repeat('社', 191)),
       ],
       'simulating an integer id' => [
-        123, '123'
+        123, '123',
       ],
     ];
   }
diff --git a/tests/src/Kernel/PathautoKernelTest.php b/tests/src/Kernel/PathautoKernelTest.php
index dd70405..ef9dfa4 100644
--- a/tests/src/Kernel/PathautoKernelTest.php
+++ b/tests/src/Kernel/PathautoKernelTest.php
@@ -19,7 +19,6 @@ use Drupal\node\Entity\Node;
 use Drupal\user\Entity\User;
 use Drupal\Component\Render\FormattableMarkup;
 
-
 /**
  * Unit tests for Pathauto functions.
  *
@@ -43,6 +42,9 @@ class PathautoKernelTest extends KernelTestBase {
    */
   protected $userPattern;
 
+  /**
+   *
+   */
   public function setUp(): void {
     parent::setup();
 
@@ -98,7 +100,7 @@ class PathautoKernelTest extends KernelTestBase {
         'negate' => FALSE,
         'context_mapping' => [
           'language' => 'node:langcode:language',
-        ]
+        ],
       ]
     );
 
@@ -421,6 +423,9 @@ class PathautoKernelTest extends KernelTestBase {
     $this->assertEntityPattern('taxonomy_term', 'name', Language::LANGCODE_NOT_SPECIFIED, 'bundle');
   }
 
+  /**
+   *
+   */
   public function testNoExistingPathAliases() {
     $this->config('pathauto.settings')
       ->set('punctuation.period', PathautoGeneratorInterface::PUNCTUATION_DO_NOTHING)
@@ -494,7 +499,7 @@ class PathautoKernelTest extends KernelTestBase {
 
     // Check that alias uniquifying is truncating with $wordsafe param set to
     // TRUE.
-    // If it doesn't path alias result would be content/thequick-brownf-0
+    // If it doesn't path alias result would be content/thequick-brownf-0.
     $this->assertEntityAlias($node_1, '/content/thequick-brownfox');
     $this->assertEntityAlias($node_2, '/content/thequick-0');
   }
@@ -590,7 +595,7 @@ class PathautoKernelTest extends KernelTestBase {
    * @return \Drupal\node\Entity\Node
    *   The created node.
    */
-  protected function drupalCreateNode(array $settings = [] ){
+  protected function drupalCreateNode(array $settings = []) {
     // Populate defaults array.
     $settings += [
       'title' => $this->randomMachineName(8),
diff --git a/tests/src/Kernel/PathautoTokenTest.php b/tests/src/Kernel/PathautoTokenTest.php
index f101132..b030550 100644
--- a/tests/src/Kernel/PathautoTokenTest.php
+++ b/tests/src/Kernel/PathautoTokenTest.php
@@ -20,6 +20,9 @@ class PathautoTokenTest extends KernelTestBase {
    */
   protected static $modules = ['system', 'token', 'path_alias', 'pathauto'];
 
+  /**
+   *
+   */
   public function testPathautoTokens() {
 
     $this->installConfig(['pathauto']);
@@ -36,7 +39,7 @@ class PathautoTokenTest extends KernelTestBase {
     $replacements = $this->assertTokens('array', $data, $tokens);
 
     // Ensure that the cleanTokenValues() method does not alter this token value.
-    /* @var \Drupal\pathauto\AliasCleanerInterface $alias_cleaner */
+    /** @var \Drupal\pathauto\AliasCleanerInterface $alias_cleaner */
     $alias_cleaner = \Drupal::service('pathauto.alias_cleaner');
     $alias_cleaner->cleanTokenValues($replacements, $data, []);
     $this->assertEquals('test-first-arg/array-value', $replacements['[array:join-path]']);
@@ -105,6 +108,9 @@ class PathautoTokenTest extends KernelTestBase {
     return $replacements;
   }
 
+  /**
+   *
+   */
   public function mapTokenNames($type, array $tokens = []) {
     $return = [];
     foreach ($tokens as $token) {