diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 71895b2..9325514 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -726,7 +726,7 @@ function drupal_installation_attempted() {
  * installation state. At all other times, the "install_profile" setting will be
  * available in settings.php.
  *
- * @return string|null $profile
+ * @return string|null
  *   The name of the installation profile or NULL if no installation profile is
  *   currently active. This is the case for example during the first steps of
  *   the installer or during unit tests.
diff --git a/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php b/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php
index db8559d..28d9f83 100644
--- a/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php
+++ b/core/lib/Drupal/Component/Gettext/PoMetadataInterface.php
@@ -37,7 +37,7 @@ public function setHeader(PoHeader $header);
   /**
    * Get header metadata.
    *
-   * @return \Drupal\Component\Gettext\PoHeader $header
+   * @return \Drupal\Component\Gettext\PoHeader
    *   Header instance representing metadata in a PO header.
    */
   public function getHeader();
diff --git a/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php b/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php
index 667c620..37d9078 100644
--- a/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php
+++ b/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php
@@ -28,7 +28,7 @@ public function getContextDefinitions();
    * @param string $name
    *   The name of the context in the plugin definition.
    *
-   * @return \Drupal\Component\Plugin\Context\ContextDefinitionInterface.
+   * @return \Drupal\Component\Plugin\Context\ContextDefinitionInterface
    *   The definition against which the context value must validate.
    *
    * @throws \Drupal\Component\Plugin\Exception\PluginException
@@ -103,7 +103,7 @@ public function setContext($name, ContextInterface $context);
    *   The value to set the context to. The value has to validate against the
    *   provided context definition.
    *
-   * @return \Drupal\Component\Plugin\ContextAwarePluginInterface.
+   * @return \Drupal\Component\Plugin\ContextAwarePluginInterface
    *   A context aware plugin object for chaining.
    *
    * @throws \Drupal\Component\Plugin\Exception\PluginException
diff --git a/core/lib/Drupal/Core/Block/BlockPluginInterface.php b/core/lib/Drupal/Core/Block/BlockPluginInterface.php
index 66ef836..7156a48 100644
--- a/core/lib/Drupal/Core/Block/BlockPluginInterface.php
+++ b/core/lib/Drupal/Core/Block/BlockPluginInterface.php
@@ -97,7 +97,7 @@ public function setConfigurationValue($key, $value);
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @return array $form
+   * @return array
    *   The renderable form array representing the entire configuration form.
    */
   public function blockForm($form, FormStateInterface $form_state);
diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php
index f98691f..92d3b48 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstaller.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php
@@ -665,7 +665,7 @@ protected function drupalGetPath($type, $name) {
   /**
    * Gets the install profile from settings.
    *
-   * @return string|null $profile
+   * @return string|null
    *   The name of the installation profile or NULL if no installation profile
    *   is currently active. This is the case for example during the first steps
    *   of the installer or during unit tests.
diff --git a/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php b/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php
index be5be93..f6a6261 100644
--- a/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php
+++ b/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php
@@ -69,7 +69,7 @@ public function getLanguage() {
   /**
    * Get configuration overrides.
    *
-   * @return array.
+   * @return array
    *   The array of configuration overrides.
    */
   public function getOverrides() {
diff --git a/core/lib/Drupal/Core/Controller/ControllerBase.php b/core/lib/Drupal/Core/Controller/ControllerBase.php
index fef0910..a46279f 100644
--- a/core/lib/Drupal/Core/Controller/ControllerBase.php
+++ b/core/lib/Drupal/Core/Controller/ControllerBase.php
@@ -287,7 +287,7 @@ protected function languageManager() {
    * \Drupal\Core\DependencyInjection\ContainerInjectionInterface should be used
    * for injecting services.
    *
-   * @return \Symfony\Component\DependencyInjection\ContainerInterface $container
+   * @return \Symfony\Component\DependencyInjection\ContainerInterface
    *   The service container.
    */
   private function container() {
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php b/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
index 94bf70a..9688b1f 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityFormInterface.php
@@ -16,7 +16,7 @@
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @return \Drupal\Core\Entity\Display\EntityFormDisplayInterface.
+   * @return \Drupal\Core\Entity\Display\EntityFormDisplayInterface
    *   The current form display.
    */
   public function getFormDisplay(FormStateInterface $form_state);
diff --git a/core/lib/Drupal/Core/Entity/EntityTypeManagerInterface.php b/core/lib/Drupal/Core/Entity/EntityTypeManagerInterface.php
index c4fce4e..2a7a317 100644
--- a/core/lib/Drupal/Core/Entity/EntityTypeManagerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityTypeManagerInterface.php
@@ -16,7 +16,7 @@
    * @param string $entity_type
    *   The entity type for this access control handler.
    *
-   * @return \Drupal\Core\Entity\EntityAccessControlHandlerInterface.
+   * @return \Drupal\Core\Entity\EntityAccessControlHandlerInterface
    *   A access control handler instance.
    */
   public function getAccessControlHandler($entity_type);
@@ -40,7 +40,7 @@ public function getStorage($entity_type);
    * @param string $entity_type
    *   The entity type for this view builder.
    *
-   * @return \Drupal\Core\Entity\EntityViewBuilderInterface.
+   * @return \Drupal\Core\Entity\EntityViewBuilderInterface
    *   A view builder instance.
    */
   public function getViewBuilder($entity_type);
diff --git a/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php b/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
index 1215f08..875b8c2 100644
--- a/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
@@ -44,7 +44,7 @@ public function exists($field, $function, $langcode = NULL);
    * Queries for the nonexistence of a field.
    *
    * @param string $field
-   * @return ConditionInterface;
+   * @return ConditionInterface
    * @see \Drupal\Core\Entity\Query\QueryInterface::notexists()
    */
   public function notExists($field, $function, $langcode = NULL);
diff --git a/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php b/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
index 81463fb..d42e48f 100644
--- a/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
@@ -50,7 +50,7 @@ public function exists($field, $langcode = NULL);
    * Queries for the existence of a field.
    *
    * @param string $field
-   * @return ConditionInterface;
+   * @return ConditionInterface
    * @see \Drupal\Core\Entity\Query\QueryInterface::notexists()
    */
   public function notExists($field, $langcode = NULL);
diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
index 60ae741..be46c8a 100644
--- a/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/core/lib/Drupal/Core/Entity/entity.api.php
@@ -1717,9 +1717,9 @@ function hook_entity_bundle_field_info(\Drupal\Core\Entity\EntityTypeInterface $
   if ($entity_type->id() == 'node' && $bundle == 'article') {
     $fields = array();
     $fields['mymodule_text_more'] = BaseFieldDefinition::create('string')
-        ->setLabel(t('More text'))
-        ->setComputed(TRUE)
-        ->setClass('\Drupal\mymodule\EntityComputedMoreText');
+      ->setLabel(t('More text'))
+      ->setComputed(TRUE)
+      ->setClass('\Drupal\mymodule\EntityComputedMoreText');
     return $fields;
   }
 }
diff --git a/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php b/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
index 1480cbf..9970bf0 100644
--- a/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
+++ b/core/lib/Drupal/Core/Executable/ExecutablePluginBase.php
@@ -69,7 +69,7 @@ public function getConfig() {
    *   https://www.drupal.org/node/1764380.
    * @todo This does not set a value in \Drupal::config(), so the name is confusing.
    *
-   * @return \Drupal\Core\Executable\ExecutablePluginBase.
+   * @return \Drupal\Core\Executable\ExecutablePluginBase
    *   The executable object for chaining.
    */
   public function setConfig($key, $value) {
diff --git a/core/lib/Drupal/Core/Form/FormBase.php b/core/lib/Drupal/Core/Form/FormBase.php
index 485e6d7..02a1c39 100644
--- a/core/lib/Drupal/Core/Form/FormBase.php
+++ b/core/lib/Drupal/Core/Form/FormBase.php
@@ -147,7 +147,7 @@ public function resetConfigFactory() {
   /**
    * Gets the request object.
    *
-   * @return \Symfony\Component\HttpFoundation\Request $request
+   * @return \Symfony\Component\HttpFoundation\Request
    *   The request object.
    */
   protected function getRequest() {
@@ -200,7 +200,7 @@ protected function currentUser() {
    * \Drupal\Core\DependencyInjection\ContainerInjectionInterface should be used
    * for injecting services.
    *
-   * @return \Symfony\Component\DependencyInjection\ContainerInterface $container
+   * @return \Symfony\Component\DependencyInjection\ContainerInterface
    *   The service container.
    */
   private function container() {
diff --git a/core/lib/Drupal/Core/Plugin/ContextAwarePluginInterface.php b/core/lib/Drupal/Core/Plugin/ContextAwarePluginInterface.php
index 5e61cc0..67f53b6 100644
--- a/core/lib/Drupal/Core/Plugin/ContextAwarePluginInterface.php
+++ b/core/lib/Drupal/Core/Plugin/ContextAwarePluginInterface.php
@@ -27,7 +27,7 @@ public function getContextDefinitions();
    * @param string $name
    *   The name of the context in the plugin definition.
    *
-   * @return \Drupal\Core\Plugin\Context\ContextDefinitionInterface.
+   * @return \Drupal\Core\Plugin\Context\ContextDefinitionInterface
    *   The definition against which the context value must validate.
    *
    * @throws \Drupal\Component\Plugin\Exception\PluginException
diff --git a/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php b/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
index 37ff0f7..3f279c0 100644
--- a/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
+++ b/core/lib/Drupal/Core/Render/PageDisplayVariantSelectionEvent.php
@@ -80,7 +80,7 @@ public function setPluginId($plugin_id) {
   /**
    * The selected page display variant plugin ID.
    *
-   * @return string;
+   * @return string
    */
   public function getPluginId() {
     return $this->pluginId;
diff --git a/core/modules/config_translation/src/ConfigEntityMapper.php b/core/modules/config_translation/src/ConfigEntityMapper.php
index faf8991..d172e1b 100644
--- a/core/modules/config_translation/src/ConfigEntityMapper.php
+++ b/core/modules/config_translation/src/ConfigEntityMapper.php
@@ -113,7 +113,7 @@ public function populateFromRouteMatch(RouteMatchInterface $route_match) {
   /**
    * Gets the entity instance for this mapper.
    *
-   * @return \Drupal\Core\Config\Entity\ConfigEntityInterface $entity
+   * @return \Drupal\Core\Config\Entity\ConfigEntityInterface
    *   The configuration entity.
    */
   public function getEntity() {
diff --git a/core/modules/content_moderation/src/Form/ModerationStateTransitionForm.php b/core/modules/content_moderation/src/Form/ModerationStateTransitionForm.php
index 8322c18..7c2ae04 100644
--- a/core/modules/content_moderation/src/Form/ModerationStateTransitionForm.php
+++ b/core/modules/content_moderation/src/Form/ModerationStateTransitionForm.php
@@ -77,7 +77,7 @@ public function form(array $form, FormStateInterface $form_state) {
 
     $options = [];
     foreach ($this->entityTypeManager->getStorage('moderation_state')
-               ->loadMultiple() as $moderation_state) {
+      ->loadMultiple() as $moderation_state) {
       $options[$moderation_state->id()] = $moderation_state->label();
     }
 
diff --git a/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php b/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
index ebb8a8e..e419f0a 100644
--- a/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
+++ b/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
@@ -116,14 +116,14 @@ public function testCalculateDependencies() {
 
     $storage = $this->getMock('Drupal\Core\Entity\EntityStorageInterface');
     $storage->expects($this->once())
-            ->method('load')
-            ->with($format_id)
-            ->will($this->returnValue($filter_format));
+      ->method('load')
+      ->with($format_id)
+      ->will($this->returnValue($filter_format));
 
     $this->entityManager->expects($this->once())
-                        ->method('getStorage')
-                        ->with('filter_format')
-                        ->will($this->returnValue($storage));
+      ->method('getStorage')
+      ->with('filter_format')
+      ->will($this->returnValue($storage));
 
     $dependencies = $entity->calculateDependencies()->getDependencies();
     $this->assertContains('test_module', $dependencies['module']);
diff --git a/core/modules/history/history.module b/core/modules/history/history.module
index 7792591..a31dd5b 100644
--- a/core/modules/history/history.module
+++ b/core/modules/history/history.module
@@ -184,7 +184,7 @@ function history_user_delete($account) {
  * @param int $node_id
  *   The node ID for which to attach the last read timestamp.
  *
- * @return array $element
+ * @return array
  *   A renderable array containing the last read timestamp.
  */
 function history_attach_timestamp($node_id) {
diff --git a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
index c83e143..d9011a8 100644
--- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -487,7 +487,7 @@ public function isDisplayed() {
   /**
    * Gets the entity manager.
    *
-   * @return \Drupal\Core\Entity\EntityManagerInterface.
+   * @return \Drupal\Core\Entity\EntityManagerInterface
    */
   protected function getEntityManager() {
     if (!isset($this->entityManager)) {
diff --git a/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
index 98db7b1..10cc68d 100644
--- a/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
+++ b/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
@@ -88,14 +88,14 @@ public function testPassingMigration() {
    */
   public function testMissingEffectPlugin() {
     Database::getConnection('default', 'migrate')->insert("imagecache_action")
-       ->fields([
+      ->fields([
        'presetid',
        'weight',
        'module',
        'action',
        'data',
      ])
-       ->values([
+      ->values([
        'presetid' => '1',
        'weight' => '0',
        'module' => 'imagecache',
@@ -121,14 +121,14 @@ public function testMissingEffectPlugin() {
    */
   public function testInvalidCropValues() {
     Database::getConnection('default', 'migrate')->insert("imagecache_action")
-       ->fields([
+      ->fields([
        'presetid',
        'weight',
        'module',
        'action',
        'data',
      ])
-       ->values([
+      ->values([
        'presetid' => '1',
        'weight' => '0',
        'module' => 'imagecache',
diff --git a/core/modules/image/tests/src/Unit/ImageStyleTest.php b/core/modules/image/tests/src/Unit/ImageStyleTest.php
index 96c50c4..26dd225 100644
--- a/core/modules/image/tests/src/Unit/ImageStyleTest.php
+++ b/core/modules/image/tests/src/Unit/ImageStyleTest.php
@@ -170,11 +170,11 @@ public function testGetPathToken() {
 
     $image_style = $this->getImageStyleMock($image_effect_id, $image_effect, array('getPrivateKey', 'getHashSalt'));
     $image_style->expects($this->any())
-        ->method('getPrivateKey')
-        ->will($this->returnValue($private_key));
+      ->method('getPrivateKey')
+      ->will($this->returnValue($private_key));
     $image_style->expects($this->any())
-        ->method('getHashSalt')
-        ->will($this->returnValue($hash_salt));
+      ->method('getHashSalt')
+      ->will($this->returnValue($hash_salt));
 
     // Assert the extension has been added to the URI before creating the token.
     $this->assertEquals($image_style->getPathToken('public://test.jpeg.png'), $image_style->getPathToken('public://test.jpeg'));
@@ -192,11 +192,11 @@ public function testGetPathToken() {
 
     $image_style = $this->getImageStyleMock($image_effect_id, $image_effect, array('getPrivateKey', 'getHashSalt'));
     $image_style->expects($this->any())
-        ->method('getPrivateKey')
-        ->will($this->returnValue($private_key));
+      ->method('getPrivateKey')
+      ->will($this->returnValue($private_key));
     $image_style->expects($this->any())
-        ->method('getHashSalt')
-        ->will($this->returnValue($hash_salt));
+      ->method('getHashSalt')
+      ->will($this->returnValue($hash_salt));
     // Assert no extension has been added to the uri before creating the token.
     $this->assertNotEquals($image_style->getPathToken('public://test.jpeg.png'), $image_style->getPathToken('public://test.jpeg'));
     $this->assertNotEquals(substr(Crypt::hmacBase64($image_style->id() . ':' . 'public://test.jpeg.png', $private_key . $hash_salt), 0, 8), $image_style->getPathToken('public://test.jpeg'));
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index b4612f4..6876b49 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -146,7 +146,7 @@ function language_element_info_alter(&$type) {
  * @param array $element
  *   The form element to process.
  *
- * @return array $element
+ * @return array
  *   The processed form element.
  */
 function language_process_language_select($element) {
diff --git a/core/modules/language/src/ConfigurableLanguageManagerInterface.php b/core/modules/language/src/ConfigurableLanguageManagerInterface.php
index 084ace4..9a864e6 100644
--- a/core/modules/language/src/ConfigurableLanguageManagerInterface.php
+++ b/core/modules/language/src/ConfigurableLanguageManagerInterface.php
@@ -77,7 +77,7 @@ public function getLanguageConfigOverride($langcode, $name);
    * @param string $langcode
    *   The language code for the override.
    *
-   * @return \Drupal\Core\Config\StorageInterface $storage
+   * @return \Drupal\Core\Config\StorageInterface
    *   A storage object to use for reading and writing the
    *   configuration override.
    */
diff --git a/core/modules/locale/src/PluralFormula.php b/core/modules/locale/src/PluralFormula.php
index 827cc88..638d60f 100644
--- a/core/modules/locale/src/PluralFormula.php
+++ b/core/modules/locale/src/PluralFormula.php
@@ -92,7 +92,7 @@ public function getFormula($langcode) {
   /**
    * Loads the formulae and stores them on the PluralFormula object if not set.
    *
-   * @return []
+   * @return array
    */
   protected function loadFormulae() {
     if (!isset($this->formulae)) {
diff --git a/core/modules/locale/src/StringDatabaseStorage.php b/core/modules/locale/src/StringDatabaseStorage.php
index 058c689..f925c1a 100644
--- a/core/modules/locale/src/StringDatabaseStorage.php
+++ b/core/modules/locale/src/StringDatabaseStorage.php
@@ -417,8 +417,8 @@ protected function dbStringSelect(array $conditions, array $options = array()) {
         // Conditions for target fields when doing an outer join only make
         // sense if we add also OR field IS NULL.
         $query->condition(db_or()
-            ->condition($field_alias, (array) $value, 'IN')
-            ->isNull($field_alias)
+          ->condition($field_alias, (array) $value, 'IN')
+          ->isNull($field_alias)
         );
       }
       else {
diff --git a/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php b/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php
index 8a2dfb8..2f65711 100644
--- a/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php
+++ b/core/modules/migrate/src/Plugin/Discovery/ProviderFilterDecorator.php
@@ -55,7 +55,7 @@ public function __construct(DiscoveryInterface $decorated, callable $provider_ex
    *   A callable, gets passed a provider name, should return TRUE if the
    *   provider exists and FALSE if not.
    *
-   * @return array|\mixed[] $definitions
+   * @return array|\mixed[]
    *   An array of plugin definitions. If a definition is an array and has a
    *   provider key that provider is guaranteed to exist.
    */
diff --git a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
index cbf4a9f..a523bfe 100644
--- a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
+++ b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
@@ -462,7 +462,7 @@ protected function getFieldSchema(array $id_definition) {
    */
   public function getRowBySource(array $source_id_values) {
     $query = $this->getDatabase()->select($this->mapTableName(), 'map')
-              ->fields('map');
+      ->fields('map');
     $query->condition(static::SOURCE_IDS_HASH, $this->getSourceIDsHash($source_id_values));
     $result = $query->execute();
     return $result->fetchAssoc();
@@ -473,7 +473,7 @@ public function getRowBySource(array $source_id_values) {
    */
   public function getRowByDestination(array $destination_id_values) {
     $query = $this->getDatabase()->select($this->mapTableName(), 'map')
-              ->fields('map');
+      ->fields('map');
     foreach ($this->destinationIdFields() as $field_name => $destination_id) {
       $query->condition("map.$destination_id", $destination_id_values[$field_name], '=');
     }
@@ -487,10 +487,10 @@ public function getRowByDestination(array $destination_id_values) {
   public function getRowsNeedingUpdate($count) {
     $rows = array();
     $result = $this->getDatabase()->select($this->mapTableName(), 'map')
-                      ->fields('map')
-                      ->condition('source_row_status', MigrateIdMapInterface::STATUS_NEEDS_UPDATE)
-                      ->range(0, $count)
-                      ->execute();
+      ->fields('map')
+      ->condition('source_row_status', MigrateIdMapInterface::STATUS_NEEDS_UPDATE)
+      ->range(0, $count)
+      ->execute();
     foreach ($result as $row) {
       $rows[] = $row;
     }
diff --git a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
index 2b7f12f..4c24026 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
@@ -153,7 +153,7 @@ public function testCount() {
     $container = new ContainerBuilder();
     $cache = $this->getMock(CacheBackendInterface::class);
     $cache->expects($this->any())->method('set')
-        ->with($this->isType('string'), $this->isType('int'), $this->isType('int'));
+      ->with($this->isType('string'), $this->isType('int'), $this->isType('int'));
     $container->set('cache.migrate', $cache);
     \Drupal::setContainer($container);
 
@@ -180,7 +180,7 @@ public function testCountCacheKey() {
     $container = new ContainerBuilder();
     $cache = $this->getMock(CacheBackendInterface::class);
     $cache->expects($this->any())->method('set')
-        ->with('test_key', $this->isType('int'), $this->isType('int'));
+      ->with('test_key', $this->isType('int'), $this->isType('int'));
     $container->set('cache.migrate', $cache);
     \Drupal::setContainer($container);
 
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index c754880..122d344 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -164,11 +164,11 @@ function node_update_8001() {
   // \Drupal::entityDefinitionUpdateManager()->updateFieldStorageDefinition()
   // with the new definition.
   $storage_definition = BaseFieldDefinition::create('boolean')
-      ->setLabel(t('Revision translation affected'))
-      ->setDescription(t('Indicates if the last edit of a translation belongs to current revision.'))
-      ->setReadOnly(TRUE)
-      ->setRevisionable(TRUE)
-      ->setTranslatable(TRUE);
+    ->setLabel(t('Revision translation affected'))
+    ->setDescription(t('Indicates if the last edit of a translation belongs to current revision.'))
+    ->setReadOnly(TRUE)
+    ->setRevisionable(TRUE)
+    ->setTranslatable(TRUE);
 
   \Drupal::entityDefinitionUpdateManager()
     ->installFieldStorageDefinition('revision_translation_affected', 'node', 'node', $storage_definition);
diff --git a/core/modules/node/src/NodeAccessControlHandlerInterface.php b/core/modules/node/src/NodeAccessControlHandlerInterface.php
index 47205f0..7d407c1 100644
--- a/core/modules/node/src/NodeAccessControlHandlerInterface.php
+++ b/core/modules/node/src/NodeAccessControlHandlerInterface.php
@@ -23,7 +23,7 @@
    * @param \Drupal\node\NodeInterface $node
    *   The $node to acquire grants for.
    *
-   * @return array $grants
+   * @return array
    *   The access rules for the node.
    */
   public function acquireGrants(NodeInterface $node);
@@ -74,7 +74,7 @@ public function countGrants();
    *   A user object representing the user for whom the operation is to be
    *   performed.
    *
-   * @return int.
+   * @return int
    *   Status of the access check.
    */
   public function checkAllGrants(AccountInterface $account);
diff --git a/core/modules/node/src/NodeGrantDatabaseStorageInterface.php b/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
index 659ce10..235fbc0 100644
--- a/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
+++ b/core/modules/node/src/NodeGrantDatabaseStorageInterface.php
@@ -18,7 +18,7 @@
    *   A user object representing the user for whom the operation is to be
    *   performed.
    *
-   * @return int.
+   * @return int
    *   Status of the access check.
    */
   public function checkAll(AccountInterface $account);
diff --git a/core/modules/node/src/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php
index d161a0a..ef61064 100644
--- a/core/modules/node/src/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/src/Plugin/Search/NodeSearch.php
@@ -433,8 +433,8 @@ public function updateIndex() {
     $query->addExpression('MAX(sd.reindex)', 'ex2');
     $query->condition(
         $query->orConditionGroup()
-        ->where('sd.sid IS NULL')
-        ->condition('sd.reindex', 0, '<>')
+          ->where('sd.sid IS NULL')
+          ->condition('sd.reindex', 0, '<>')
       );
     $query->orderBy('ex', 'DESC')
       ->orderBy('ex2')
diff --git a/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php b/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
index 5b66d42..d245a81 100644
--- a/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
+++ b/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
@@ -99,8 +99,8 @@ public function testCalculateDependenciesWithEntityBundle() {
     $target_entity_type_id = $this->randomMachineName(16);
     $target_entity_type = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
     $target_entity_type->expects($this->any())
-                     ->method('getProvider')
-                     ->will($this->returnValue('test_module'));
+      ->method('getProvider')
+      ->will($this->returnValue('test_module'));
     $bundle_id = $this->randomMachineName(10);
     $values = array('targetEntityType' => $target_entity_type_id , 'bundle' => $bundle_id);
 
@@ -109,13 +109,13 @@ public function testCalculateDependenciesWithEntityBundle() {
       ->will($this->returnValue(array('type' => 'config', 'name' => 'test_module.type.' . $bundle_id)));
 
     $this->entityManager->expects($this->at(0))
-                        ->method('getDefinition')
-                        ->with($target_entity_type_id)
-                        ->will($this->returnValue($target_entity_type));
+      ->method('getDefinition')
+      ->with($target_entity_type_id)
+      ->will($this->returnValue($target_entity_type));
     $this->entityManager->expects($this->at(1))
-                        ->method('getDefinition')
-                        ->with($this->entityTypeId)
-                        ->will($this->returnValue($this->entityType));
+      ->method('getDefinition')
+      ->with($this->entityTypeId)
+      ->will($this->returnValue($this->entityType));
 
     $entity = new RdfMapping($values, $this->entityTypeId);
     $dependencies = $entity->calculateDependencies()->getDependencies();
diff --git a/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php b/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php
index 3911aad..c3f45e9 100644
--- a/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php
+++ b/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php
@@ -39,8 +39,8 @@ class ResponsiveImageStyleConfigEntityUnitTest extends UnitTestCase {
   protected function setUp() {
     $this->entityType = $this->getMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
-       ->method('getProvider')
-       ->will($this->returnValue('responsive_image'));
+      ->method('getProvider')
+      ->will($this->returnValue('responsive_image'));
 
     $this->entityManager = $this->getMock('\Drupal\Core\Entity\EntityManagerInterface');
     $this->entityManager->expects($this->any())
diff --git a/core/modules/simpletest/tests/src/Unit/TestBaseTest.php b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
index 3baa1d7..6643eb6 100644
--- a/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
+++ b/core/modules/simpletest/tests/src/Unit/TestBaseTest.php
@@ -25,13 +25,13 @@ class TestBaseTest extends UnitTestCase {
    */
   public function getTestBaseForAssertionTests($test_id) {
     $mock_test_base = $this->getMockBuilder('Drupal\simpletest\TestBase')
-        ->setConstructorArgs(array($test_id))
-        ->setMethods(array('storeAssertion'))
-        ->getMockForAbstractClass();
+      ->setConstructorArgs(array($test_id))
+      ->setMethods(array('storeAssertion'))
+      ->getMockForAbstractClass();
     // Override storeAssertion() so we don't need a database.
     $mock_test_base->expects($this->any())
-        ->method('storeAssertion')
-        ->will($this->returnValue(NULL));
+      ->method('storeAssertion')
+      ->will($this->returnValue(NULL));
     return $mock_test_base;
   }
 
diff --git a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
index 0f80f05..63f3494 100644
--- a/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
+++ b/core/modules/system/src/Tests/Update/UpdatePathTestBase.php
@@ -268,7 +268,7 @@ protected function runUpdates() {
       $this->assertFalse($needs_updates, 'After all updates ran, entity schema is up to date.');
       if ($needs_updates) {
         foreach (\Drupal::entityDefinitionUpdateManager()
-                   ->getChangeSummary() as $entity_type_id => $summary) {
+          ->getChangeSummary() as $entity_type_id => $summary) {
           foreach ($summary as $message) {
             $this->fail($message);
           }
diff --git a/core/modules/system/tests/fixtures/update/drupal-8.local-actions-tasks-into-blocks-507488.php b/core/modules/system/tests/fixtures/update/drupal-8.local-actions-tasks-into-blocks-507488.php
index a47f9e0..6cf44b1 100644
--- a/core/modules/system/tests/fixtures/update/drupal-8.local-actions-tasks-into-blocks-507488.php
+++ b/core/modules/system/tests/fixtures/update/drupal-8.local-actions-tasks-into-blocks-507488.php
@@ -31,11 +31,11 @@
 
 // Update the config entity query "index".
 $existing_blocks = $connection->select('key_value')
-    ->fields('key_value', ['value'])
-    ->condition('collection', 'config.entity.key_store.block')
-    ->condition('name', 'theme:seven')
-    ->execute()
-    ->fetchField();
+  ->fields('key_value', ['value'])
+  ->condition('collection', 'config.entity.key_store.block')
+  ->condition('name', 'theme:seven')
+  ->execute()
+  ->fetchField();
 $existing_blocks = unserialize($existing_blocks);
 
 $connection->update('key_value')
diff --git a/core/modules/system/tests/fixtures/update/drupal-8.seven-secondary-local-tasks-block-2569529.php b/core/modules/system/tests/fixtures/update/drupal-8.seven-secondary-local-tasks-block-2569529.php
index 1ac03ca..63582dc 100644
--- a/core/modules/system/tests/fixtures/update/drupal-8.seven-secondary-local-tasks-block-2569529.php
+++ b/core/modules/system/tests/fixtures/update/drupal-8.seven-secondary-local-tasks-block-2569529.php
@@ -31,11 +31,11 @@
 
 // Update the config entity query "index".
 $existing_blocks = $connection->select('key_value')
-    ->fields('key_value', ['value'])
-    ->condition('collection', 'config.entity.key_store.block')
-    ->condition('name', 'theme:seven')
-    ->execute()
-    ->fetchField();
+  ->fields('key_value', ['value'])
+  ->condition('collection', 'config.entity.key_store.block')
+  ->condition('name', 'theme:seven')
+  ->execute()
+  ->fetchField();
 $existing_blocks = unserialize($existing_blocks);
 
 $connection->update('key_value')
diff --git a/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php b/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
index f2e1386..eb8709e 100644
--- a/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
+++ b/core/modules/system/tests/modules/system_test/src/Controller/SystemTestController.php
@@ -339,7 +339,7 @@ public function permissionDependentContent() {
   /**
    * Returns the current date.
    *
-   * @return \Symfony\Component\HttpFoundation\Response $response
+   * @return \Symfony\Component\HttpFoundation\Response
    *   A Response object containing the current date.
    */
   public function getCurrentDate() {
@@ -351,7 +351,7 @@ public function getCurrentDate() {
   /**
    * Returns a response with a test header set from the request.
    *
-   * @return \Symfony\Component\HttpFoundation\Response $response
+   * @return \Symfony\Component\HttpFoundation\Response
    *   A Response object containing the test header.
    */
   public function getTestHeader(Request $request) {
diff --git a/core/modules/system/tests/src/Kernel/Migrate/MigrateMenuTest.php b/core/modules/system/tests/src/Kernel/Migrate/MigrateMenuTest.php
index c66ca02..9748a45 100644
--- a/core/modules/system/tests/src/Kernel/Migrate/MigrateMenuTest.php
+++ b/core/modules/system/tests/src/Kernel/Migrate/MigrateMenuTest.php
@@ -42,8 +42,8 @@ public function testMenu() {
 
     $migration = $this->getMigration('menu');
     \Drupal::database()
-        ->truncate($migration->getIdMap()->mapTableName())
-        ->execute();
+      ->truncate($migration->getIdMap()->mapTableName())
+      ->execute();
     $this->executeMigration($migration);
 
     $navigation_menu = Menu::load('navigation');
diff --git a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
index d72f13d..7045f45 100644
--- a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
@@ -47,17 +47,17 @@ protected function setUp() {
   public function testMigrateTrackerNode() {
     $connection = Database::getConnection('default', 'migrate');
     $num_rows = $connection
-        ->select('tracker_node', 'tn')
-        ->fields('tn', ['nid', 'published', 'changed'])
-        ->countQuery()
-        ->execute()
-        ->fetchField();
+      ->select('tracker_node', 'tn')
+      ->fields('tn', ['nid', 'published', 'changed'])
+      ->countQuery()
+      ->execute()
+      ->fetchField();
     $this->assertIdentical('1', $num_rows);
 
     $tracker_nodes = $connection
-        ->select('tracker_node', 'tn')
-        ->fields('tn', ['nid', 'published', 'changed'])
-        ->execute();
+      ->select('tracker_node', 'tn')
+      ->fields('tn', ['nid', 'published', 'changed'])
+      ->execute();
     $row = $tracker_nodes->fetchAssoc();
     $this->assertIdentical('1', $row['nid']);
     $this->assertIdentical('1', $row['published']);
diff --git a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
index e3ed88e..0acc4e5 100644
--- a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
+++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
@@ -47,17 +47,17 @@ protected function setUp() {
   public function testMigrateTrackerUser() {
     $connection = Database::getConnection('default', 'migrate');
     $num_rows = $connection
-        ->select('tracker_user', 'tn')
-        ->fields('tu', ['nid', 'uid', 'published', 'changed'])
-        ->countQuery()
-        ->execute()
-        ->fetchField();
+      ->select('tracker_user', 'tn')
+      ->fields('tu', ['nid', 'uid', 'published', 'changed'])
+      ->countQuery()
+      ->execute()
+      ->fetchField();
     $this->assertIdentical('1', $num_rows);
 
     $tracker_nodes = $connection
-        ->select('tracker_user', 'tu')
-        ->fields('tu', ['nid', 'uid', 'published', 'changed'])
-        ->execute();
+      ->select('tracker_user', 'tu')
+      ->fields('tu', ['nid', 'uid', 'published', 'changed'])
+      ->execute();
     $row = $tracker_nodes->fetchAssoc();
     $this->assertIdentical('1', $row['nid']);
     $this->assertIdentical('2', $row['uid']);
diff --git a/core/modules/user/src/UserStorage.php b/core/modules/user/src/UserStorage.php
index 9759d27..1c5a54a 100644
--- a/core/modules/user/src/UserStorage.php
+++ b/core/modules/user/src/UserStorage.php
@@ -67,8 +67,8 @@ public function updateLastAccessTimestamp(AccountInterface $account, $timestamp)
   public function deleteRoleReferences(array $rids) {
     // Remove the role from all users.
     $this->database->delete('user__roles')
-        ->condition('roles_target_id', $rids)
-        ->execute();
+      ->condition('roles_target_id', $rids)
+      ->execute();
 
     $this->resetCache();
   }
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php
index 5b6e95d..934973f 100644
--- a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTest.php
@@ -71,10 +71,10 @@ public function testUserSettings() {
     foreach ($user_register_map as $map) {
       // Tests migration of user_register = 1
       Database::getConnection('default', 'migrate')
-          ->update('variable')
-          ->fields(['value' => serialize($map[0])])
-          ->condition('name', 'user_register')
-          ->execute();
+        ->update('variable')
+        ->fields(['value' => serialize($map[0])])
+        ->condition('name', 'user_register')
+        ->execute();
 
       /** @var \Drupal\migrate\Plugin\MigrationInterface $migration */
       $migration = $this->getMigration('d6_user_settings');
diff --git a/core/modules/views/src/Ajax/ViewAjaxResponse.php b/core/modules/views/src/Ajax/ViewAjaxResponse.php
index 9af9a67..d191800 100644
--- a/core/modules/views/src/Ajax/ViewAjaxResponse.php
+++ b/core/modules/views/src/Ajax/ViewAjaxResponse.php
@@ -32,7 +32,7 @@ public function setView(ViewExecutable $view) {
   /**
    * Gets the executed view of this response.
    *
-   * @return \Drupal\views\ViewExecutable $view
+   * @return \Drupal\views\ViewExecutable
    *   The View executed on this ajax request.
    */
   public function getView() {
diff --git a/core/modules/views/src/Plugin/views/HandlerBase.php b/core/modules/views/src/Plugin/views/HandlerBase.php
index b6b5a5b..4c741c6 100644
--- a/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -537,7 +537,7 @@ public function adminSummary() { }
    * Determine if this item is 'exposed', meaning it provides form elements
    * to let users modify the view.
    *
-   * @return TRUE/FALSE
+   * @return bool
    */
   public function isExposed() {
     return !empty($this->options['exposed']);
diff --git a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
index 7abd1df..1ad9b45 100644
--- a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
@@ -105,7 +105,7 @@ public function exceptionTitle() {
   /**
    * Determine if the argument needs a style plugin.
    *
-   * @return TRUE/FALSE
+   * @return bool
    */
   public function needsStylePlugin() {
     $info = $this->defaultActions($this->options['default_action']);
diff --git a/core/modules/views/src/Plugin/views/cache/CachePluginBase.php b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
index 87465ca..3b79c69 100644
--- a/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
+++ b/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
@@ -263,7 +263,7 @@ protected function getDefaultCacheMaxAge() {
    * @param \Drupal\views\ResultRow[] $result
    *   The result containing loaded entities.
    *
-   * @return \Drupal\views\ResultRow[] $result
+   * @return \Drupal\views\ResultRow[]
    *   The result without loaded entities.
    */
   protected function prepareViewResult(array $result) {
diff --git a/core/modules/views/src/Plugin/views/display/Block.php b/core/modules/views/src/Plugin/views/display/Block.php
index 3e35d7e..1d2cffb 100644
--- a/core/modules/views/src/Plugin/views/display/Block.php
+++ b/core/modules/views/src/Plugin/views/display/Block.php
@@ -260,7 +260,7 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @return array $form
+   * @return array
    *   The renderable form array representing the entire configuration form.
    *
    * @see \Drupal\views\Plugin\Block\ViewsBlock::blockForm()
diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 068ed89..e2abfb1 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -1220,7 +1220,7 @@ protected function setOverrideOptions(array $options, DisplayPluginBase $display
    * @param bool $unset
    *   Should the view be removed from the list of validated views.
    *
-   * @return \Drupal\views_ui\ViewUI $view
+   * @return \Drupal\views_ui\ViewUI
    *   The validated view object.
    */
   protected function retrieveValidatedView(array $form, FormStateInterface $form_state, $unset = TRUE) {
diff --git a/core/modules/views/src/Tests/ViewsEscapingTest.php b/core/modules/views/src/Tests/ViewsEscapingTest.php
index 34f5148..08892c0 100644
--- a/core/modules/views/src/Tests/ViewsEscapingTest.php
+++ b/core/modules/views/src/Tests/ViewsEscapingTest.php
@@ -51,8 +51,8 @@ public function testViewsViewFieldsEscaping() {
 
     // Make base theme default then test for hook invocations.
     $this->config('system.theme')
-        ->set('default', 'views_test_theme')
-        ->save();
+      ->set('default', 'views_test_theme')
+      ->save();
     $this->assertEqual($this->config('system.theme')->get('default'), 'views_test_theme');
 
     $this->drupalGet('test_page_display_200');
diff --git a/core/modules/views/src/Tests/ViewsThemeIntegrationTest.php b/core/modules/views/src/Tests/ViewsThemeIntegrationTest.php
index e9beb38..63e7e2e 100644
--- a/core/modules/views/src/Tests/ViewsThemeIntegrationTest.php
+++ b/core/modules/views/src/Tests/ViewsThemeIntegrationTest.php
@@ -49,8 +49,8 @@ public function testThemedViewPage() {
 
     // Make base theme default then test for hook invocations.
     $this->config('system.theme')
-        ->set('default', 'test_basetheme')
-        ->save();
+      ->set('default', 'test_basetheme')
+      ->save();
     $this->assertEqual($this->config('system.theme')->get('default'), 'test_basetheme');
 
     // Make sure a views rendered page is touched.
@@ -62,8 +62,8 @@ public function testThemedViewPage() {
     // Make sub theme default to test for hook invocation
     // from both sub and base theme.
     $this->config('system.theme')
-        ->set('default', 'test_subtheme')
-        ->save();
+      ->set('default', 'test_subtheme')
+      ->save();
     $this->assertEqual($this->config('system.theme')->get('default'), 'test_subtheme');
 
     // Make sure a views rendered page is touched.
diff --git a/core/modules/views/src/ViewsData.php b/core/modules/views/src/ViewsData.php
index 8bb6b53..a079413 100644
--- a/core/modules/views/src/ViewsData.php
+++ b/core/modules/views/src/ViewsData.php
@@ -113,7 +113,7 @@ public function __construct(CacheBackendInterface $cache_backend, ConfigFactoryI
    *
    * @see https://www.drupal.org/node/2723553
    *
-   * @return array $data
+   * @return array
    *   An array of table data.
    */
   public function getAll() {
@@ -140,7 +140,7 @@ public function getAll() {
    *
    * @see https://www.drupal.org/node/2723553
    *
-   * @return array $data
+   * @return array
    *   An array of table data.
    */
   public function get($key = NULL) {
diff --git a/core/modules/views/src/ViewsDataHelper.php b/core/modules/views/src/ViewsDataHelper.php
index 791cd37..bbdf809 100644
--- a/core/modules/views/src/ViewsDataHelper.php
+++ b/core/modules/views/src/ViewsDataHelper.php
@@ -37,7 +37,7 @@ public function __construct(ViewsData $views_data) {
   /**
    * Fetches a list of all fields available for a given base type.
    *
-   * @param (array|string) $base
+   * @param array|string $base
    *   A list or a single base_table, for example node.
    * @param string $type
    *   The handler type, for example field or filter.
diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
index 60ba8e5..3805e8c 100644
--- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
+++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php
@@ -87,8 +87,8 @@ protected function setUp() {
 
     $typed_data_manager = $this->getMock(TypedDataManagerInterface::class);
     $typed_data_manager->expects($this->any())
-        ->method('createDataDefinition')
-        ->willReturn($this->getMock('Drupal\Core\TypedData\DataDefinitionInterface'));
+      ->method('createDataDefinition')
+      ->willReturn($this->getMock('Drupal\Core\TypedData\DataDefinitionInterface'));
     $this->baseEntityType = new TestEntityType([
       'base_table' => 'entity_test',
       'id' => 'entity_test',
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index e82c85a..9ad822f 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -57,6 +57,8 @@
     <exclude name="Drupal.Commenting.FunctionComment.ParamCommentFullStop"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamCommentNotCapital"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamNameNoMatch"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ParamTypeSpaces"/>
+    <exclude name="Drupal.Commenting.FunctionComment.ReturnTypeSpaces"/>
     <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
   </rule>
   <rule ref="Drupal.ControlStructures.ElseIf"/>
diff --git a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php b/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
index b4d8de9..a7db812 100644
--- a/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
+++ b/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
@@ -101,8 +101,8 @@ public function configurationDataProvider() {
 
     // Get a unique FileCache class.
     $file_cache = $this->getMockBuilder(FileCache::class)
-       ->disableOriginalConstructor()
-       ->getMock();
+      ->disableOriginalConstructor()
+      ->getMock();
     $class = get_class($file_cache);
 
     // Test fallback configuration.
diff --git a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php b/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php
index 883f851..23f2386 100644
--- a/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php
+++ b/core/tests/Drupal/Tests/Core/Database/Driver/pgsql/PostgresqlConnectionTest.php
@@ -29,7 +29,7 @@ protected function setUp() {
   /**
    * Data provider for testEscapeTable.
    *
-   * @return []
+   * @return array
    *   An indexed array of where each value is an array of arguments to pass to
    *   testEscapeField. The first value is the expected value, and the second
    *   value is the value to test.
@@ -51,7 +51,7 @@ public function providerEscapeTables() {
   /**
    * Data provider for testEscapeAlias.
    *
-   * @return []
+   * @return array
    *   Array of arrays with the following elements:
    *   - Expected escaped string.
    *   - String to escape.
@@ -68,7 +68,7 @@ public function providerEscapeAlias() {
   /**
    * Data provider for testEscapeField.
    *
-   * @return []
+   * @return array
    *   Array of arrays with the following elements:
    *   - Expected escaped string.
    *   - String to escape.
diff --git a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
index aa45b3b..2256045 100644
--- a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
+++ b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
@@ -398,11 +398,11 @@ public function testWriteCache() {
     $this->cacheBackend
       ->expects($this->exactly(2))
       ->method('get')
-        ->will($this->returnValue(NULL));
+      ->will($this->returnValue(NULL));
     $this->cacheBackend
       ->expects($this->exactly(2))
       ->method('set')
-        ->with($this->logicalOr('module_implements', 'hook_info'));
+      ->with($this->logicalOr('module_implements', 'hook_info'));
     $this->moduleHandler->getImplementations('hook');
     $this->moduleHandler->writeCache();
   }
diff --git a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
index a1095cd..af3ef68 100644
--- a/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
@@ -262,8 +262,8 @@ public function testRebuildIfNeeded() {
       ->with('router_rebuild');
 
     $this->yamlDiscovery->expects($this->any())
-                        ->method('findAll')
-                        ->will($this->returnValue(array()));
+      ->method('findAll')
+      ->will($this->returnValue(array()));
 
     $this->routeBuilder->setRebuildNeeded();
 
diff --git a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
index ea93703..25e3aad 100644
--- a/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
+++ b/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
@@ -44,8 +44,8 @@ public function testEscaping($template, $expected) {
     $nodes = $twig->parse($twig->tokenize($template));
 
     $this->assertSame($expected, $nodes->getNode('body')
-        ->getNode(0)
-        ->getNode('expr') instanceof \Twig_Node_Expression_Filter);
+      ->getNode(0)
+      ->getNode('expr') instanceof \Twig_Node_Expression_Filter);
   }
 
   /**