diff --git a/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php b/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php index bafe8d504f..044ff8c1d5 100644 --- a/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php +++ b/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php @@ -263,9 +263,7 @@ public function getValidOpml(array $feeds) { foreach ($feeds as &$feed) { $feed['url[0][value]'] = Html::escape($feed['url[0][value]']); } - /** - * Does not have an XML declaration, must pass the parser. - */ + // Does not have an XML declaration, must pass the parser. $opml = << diff --git a/core/modules/field/src/FieldConfigAccessControlHandler.php b/core/modules/field/src/FieldConfigAccessControlHandler.php index 6ee0e05cb6..d3a297430a 100644 --- a/core/modules/field/src/FieldConfigAccessControlHandler.php +++ b/core/modules/field/src/FieldConfigAccessControlHandler.php @@ -24,7 +24,7 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter // a certain field storage config entity, it should also be allowed for all // associated field config entities. // @see \Drupal\Core\Field\FieldDefinitionInterface - /** \Drupal\field\FieldConfigInterface $entity */ + /** @var \Drupal\field\FieldConfigInterface $entity */ $field_storage_entity = $entity->getFieldStorageDefinition(); return $field_storage_entity->access($operation, $account, TRUE); } diff --git a/core/modules/field/src/FieldStorageConfigAccessControlHandler.php b/core/modules/field/src/FieldStorageConfigAccessControlHandler.php index da48556fab..bfa09a30ca 100644 --- a/core/modules/field/src/FieldStorageConfigAccessControlHandler.php +++ b/core/modules/field/src/FieldStorageConfigAccessControlHandler.php @@ -18,7 +18,7 @@ class FieldStorageConfigAccessControlHandler extends EntityAccessControlHandler * {@inheritdoc} */ protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) { - /** \Drupal\field\FieldStorageConfigInterface $entity */ + /** @var \Drupal\field\FieldStorageConfigInterface $entity */ if ($operation === 'delete') { if ($entity->isLocked()) { return AccessResult::forbidden()->addCacheableDependency($entity); diff --git a/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php b/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php index 8e6766928b..a10ef7348e 100644 --- a/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php @@ -95,17 +95,16 @@ public function testTaxonomyVocabularyTree() { $term[5]->parent = [$term[4]->id()]; $term[5]->save(); - /** - * Expected tree: - * term[0] | depth: 0 - * term[1] | depth: 0 - * -- term[2] | depth: 1 - * ---- term[3] | depth: 2 - * term[4] | depth: 0 - * -- term[5] | depth: 1 - * ---- term[2] | depth: 2 - * ------ term[3] | depth: 3 - */ + // Expected tree: + // term[0] | depth: 0 + // term[1] | depth: 0 + // -- term[2] | depth: 1 + // ---- term[3] | depth: 2 + // term[4] | depth: 0 + // -- term[5] | depth: 1 + // ---- term[2] | depth: 2 + // ------ term[3] | depth: 3 + // // Count $term[1] parents with $max_depth = 1. $tree = $taxonomy_storage->loadTree($vocabulary->id(), $term[1]->id(), 1); $this->assertCount(1, $tree, 'We have one parent with depth 1.'); diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php index 96968b5e32..5e21add751 100644 --- a/core/modules/views/src/Plugin/views/query/Sql.php +++ b/core/modules/views/src/Plugin/views/query/Sql.php @@ -1283,10 +1283,9 @@ public function query($get_count = FALSE) { $distinct = TRUE; } - /** - * An optimized count query includes just the base field instead of all the fields. - * Determine of this query qualifies by checking for a groupby or distinct. - */ + // An optimized count query includes just the base field instead of all the + // fields. + // Determine if this query qualifies by checking for a groupby or distinct. if ($get_count && !$this->groupby) { foreach ($this->fields as $field) { if (!empty($field['distinct']) || !empty($field['function'])) { diff --git a/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php index baaa1b7fb3..7500feda4a 100644 --- a/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php +++ b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php @@ -77,16 +77,13 @@ public function buildForm(array $form, FormStateInterface $form_state) { $group_options = []; - /** - * Filter groups is an array that contains: - * array( - * 'operator' => 'and' || 'or', - * 'groups' => array( - * $group_id => 'and' || 'or', - * ), - * ); - */ - + // Filter groups is an array that contains: + // array( + // 'operator' => 'and' || 'or', + // 'groups' => array( + // $group_id => 'and' || 'or', + // ), + // ); $grouping = count(array_keys($groups['groups'])) > 1; $form['filter_groups']['#tree'] = TRUE; diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist index 4c70d11b43..50c6d226fc 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -85,7 +85,6 @@ - diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityDecoupledTranslationRevisionsTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityDecoupledTranslationRevisionsTest.php index f2be89d3fd..f436d90d99 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityDecoupledTranslationRevisionsTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDecoupledTranslationRevisionsTest.php @@ -418,7 +418,7 @@ protected function doEditStep($active_langcode, $default_revision, $untranslatab $violations = $entity->validate(); $messages = []; foreach ($violations as $violation) { - /** \Symfony\Component\Validator\ConstraintViolationInterface */ + /** @var \Symfony\Component\Validator\ConstraintViolationInterface $violation */ $messages[] = $violation->getMessage(); } $this->assertEquals($valid, !$violations->count(), $this->formatMessage('Validation does not match the expected result: %s', implode(', ', $messages))); diff --git a/core/themes/claro/claro.theme b/core/themes/claro/claro.theme index dd4497f169..08bb5f07b4 100644 --- a/core/themes/claro/claro.theme +++ b/core/themes/claro/claro.theme @@ -1103,11 +1103,9 @@ function claro_preprocess_system_themes_page(&$variables) { foreach ($variables['theme_groups'] as &$theme_group) { if (!empty($theme_group['themes'])) { foreach ($theme_group['themes'] as &$theme_card) { - /** - * @todo Remove dependency on attributes after - * https://www.drupal.org/project/drupal/issues/2511548 has been - * resolved. - */ + // @todo Remove dependency on attributes after + // https://www.drupal.org/project/drupal/issues/2511548 has been + // resolved. if (isset($theme_card['screenshot']['#attributes']) && $theme_card['screenshot']['#attributes'] instanceof Attribute && $theme_card['screenshot']['#attributes']->hasClass('no-screenshot')) { unset($theme_card['screenshot']); }