diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php index 16f018490118169b4ea9db7394cc6be905c70dc6..e696f242fd30492164c065a7580c347f0e73dee3 100644 --- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php +++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php @@ -112,7 +112,7 @@ public static function open(array &$connection_options = []) { // so backslashes in the password need to be doubled up. // The bug was reported against pdo_pgsql 1.0.2, backslashes in passwords // will break on this doubling up when the bug is fixed, so check the version - //elseif (phpversion('pdo_pgsql') < 'version_this_was_fixed_in') { + // elseif (phpversion('pdo_pgsql') < 'version_this_was_fixed_in') { else { $connection_options['password'] = str_replace('\\', '\\\\', $connection_options['password']); } diff --git a/core/lib/Drupal/Core/Database/StatementInterface.php b/core/lib/Drupal/Core/Database/StatementInterface.php index a34bf617fabb159d6d1fb858e07290eae4904782..a97043af6243db6c56d710d9c671aba894f5ecb2 100644 --- a/core/lib/Drupal/Core/Database/StatementInterface.php +++ b/core/lib/Drupal/Core/Database/StatementInterface.php @@ -37,7 +37,7 @@ interface StatementInterface extends \Traversable { * "the access type must be omitted" if it is protected; i.e., conflicting * statements). The access type has to be protected. */ - //protected function __construct(Connection $dbh); + // protected function __construct(Connection $dbh); /** * Executes a prepared statement diff --git a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php index 9f189638ad0de154ad4cb88ee1be9f9dacd2560b..99c1c0688125e738180c7e206a01153282e3e924 100644 --- a/core/lib/Drupal/Core/FileTransfer/FTPExtension.php +++ b/core/lib/Drupal/Core/FileTransfer/FTPExtension.php @@ -108,7 +108,7 @@ public function chmodJailed($path, $mode, $recursive) { if ($this->isDirectory($path) && $recursive) { $filelist = @ftp_nlist($this->connection, $path); if (!$filelist) { - //empty directory - returns false + // empty directory - returns false return; } foreach ($filelist as $file) { diff --git a/core/modules/comment/src/Controller/CommentController.php b/core/modules/comment/src/Controller/CommentController.php index c834fa67a1cc818fd5f347105b15aa321549f2d6..a01106d77f611c6614eab9f22295bd1d5978a4fc 100644 --- a/core/modules/comment/src/Controller/CommentController.php +++ b/core/modules/comment/src/Controller/CommentController.php @@ -288,7 +288,7 @@ public function replyFormAccess(EntityInterface $entity, $field_name, $pid = NUL // Check if the user has the proper permissions. $access = $access->andIf(AccessResult::allowedIfHasPermission($account, 'access comments')); - /// Load the parent comment. + // Load the parent comment. $comment = $this->entityManager()->getStorage('comment')->load($pid); // Check if the parent comment is published and belongs to the entity. $access = $access->andIf(AccessResult::allowedIf($comment && $comment->isPublished() && $comment->getCommentedEntityId() == $entity->id())); diff --git a/core/modules/comment/src/Plugin/views/sort/Thread.php b/core/modules/comment/src/Plugin/views/sort/Thread.php index 1984934d4703773b1cd68e07e5c209ca521e08b2..44fba2989c3d24631b48ec67017216f7b597a817 100644 --- a/core/modules/comment/src/Plugin/views/sort/Thread.php +++ b/core/modules/comment/src/Plugin/views/sort/Thread.php @@ -16,14 +16,14 @@ class Thread extends SortPluginBase { public function query() { $this->ensureMyTable(); - //Read comment_render() in comment.module for an explanation of the - //thinking behind this sort. + // Read comment_render() in comment.module for an explanation of the + // thinking behind this sort. if ($this->options['order'] == 'DESC') { $this->query->addOrderBy($this->tableAlias, $this->realField, $this->options['order']); } else { $alias = $this->tableAlias . '_' . $this->realField . 'asc'; - //@todo is this secure? + // @todo is this secure? $this->query->addOrderBy(NULL, "SUBSTRING({$this->tableAlias}.{$this->realField}, 1, (LENGTH({$this->tableAlias}.{$this->realField}) - 1))", $this->options['order'], $alias); } } diff --git a/core/modules/contact/tests/src/Unit/MailHandlerTest.php b/core/modules/contact/tests/src/Unit/MailHandlerTest.php index 898ea226c8da5ec48fbb693546b33dea91724bf2..ba3bfad81662c929fd53787b7d62133abdca5d67 100644 --- a/core/modules/contact/tests/src/Unit/MailHandlerTest.php +++ b/core/modules/contact/tests/src/Unit/MailHandlerTest.php @@ -234,7 +234,7 @@ public function getSendMailMessages() { $results[] = $result + $default_result; $data[] = [$message, $sender, $results]; - //For authenticated user. + // For authenticated user. $results = []; $message = $this->getAuthenticatedMockMessage(); $sender = $this->getMockSender(FALSE, 'user@drupal.org'); diff --git a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php index 90895b186f0d8f0ac6ea3e60f6a736ca89cd48ce..1e6511fd68fca392c2b174b67c72ceb3fb29b57c 100644 --- a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php +++ b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php @@ -213,17 +213,17 @@ public function testMultipleTargetBundles() { // a way to catch and assert user-triggered errors. // Test the case when the field config settings are inconsistent. - //unset($handler_settings['auto_create_bundle']); - //$field_config->setSetting('handler_settings', $handler_settings); - //$field_config->save(); + // unset($handler_settings['auto_create_bundle']); + // $field_config->setSetting('handler_settings', $handler_settings); + // $field_config->save(); // - //$this->drupalGet('node/add/' . $this->referencingType); - //$error_message = sprintf( + // $this->drupalGet('node/add/' . $this->referencingType); + // $error_message = sprintf( // "Create referenced entities if they don't already exist option is enabled but a specific destination bundle is not set. You should re-visit and fix the settings of the '%s' (%s) field.", // $field_config->getLabel(), // $field_config->getName() - //); - //$this->assertErrorLogged($error_message); + // ); + // $this->assertErrorLogged($error_message); } } diff --git a/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php b/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php index 2b0be855dd826b967c7a3779f4da8748bd2d7d00..5f4c8ee46be5024bbc2ad51bf5bc6b43c88e2ba4 100644 --- a/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php +++ b/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php @@ -272,7 +272,7 @@ public function testDataTableRelationshipWithLongFieldName() { $this->assertEqual($row->_entity->id(), $this->entities[$index]->id()); // Test the forward relationship. - //$this->assertEqual($row->entity_test_entity_test_mul__field_data_test_id, 1); + // $this->assertEqual($row->entity_test_entity_test_mul__field_data_test_id, 1); // Test that the correct relationship entity is on the row. $this->assertEqual($row->_relationship_entities['field_test_data_with_a_long_name']->id(), 1); diff --git a/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php b/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php index 578eeda9c639bc0239ee1f03f8a6b6d72e640d04..ba47d91307ce0b6be3a67cc2455e814fcbcfb844 100644 --- a/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php +++ b/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php @@ -93,7 +93,7 @@ public function testNumberItem() { $this->assertEqual($entity->field_float->value, $new_float); $this->assertEqual($entity->field_decimal->value, $new_decimal); - /// Test sample item generation. + // Test sample item generation. $entity = EntityTest::create(); $entity->field_integer->generateSampleItems(); $entity->field_float->generateSampleItems(); diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index e3095346ddaa8875230d916e9bd9e1c09ee04d4d..87ff713bdf2665528c608dd02115b872b15e58fc 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -496,8 +496,8 @@ function _filter_url($text, $filter) { $valid_url_query_chars = '[a-zA-Z0-9!?\*\'@\(\);:&=\+\$\/%#\[\]\-_\.,~|]'; $valid_url_query_ending_chars = '[a-zA-Z0-9_&=#\/]'; - //full path - //and allow @ in a url, but only in the middle. Catch things like http://example.com/@user/ + // full path + // and allow @ in a url, but only in the middle. Catch things like http://example.com/@user/ $valid_url_path = '(?:(?:' . $valid_url_path_characters . '*(?:' . $valid_url_balanced_parens . $valid_url_path_characters . '*)*' . $valid_url_ending_characters . ')|(?:@' . $valid_url_path_characters . '+\/))'; // Prepare domain name pattern. diff --git a/core/modules/forum/tests/src/Functional/ForumTest.php b/core/modules/forum/tests/src/Functional/ForumTest.php index 260f63a830c88415c6d460cb7943193a6f64d06f..9ba4be7b2a55c97759367b21e61048d4d7791dfa 100644 --- a/core/modules/forum/tests/src/Functional/ForumTest.php +++ b/core/modules/forum/tests/src/Functional/ForumTest.php @@ -118,7 +118,7 @@ protected function setUp() { * Tests forum functionality through the admin and user interfaces. */ public function testForum() { - //Check that the basic forum install creates a default forum topic + // Check that the basic forum install creates a default forum topic $this->drupalGet('/forum'); // Look for the "General discussion" default forum $this->assertRaw(Link::createFromRoute(t('General discussion'), 'forum.page', ['taxonomy_term' => 1])->toString(), "Found the default forum at the /forum listing"); diff --git a/core/modules/migrate/src/Plugin/Migration.php b/core/modules/migrate/src/Plugin/Migration.php index c7457b2025d7724e4d63d581867e8027d71931e9..c81d498460f9b5e2644d1f53f726e9cb27744ac4 100644 --- a/core/modules/migrate/src/Plugin/Migration.php +++ b/core/modules/migrate/src/Plugin/Migration.php @@ -572,7 +572,7 @@ public function setProcessOfProperty($property, $process_of_property) { */ public function mergeProcessOfProperty($property, array $process_of_property) { // If we already have a process value then merge the incoming process array - //otherwise simply set it. + // otherwise simply set it. $current_process = $this->getProcess(); if (isset($current_process[$property])) { $this->process = NestedArray::mergeDeepArray([$current_process, $this->getProcessNormalized([$property => $process_of_property])], TRUE); diff --git a/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php b/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php index 9a453fb7ab5af48fbff99891c8d4442260db3617..546ac3af6d9edb99867348e5eb649cc3644021ef 100644 --- a/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php +++ b/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php @@ -172,7 +172,7 @@ public function testEditorWithCustomMetadata() { 'format' => 'full_html' ], ]; - $this->assertEqual($expected, $metadata); //, 'The correct metadata (including custom metadata) is generated.'); + $this->assertEqual($expected, $metadata); // , 'The correct metadata (including custom metadata) is generated.'); } } diff --git a/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php b/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php index 629c4aa810155475847ba92190839e18b221957a..b91215db5b3d611ede4a02992495aa73877018fc 100644 --- a/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php +++ b/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php @@ -125,23 +125,23 @@ public function testNodeTeaser() { 'value' => 'http://www.w3.org/2004/02/skos/core#Concept', ]; // @todo Enable with https://www.drupal.org/node/2072791. - //$this->assertTrue($graph->hasProperty($taxonomy_term_1_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Taxonomy term type found in RDF output (skos:Concept).'); + // $this->assertTrue($graph->hasProperty($taxonomy_term_1_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Taxonomy term type found in RDF output (skos:Concept).'); $expected_value = [ 'type' => 'literal', 'value' => $term1->getName(), ]; - //$this->assertTrue($graph->hasProperty($taxonomy_term_1_uri, 'http://www.w3.org/2000/01/rdf-schema#label', $expected_value), 'Taxonomy term name found in RDF output (rdfs:label).'); + // $this->assertTrue($graph->hasProperty($taxonomy_term_1_uri, 'http://www.w3.org/2000/01/rdf-schema#label', $expected_value), 'Taxonomy term name found in RDF output (rdfs:label).'); // Term 2. $expected_value = [ 'type' => 'uri', 'value' => 'http://www.w3.org/2004/02/skos/core#Concept', ]; - //$this->assertTrue($graph->hasProperty($taxonomy_term_2_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Taxonomy term type found in RDF output (skos:Concept).'); + // $this->assertTrue($graph->hasProperty($taxonomy_term_2_uri, 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type', $expected_value), 'Taxonomy term type found in RDF output (skos:Concept).'); $expected_value = [ 'type' => 'literal', 'value' => $term2->getName(), ]; - //$this->assertTrue($graph->hasProperty($taxonomy_term_2_uri, 'http://www.w3.org/2000/01/rdf-schema#label', $expected_value), 'Taxonomy term name found in RDF output (rdfs:label).'); + // $this->assertTrue($graph->hasProperty($taxonomy_term_2_uri, 'http://www.w3.org/2000/01/rdf-schema#label', $expected_value), 'Taxonomy term name found in RDF output (rdfs:label).'); } } diff --git a/core/modules/rdf/tests/src/Functional/StandardProfileTest.php b/core/modules/rdf/tests/src/Functional/StandardProfileTest.php index 76ae39bc8a0a6c3996a58ecdda5560654225388b..8662b9daca55c963d1b8c277155c91765df84522 100644 --- a/core/modules/rdf/tests/src/Functional/StandardProfileTest.php +++ b/core/modules/rdf/tests/src/Functional/StandardProfileTest.php @@ -407,7 +407,7 @@ protected function assertRdfaArticleProperties($graph, $message_prefix) { // Tag type. // @todo Enable with https://www.drupal.org/node/2072791. - //$this->assertEqual($graph->type($this->termUri), 'schema:Thing', 'Tag type was found (schema:Thing).'); + // $this->assertEqual($graph->type($this->termUri), 'schema:Thing', 'Tag type was found (schema:Thing).'); // Tag name. $expected_value = [ @@ -416,7 +416,7 @@ protected function assertRdfaArticleProperties($graph, $message_prefix) { 'lang' => 'en', ]; // @todo Enable with https://www.drupal.org/node/2072791. - //$this->assertTrue($graph->hasProperty($this->termUri, 'http://schema.org/name', $expected_value), "$message_prefix name was found (schema:name)."); + // $this->assertTrue($graph->hasProperty($this->termUri, 'http://schema.org/name', $expected_value), "$message_prefix name was found (schema:name)."); } /** diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php index 5b5101445a59bac2c5718bde7eb32f7716950c24..bade2a76c695869793daa7751799fa520b277622 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Comment/CommentResourceTestBase.php @@ -279,7 +279,7 @@ public function testPostDxWithoutCriticalBaseFields() { $this->assertSame(500, $response->getStatusCode()); $this->assertSame(['text/plain; charset=UTF-8'], $response->getHeader('Content-Type')); $this->assertStringStartsWith('The website encountered an unexpected error. Please try again later.

Symfony\Component\HttpKernel\Exception\HttpException: Internal Server Error in Drupal\rest\Plugin\rest\resource\EntityResource->post()', (string) $response->getBody()); - //$this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nentity_type: This value should not be null.\n", $response); + // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nentity_type: This value should not be null.\n", $response); // DX: 422 when missing 'entity_id' field. $request_options[RequestOptions::BODY] = $this->serializer->encode(array_diff_key($this->getNormalizedPostEntity(), ['entity_id' => TRUE]), static::$format); @@ -288,14 +288,14 @@ public function testPostDxWithoutCriticalBaseFields() { try { $response = $this->request('POST', $url, $request_options); // This happens on DrupalCI. - //$this->assertSame(500, $response->getStatusCode()); + // $this->assertSame(500, $response->getStatusCode()); } catch (\Exception $e) { // This happens on Wim's local machine. - //$this->assertSame("Error: Call to a member function get() on null\nDrupal\\comment\\Plugin\\Validation\\Constraint\\CommentNameConstraintValidator->getAnonymousContactDetailsSetting()() (Line: 96)\n", $e->getMessage()); + // $this->assertSame("Error: Call to a member function get() on null\nDrupal\\comment\\Plugin\\Validation\\Constraint\\CommentNameConstraintValidator->getAnonymousContactDetailsSetting()() (Line: 96)\n", $e->getMessage()); } - //$response = $this->request('POST', $url, $request_options); - //$this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nentity_type: This value should not be null.\n", $response); + // $response = $this->request('POST', $url, $request_options); + // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nentity_type: This value should not be null.\n", $response); // DX: 422 when missing 'entity_type' field. $request_options[RequestOptions::BODY] = $this->serializer->encode(array_diff_key($this->getNormalizedPostEntity(), ['field_name' => TRUE]), static::$format); @@ -303,7 +303,7 @@ public function testPostDxWithoutCriticalBaseFields() { // @todo Uncomment, remove next 2 lines in https://www.drupal.org/node/2820364. $this->assertSame(500, $response->getStatusCode()); $this->assertSame(['text/plain; charset=UTF-8'], $response->getHeader('Content-Type')); - //$this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nfield_name: This value should not be null.\n", $response); + // $this->assertResourceErrorResponse(422, "Unprocessable Entity: validation failed.\nfield_name: This value should not be null.\n", $response); } /** diff --git a/core/modules/system/src/Tests/Form/TriggeringElementTest.php b/core/modules/system/src/Tests/Form/TriggeringElementTest.php index 973d37db9fdcbbb62fc5240e59b15c047bb546f9..fb59cb5e8ac6addb837a8fe64ff384881f496544 100644 --- a/core/modules/system/src/Tests/Form/TriggeringElementTest.php +++ b/core/modules/system/src/Tests/Form/TriggeringElementTest.php @@ -89,7 +89,7 @@ public function testAttemptAccessControlBypass() { // Ensure that the triggering element was not set to the restricted button. // Do this with both a negative and positive assertion, because negative // assertions alone can be brittle. See testNoButtonInfoInPost() for why the - //triggering element gets set to 'button2'. + // triggering element gets set to 'button2'. $this->assertNoText('The clicked button is button1.', '$form_state->getTriggeringElement() not set to a restricted button.'); $this->assertText('The clicked button is button2.', '$form_state->getTriggeringElement() not set to a restricted button.'); } diff --git a/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php b/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php index 76d8be8009f3d3aeafaadba66c73690e1d3bb3df..04b1f663614cc79bfa83748ad43dc25955b02117 100644 --- a/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php +++ b/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php @@ -60,7 +60,7 @@ public function _writeDirectory($base, $files = []) { $this->_writeDirectory($base . DIRECTORY_SEPARATOR . $key, $file); } else { - //just write the filename into the file + // just write the filename into the file file_put_contents($base . DIRECTORY_SEPARATOR . $file, $file); } } diff --git a/core/modules/update/update.module b/core/modules/update/update.module index 32b5b8cc8779488712b4f4c41f0861d187ea5990..385434a230fdf36b37332f458d7dce9b594bdd12 100644 --- a/core/modules/update/update.module +++ b/core/modules/update/update.module @@ -349,7 +349,7 @@ function update_get_available($refresh = FALSE) { foreach ($projects as $key => $project) { // If there's no data at all, we clearly need to fetch some. if (empty($available[$key])) { - //update_create_fetch_task($project); + // update_create_fetch_task($project); \Drupal::service('update.processor')->createFetchTask($project); $needs_refresh = TRUE; continue; diff --git a/core/modules/user/src/Tests/Views/AccessRoleTest.php b/core/modules/user/src/Tests/Views/AccessRoleTest.php index 57055572d2c45dc0cb97719b229ce388af2f2f0a..addda24f278cf3c324db35369d9e6ef5f3f76fd1 100644 --- a/core/modules/user/src/Tests/Views/AccessRoleTest.php +++ b/core/modules/user/src/Tests/Views/AccessRoleTest.php @@ -128,8 +128,8 @@ public function testRenderCaching() { // @todo Fix this in https://www.drupal.org/node/2551037, // DisplayPluginBase::applyDisplayCacheabilityMetadata() is not invoked when // using buildBasicRenderable() and a Views access plugin returns FALSE. - //$this->assertTrue(in_array('user.roles', $build['#cache']['contexts'])); - //$this->assertEqual([], $build['#cache']['tags']); + // $this->assertTrue(in_array('user.roles', $build['#cache']['contexts'])); + // $this->assertEqual([], $build['#cache']['tags']); $this->assertEqual(Cache::PERMANENT, $build['#cache']['max-age']); $this->assertEqual($result, ''); } diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php index 4b11f07484f11cebb92b85b27a80e468154924cd..5f9c9788de31d547141fa5a319732b012b6955b4 100644 --- a/core/modules/views/src/Plugin/views/PluginBase.php +++ b/core/modules/views/src/Plugin/views/PluginBase.php @@ -355,7 +355,7 @@ protected function viewsTokenReplace($text, $tokens) { foreach ($tokens as $token => $replacement) { // Twig wants a token replacement array stripped of curly-brackets. // Some Views tokens come with curly-braces, others do not. - //@todo: https://www.drupal.org/node/2544392 + // @todo: https://www.drupal.org/node/2544392 if (strpos($token, '{{') !== FALSE) { // Twig wants a token replacement array stripped of curly-brackets. $token = trim(str_replace(['{{', '}}'], '', $token)); diff --git a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php index b3956de8ea5ea2175df431cc2c83a324f84c9787..ea2f5b2373f9b05697c6674e48153e923badeb6d 100644 --- a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php +++ b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php @@ -131,7 +131,7 @@ public function testArgumentDefaultFixed() { /** * @todo Test php default argument. */ - //function testArgumentDefaultPhp() {} + // function testArgumentDefaultPhp() {} /** * Test node default argument. diff --git a/core/modules/views/tests/src/Kernel/Handler/SortTranslationTest.php b/core/modules/views/tests/src/Kernel/Handler/SortTranslationTest.php index 549761d540a14a3e02e8c4a1a01172490484bb41..e49ef7a2c7738e9b37618a883d46598ce419982b 100644 --- a/core/modules/views/tests/src/Kernel/Handler/SortTranslationTest.php +++ b/core/modules/views/tests/src/Kernel/Handler/SortTranslationTest.php @@ -42,7 +42,7 @@ protected function setUp($import_test_views = TRUE) { $this->installEntitySchema('node'); $this->installEntitySchema('user'); - //$this->installConfig('node'); + // $this->installConfig('node'); $this->container->get('kernel')->rebuildContainer(); $node_type = NodeType::create(['type' => 'article']); diff --git a/core/modules/views/tests/src/Unit/ViewExecutableTest.php b/core/modules/views/tests/src/Unit/ViewExecutableTest.php index c11e648228100a2ba4cf3feede9fee3f215e27eb..e0aada0285d85472a286617a96c2db1d82c03681 100644 --- a/core/modules/views/tests/src/Unit/ViewExecutableTest.php +++ b/core/modules/views/tests/src/Unit/ViewExecutableTest.php @@ -311,7 +311,7 @@ public function testBuildThemeFunctions() { ]; $this->assertEquals($expected, $view->buildThemeFunctions('test_hook')); - //Change the name of the display plugin and make sure that is in the array. + // Change the name of the display plugin and make sure that is in the array. $view->display_handler->display['display_plugin'] = 'default2'; $expected = [ diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist index 05a598822d9bb8bff30878db8161a0f8189a030a..e8f2753efb4a239dbb48f28ddfa9041c25665867 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -63,6 +63,15 @@ + + + + + + + + + diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php index b3dab6d2b886c75087f7d409f8fc0e12e671fc51..5ded4842b5f80818aed58c4995a2fb3561279b6b 100644 --- a/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php +++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigSchemaTest.php @@ -504,7 +504,7 @@ public function testSchemaFallback() { $definition2 = \Drupal::service('config.typed')->getDefinition('config_schema_test.wildcard_fallback.something.something'); // This should be the schema of config_schema_test.wildcard_fallback.* as - //well. + // well. $this->assertSame($definition, $definition2); } diff --git a/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php b/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php index 0216d3ed564c107eb4c0a8571d1a723d3fa01268..c262e3813b2dc6b56ed567c80feed81d638d6043 100644 --- a/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php +++ b/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php @@ -64,7 +64,7 @@ public function testEnableTargetLogging() { db_query('SELECT name FROM {test} WHERE age > :age', [':age' => 25])->fetchCol(); - db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo'], ['target' => 'replica']);//->fetchCol(); + db_query('SELECT age FROM {test} WHERE name = :name', [':name' => 'Ringo'], ['target' => 'replica']);// ->fetchCol(); $queries1 = Database::getLog('testing1'); diff --git a/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php b/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php index 255a3be3ee8f89bc18b4c8a7c855006821949ddb..c18910e21d4344f0a6098a71e31e280f29206dba 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php @@ -353,7 +353,7 @@ public function testEntityAutocompleteAccess() { public function testEntityAutocompleteIdInput() { /** @var \Drupal\Core\Form\FormBuilderInterface $form_builder */ $form_builder = $this->container->get('form_builder'); - //$form = $form_builder->getForm($this); + // $form = $form_builder->getForm($this); $form_state = (new FormState()) ->setMethod('GET') ->setValues([ diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php index a066616f63c29b0807bfefc6e705ea41b131bb90..7d7ea76e90fe9883c6832e8a3351340de353db99 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php @@ -115,7 +115,7 @@ public function testEntityTypeUpdateWithoutData() { t('The %field_name field needs to be installed.', ['%field_name' => 'Revision ID']), ], ]; - $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected); //, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertEqual($this->entityDefinitionUpdateManager->getChangeSummary(), $expected); // , 'EntityDefinitionUpdateManager reports the expected change summary.'); // Run the update and ensure the revision table is created. $this->entityDefinitionUpdateManager->applyUpdates(); diff --git a/core/tests/Drupal/KernelTests/Core/Path/AliasTest.php b/core/tests/Drupal/KernelTests/Core/Path/AliasTest.php index 704863279f62295b618b082d6d84e2bfbde23b0d..1f49b09ffdc5af3148f66950a596f56114bfc7dc 100644 --- a/core/tests/Drupal/KernelTests/Core/Path/AliasTest.php +++ b/core/tests/Drupal/KernelTests/Core/Path/AliasTest.php @@ -16,16 +16,16 @@ class AliasTest extends PathUnitTestBase { public function testCRUD() { - //Prepare database table. + // Prepare database table. $connection = Database::getConnection(); $this->fixtures->createTables($connection); - //Create Path object. + // Create Path object. $aliasStorage = new AliasStorage($connection, $this->container->get('module_handler')); $aliases = $this->fixtures->sampleUrlAliases(); - //Create a few aliases + // Create a few aliases foreach ($aliases as $idx => $alias) { $aliasStorage->save($alias['source'], $alias['alias'], $alias['langcode']); @@ -34,11 +34,11 @@ public function testCRUD() { $this->assertEqual(count($rows), 1, format_string('Created an entry for %alias.', ['%alias' => $alias['alias']])); - //Cache the pid for further tests. + // Cache the pid for further tests. $aliases[$idx]['pid'] = $rows[0]->pid; } - //Load a few aliases + // Load a few aliases foreach ($aliases as $alias) { $pid = $alias['pid']; $loadedAlias = $aliasStorage->load(['pid' => $pid]); @@ -49,7 +49,7 @@ public function testCRUD() { $loadedAlias = $aliasStorage->load(['source' => '/node/1']); $this->assertEqual($loadedAlias['alias'], '/alias_for_node_1_und', 'The last created alias loaded by default.'); - //Update a few aliases + // Update a few aliases foreach ($aliases as $alias) { $fields = $aliasStorage->save($alias['source'], $alias['alias'] . '_updated', $alias['langcode'], $alias['pid']); @@ -61,7 +61,7 @@ public function testCRUD() { $this->assertEqual($pid, $alias['pid'], format_string('Updated entry for pid %pid.', ['%pid' => $pid])); } - //Delete a few aliases + // Delete a few aliases foreach ($aliases as $alias) { $pid = $alias['pid']; $aliasStorage->delete(['pid' => $pid]); @@ -74,11 +74,11 @@ public function testCRUD() { } public function testLookupPath() { - //Prepare database table. + // Prepare database table. $connection = Database::getConnection(); $this->fixtures->createTables($connection); - //Create AliasManager and Path object. + // Create AliasManager and Path object. $aliasManager = $this->container->get('path.alias_manager'); $aliasStorage = new AliasStorage($connection, $this->container->get('module_handler')); diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php index 1cc5076be7be4f0f62913cc45d0a7ca22a300b31..259647167c8433bc65e4cbfe81b18c77a1f33a9e 100644 --- a/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php @@ -100,7 +100,7 @@ protected function setUp() { $container = $this->prophesize(ContainerInterface::class); $container->get('cache_tags.invalidator')->willReturn($this->cacheTagsInvalidator->reveal()); - //$container->get('typed_data_manager')->willReturn($this->typedDataManager->reveal()); + // $container->get('typed_data_manager')->willReturn($this->typedDataManager->reveal()); \Drupal::setContainer($container->reveal()); $this->entityTypeBundleInfo = new EntityTypeBundleInfo($this->entityTypeManager->reveal(), $this->languageManager->reveal(), $this->moduleHandler->reveal(), $this->typedDataManager->reveal(), $this->cacheBackend->reveal()); diff --git a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php index aecc3e43640bd0531048593bac5a9d9f02f0603b..db92ca9d0a1db60ce1e6fbbd02343d847132f03d 100644 --- a/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php +++ b/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php @@ -1151,7 +1151,7 @@ public function providerTestRequiresEntityDataMigration() { // Case 6: same storage class, ::hasData() === TRUE, no structure changes. [$updated_entity_type_definition, $original_entity_type_definition, TRUE, FALSE, FALSE], // Case 7: different storage class, original storage class exists, - //::hasData() === TRUE, no structure changes. + // ::hasData() === TRUE, no structure changes. [$updated_entity_type_definition, $original_entity_type_definition_other_existing, TRUE, FALSE, FALSE], ]; }