From c8392465c3d89f3ab6c416d972a494b3a2529d99 Mon Sep 17 00:00:00 2001 From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org> Date: Mon, 21 Aug 2017 14:04:51 +0900 Subject: [PATCH] Issue #2902529 by mfernea: Fix 'Drupal.WhiteSpace.EmptyLines' coding standard --- core/includes/file.inc | 1 - core/lib/Drupal/Component/Datetime/DateTimePlus.php | 1 - .../src/Functional/EntityResource/EntityResourceTestBase.php | 3 --- core/modules/simpletest/src/KernelTestBase.php | 1 - core/modules/views/src/Plugin/views/filter/BooleanOperator.php | 1 - .../modules/views/src/Plugin/views/filter/FilterPluginBase.php | 1 - core/phpcs.xml.dist | 1 + core/tests/Drupal/Tests/Core/Access/AccessResultTest.php | 2 -- 8 files changed, 1 insertion(+), 10 deletions(-) diff --git a/core/includes/file.inc b/core/includes/file.inc index 3fcb38a4e45f..228515df6b36 100644 --- a/core/includes/file.inc +++ b/core/includes/file.inc @@ -923,7 +923,6 @@ function file_unmanaged_delete_recursive($path, $callback = NULL) { } - /** * Moves an uploaded file to a new location. * diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php index 3bfd9ca45b01..b636262ef2eb 100644 --- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php +++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php @@ -432,7 +432,6 @@ protected function prepareFormat($format) { } - /** * Examines getLastErrors() to see what errors to report. * diff --git a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php index 2de385208070..f39b7d8fba3a 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php @@ -328,7 +328,6 @@ public function testGet() { $url->setOption('query', []); - // DX: 406 when ?_format is missing, except when requesting a canonical HTML // route. $response = $this->request('GET', $url, $request_options); @@ -373,7 +372,6 @@ public function testGet() { $this->assertArrayNotHasKey('Link', $response->getHeaders()); - $this->setUpAuthorization('GET'); @@ -1001,7 +999,6 @@ public function testPatch() { $this->assertResourceErrorResponse(400, 'Syntax error', $response); - $request_options[RequestOptions::BODY] = $parseable_invalid_request_body; diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php index 8c92ec7dad4b..b133bfb2fbc0 100644 --- a/core/modules/simpletest/src/KernelTestBase.php +++ b/core/modules/simpletest/src/KernelTestBase.php @@ -454,7 +454,6 @@ protected function installSchema($module, $tables) { } - /** * Installs the storage schema for a specific entity type. * diff --git a/core/modules/views/src/Plugin/views/filter/BooleanOperator.php b/core/modules/views/src/Plugin/views/filter/BooleanOperator.php index 917a30b848cb..fa0d730f8365 100644 --- a/core/modules/views/src/Plugin/views/filter/BooleanOperator.php +++ b/core/modules/views/src/Plugin/views/filter/BooleanOperator.php @@ -49,7 +49,6 @@ class BooleanOperator extends FilterPluginBase { public $accept_null = FALSE; - /** * {@inheritdoc} */ diff --git a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php index 335fd99d815a..a036e150dbf4 100644 --- a/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php +++ b/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php @@ -1199,7 +1199,6 @@ protected function exposedTranslate(&$form, $type) { } - /** * Sanitizes the HTML select element's options. * diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist index ebc35b9ad0df..b9180d7b63ad 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -95,6 +95,7 @@ <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Semantics/TInHookMenuSniff.php"/> <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/Semantics/TInHookSchemaSniff.php"/> <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/CommaSniff.php"/> + <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/EmptyLinesSniff.php"/> <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php"/> <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php"/> <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenTagNewlineSniff.php"/> diff --git a/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php b/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php index 647da61255a8..fc3722fd5efb 100644 --- a/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php +++ b/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php @@ -698,8 +698,6 @@ public function andOrCacheabilityPropagationProvider() { [$neutral_un, 'OR', $forbidden_un, FALSE, NULL], - - // Allowed (ct) AND allowed (ct,cf,un). [$allowed_ct, 'AND', $allowed_ct, TRUE, TRUE], [$allowed_ct, 'AND', $allowed_cf, TRUE, FALSE], -- GitLab