diff --git a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php index b56aa99aa7..f9317f37a7 100644 --- a/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php +++ b/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php @@ -320,7 +320,7 @@ protected function _compareseq($xoff, $xlim, $yoff, $ylim) { reset($seps); $pt1 = $seps[0]; while ($pt2 = next($seps)) { - $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]); + $this->_compareseq($pt1[0], $pt2[0], $pt1[1], $pt2[1]); $pt1 = $pt2; } } diff --git a/core/modules/contact/tests/src/Functional/ContactPersonalTest.php b/core/modules/contact/tests/src/Functional/ContactPersonalTest.php index 5f6e8e6ad2..8304d7c7e5 100644 --- a/core/modules/contact/tests/src/Functional/ContactPersonalTest.php +++ b/core/modules/contact/tests/src/Functional/ContactPersonalTest.php @@ -139,7 +139,7 @@ public function testPersonalContactAccess() { $this->drupalGet('user/' . $this->contactUser->id()); $contact_link = '/user/' . $this->contactUser->id() . '/contact'; $this->assertResponse(200); - $this->assertNoLinkByHref ($contact_link, 'The "contact" tab is hidden on profiles for users with no email address'); + $this->assertNoLinkByHref($contact_link, 'The "contact" tab is hidden on profiles for users with no email address'); // Restore original email address. $this->contactUser->setEmail($original_email)->save(); diff --git a/core/modules/locale/src/Plugin/QueueWorker/LocaleTranslation.php b/core/modules/locale/src/Plugin/QueueWorker/LocaleTranslation.php index 634ba8dbf0..2d07fab3d6 100644 --- a/core/modules/locale/src/Plugin/QueueWorker/LocaleTranslation.php +++ b/core/modules/locale/src/Plugin/QueueWorker/LocaleTranslation.php @@ -99,7 +99,7 @@ public function processItem($data) { } else { $batch_context = $args[$last]; - unset ($args[$last]); + unset($args[$last]); } $args = array_merge($args, [&$batch_context]); diff --git a/core/modules/system/src/Tests/Ajax/MultiFormTest.php b/core/modules/system/src/Tests/Ajax/MultiFormTest.php index 9ca2a66781..96844ed051 100644 --- a/core/modules/system/src/Tests/Ajax/MultiFormTest.php +++ b/core/modules/system/src/Tests/Ajax/MultiFormTest.php @@ -44,7 +44,7 @@ protected function setUp() { ->save(); // Log in a user who can create 'page' nodes. - $this->drupalLogin ($this->drupalCreateUser(['create page content'])); + $this->drupalLogin($this->drupalCreateUser(['create page content'])); } /** diff --git a/core/modules/system/src/Tests/Form/StorageTest.php b/core/modules/system/src/Tests/Form/StorageTest.php index 7896b5362c..a1f7fee3df 100644 --- a/core/modules/system/src/Tests/Form/StorageTest.php +++ b/core/modules/system/src/Tests/Form/StorageTest.php @@ -28,7 +28,7 @@ class StorageTest extends WebTestBase { protected function setUp() { parent::setUp(); - $this->drupalLogin ($this->drupalCreateUser()); + $this->drupalLogin($this->drupalCreateUser()); } /** diff --git a/core/modules/system/src/Tests/System/FrontPageTest.php b/core/modules/system/src/Tests/System/FrontPageTest.php index f5782b708b..9f39b4b261 100644 --- a/core/modules/system/src/Tests/System/FrontPageTest.php +++ b/core/modules/system/src/Tests/System/FrontPageTest.php @@ -30,7 +30,7 @@ protected function setUp() { parent::setUp(); // Create admin user, log in admin user, and create one node. - $this->drupalLogin ($this->drupalCreateUser([ + $this->drupalLogin($this->drupalCreateUser([ 'access content', 'administer site configuration', ])); diff --git a/core/modules/system/tests/src/Functional/File/ConfigTest.php b/core/modules/system/tests/src/Functional/File/ConfigTest.php index da2003aa7d..f413c38cac 100644 --- a/core/modules/system/tests/src/Functional/File/ConfigTest.php +++ b/core/modules/system/tests/src/Functional/File/ConfigTest.php @@ -13,7 +13,7 @@ class ConfigTest extends BrowserTestBase { protected function setUp(){ parent::setUp(); - $this->drupalLogin ($this->drupalCreateUser(['administer site configuration'])); + $this->drupalLogin($this->drupalCreateUser(['administer site configuration'])); } /** diff --git a/core/modules/system/tests/src/Functional/System/DateTimeTest.php b/core/modules/system/tests/src/Functional/System/DateTimeTest.php index 3d35f96e2e..bdecab5d4c 100644 --- a/core/modules/system/tests/src/Functional/System/DateTimeTest.php +++ b/core/modules/system/tests/src/Functional/System/DateTimeTest.php @@ -25,7 +25,7 @@ protected function setUp() { parent::setUp(); // Create admin user and log in admin user. - $this->drupalLogin ($this->drupalCreateUser([ + $this->drupalLogin($this->drupalCreateUser([ 'administer site configuration', 'administer content types', 'administer nodes', diff --git a/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php b/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php index 8fa81ac290..b3f9b310b3 100644 --- a/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php +++ b/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php @@ -22,7 +22,7 @@ protected function setUp() { parent::setUp(); // Create an administrator user. - $this->drupalLogin ($this->drupalCreateUser(['administer software updates'])); + $this->drupalLogin($this->drupalCreateUser(['administer software updates'])); } /** diff --git a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php index 74bcc083e1..43cc5ed8f9 100644 --- a/core/modules/views/tests/src/Unit/EntityViewsDataTest.php +++ b/core/modules/views/tests/src/Unit/EntityViewsDataTest.php @@ -242,8 +242,7 @@ public function testRevisionTableWithoutDataTable() { ->set('revision_table', 'entity_test_mulrev_revision') ->set('revision_data_table', NULL) ->set('id', 'entity_test_mulrev') - ->setKey('revision', 'revision_id') - ; + ->setKey('revision', 'revision_id'); $this->viewsData->setEntityType($entity_type); $data = $this->viewsData->getViewsData(); @@ -278,8 +277,7 @@ public function testRevisionTableWithRevisionDataTableAndDataTable() { ->set('revision_data_table', 'entity_test_mulrev_property_revision') ->set('id', 'entity_test_mulrev') ->set('translatable', TRUE) - ->setKey('revision', 'revision_id') - ; + ->setKey('revision', 'revision_id'); $this->viewsData->setEntityType($entity_type); $data = $this->viewsData->getViewsData(); @@ -322,8 +320,7 @@ public function testRevisionTableWithRevisionDataTable() { ->set('revision_data_table', 'entity_test_mulrev_property_revision') ->set('id', 'entity_test_mulrev') ->set('translatable', TRUE) - ->setKey('revision', 'revision_id') - ; + ->setKey('revision', 'revision_id'); $this->viewsData->setEntityType($entity_type); $data = $this->viewsData->getViewsData(); @@ -547,8 +544,7 @@ public function testDataTableFields() { ->set('data_table', 'entity_test_mul_property_data') ->set('base_table', 'entity_test_mul') ->set('id', 'entity_test_mul') - ->setKey('bundle', 'type') - ; + ->setKey('bundle', 'type'); $base_field_definitions = $this->setupBaseFields(EntityTestMul::baseFieldDefinitions($this->baseEntityType)); $base_field_definitions['type'] = BaseFieldDefinition::create('entity_reference') ->setLabel('entity test type') diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist index f992e69933..d96649ff77 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -142,6 +142,29 @@ 0 + + + + + 0 + + + 0 + + + + 0 + + + 0 + + + 0 + + + 0 + + diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php index 8381ea7c64..fe060b1da4 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php @@ -581,8 +581,7 @@ protected function registerLinkTemplate($link_template) { protected function registerBundleInfo($bundle_info) { $this->entityManager ->getBundleInfo($this->entityTypeId) - ->willReturn([$this->entityTypeId => $bundle_info]) - ; + ->willReturn([$this->entityTypeId => $bundle_info]); } } diff --git a/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php b/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php index 7e853bca2b..2d079c4be4 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Routing/DefaultHtmlRouteProviderTest.php @@ -136,8 +136,7 @@ public function providerTestGetAddFormRoute() { 'entity_type_id' => 'the_entity_type_id', '_title_callback' => 'Drupal\Core\Entity\Controller\EntityController::addTitle', ]) - ->setRequirement('_entity_create_access', 'the_entity_type_id') - ; + ->setRequirement('_entity_create_access', 'the_entity_type_id'); $data['no_add_form_no_bundle'] = [clone $route, $entity_type2->reveal()]; $entity_type3 = $this->getEntityType($entity_type2);