summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxjm2017-11-09 14:37:59 -0600
committerxjm2017-11-09 14:37:59 -0600
commitedf57d8ab88485556d31ddc1d7958813b5832503 (patch)
treed731a04ef5b27562fbd1c67bc7612fb2eea56007
parent6afd12c00ade9df0017e453eae8dd9b5dcbaa721 (diff)
Revert "Issue #2572795 by mfernea, pfrenssen, attiks, andypost, alexpott, xjm, Mile23, catch, borisson_: Fix coding standard for closures - Drupal.WhiteSpace.ScopeClosingBrace and Generic.Functions.OpeningFunctionBraceKernighanRitchie"
This reverts commit c422bdfa5391553a5fbb6920f70c52306783f452.
-rw-r--r--core/lib/Drupal/Component/DependencyInjection/Container.php3
-rw-r--r--core/lib/Drupal/Core/Config/DatabaseStorage.php2
-rw-r--r--core/lib/Drupal/Core/Form/FormStateDecoratorBase.php2
-rw-r--r--core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php3
-rw-r--r--core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php2
-rw-r--r--core/modules/language/src/Form/NegotiationConfigureForm.php2
-rw-r--r--core/modules/language/tests/src/Functional/LanguageConfigurationTest.php2
-rw-r--r--core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php2
-rw-r--r--core/modules/rest/src/Plugin/Type/ResourcePluginManager.php2
-rw-r--r--core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php3
-rw-r--r--core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php3
-rw-r--r--core/modules/serialization/serialization.install3
-rw-r--r--core/modules/serialization/src/Encoder/XmlEncoder.php4
-rw-r--r--core/modules/simpletest/src/RouteProvider.php2
-rw-r--r--core/modules/system/tests/src/Functional/File/ConfigTest.php2
-rw-r--r--core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php2
-rw-r--r--core/modules/views/src/Plugin/views/display/DisplayPluginBase.php4
-rw-r--r--core/modules/views/tests/src/Kernel/Plugin/StyleGridTest.php15
-rw-r--r--core/phpcs.xml.dist6
-rw-r--r--core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php2
-rw-r--r--core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc3
-rw-r--r--core/tests/Drupal/Tests/Core/Site/SettingsTest.php2
-rw-r--r--core/tests/Drupal/Tests/WebAssert.php2
23 files changed, 29 insertions, 44 deletions
diff --git a/core/lib/Drupal/Component/DependencyInjection/Container.php b/core/lib/Drupal/Component/DependencyInjection/Container.php
index ac6a6f6..45cc8b9 100644
--- a/core/lib/Drupal/Component/DependencyInjection/Container.php
+++ b/core/lib/Drupal/Component/DependencyInjection/Container.php
@@ -586,7 +586,8 @@ class Container implements ContainerInterface, ResettableContainerInterface {
/**
* Ensure that cloning doesn't work.
*/
- private function __clone() {
+ private function __clone()
+ {
}
}
diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php
index 0ac6134..8a749a3 100644
--- a/core/lib/Drupal/Core/Config/DatabaseStorage.php
+++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php
@@ -159,7 +159,7 @@ class DatabaseStorage implements StorageInterface {
* @throws \Drupal\Core\Config\StorageException
* If a database error occurs.
*/
- protected function ensureTableExists() {
+ protected function ensureTableExists() {
try {
if (!$this->connection->schema()->tableExists($this->table)) {
$this->connection->schema()->createTable($this->table, static::schemaDefinition());
diff --git a/core/lib/Drupal/Core/Form/FormStateDecoratorBase.php b/core/lib/Drupal/Core/Form/FormStateDecoratorBase.php
index 2668f59..c063666 100644
--- a/core/lib/Drupal/Core/Form/FormStateDecoratorBase.php
+++ b/core/lib/Drupal/Core/Form/FormStateDecoratorBase.php
@@ -557,7 +557,7 @@ abstract class FormStateDecoratorBase implements FormStateInterface {
/**
* {@inheritdoc}
*/
- public function isValueEmpty($key) {
+ public function isValueEmpty($key) {
return $this->decoratedFormState->isValueEmpty($key);
}
diff --git a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
index 56c0339..9267237 100644
--- a/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
+++ b/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
@@ -109,6 +109,5 @@ class AggregatorPluginSettingsBaseTest extends UnitTestCase {
namespace Drupal\Core\Form;
if (!function_exists('drupal_set_message')) {
- function drupal_set_message() {
- }
+ function drupal_set_message() {}
}
diff --git a/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php b/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
index bd82d68..5e2a8ce 100644
--- a/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
+++ b/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
@@ -113,7 +113,7 @@ class EntityViewDisplayEditForm extends EntityDisplayFormBase {
/**
* {@inheritdoc}
*/
- protected function getDisplayModesLink() {
+ protected function getDisplayModesLink() {;
return [
'#type' => 'link',
'#title' => t('Manage view modes'),
diff --git a/core/modules/language/src/Form/NegotiationConfigureForm.php b/core/modules/language/src/Form/NegotiationConfigureForm.php
index 325a435..e029134 100644
--- a/core/modules/language/src/Form/NegotiationConfigureForm.php
+++ b/core/modules/language/src/Form/NegotiationConfigureForm.php
@@ -215,7 +215,7 @@ class NegotiationConfigureForm extends ConfigFormBase {
* @param string $type
* The language type to generate the table for.
*/
- protected function configureFormTable(array &$form, $type) {
+ protected function configureFormTable(array &$form, $type) {
$info = $form['#language_types_info'][$type];
$table_form = [
diff --git a/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php b/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
index 7095bc1..9ed7abd 100644
--- a/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
@@ -198,7 +198,7 @@ class LanguageConfigurationTest extends BrowserTestBase {
* @return int
* Maximum weight of configurable languages.
*/
- protected function getHighestConfigurableLanguageWeight() {
+ protected function getHighestConfigurableLanguageWeight(){
$max_weight = 0;
$storage = $this->container->get('entity_type.manager')
diff --git a/core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php b/core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php
index ee496e2..face32e 100644
--- a/core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php
+++ b/core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php
@@ -21,7 +21,7 @@ class LocaleFileSystemFormTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp() {
+ protected function setUp(){
parent::setUp();
$account = $this->drupalCreateUser(['administer site configuration']);
$this->drupalLogin($account);
diff --git a/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php b/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php
index 4dd9ca2..3ba7333 100644
--- a/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php
+++ b/core/modules/rest/src/Plugin/Type/ResourcePluginManager.php
@@ -43,7 +43,7 @@ class ResourcePluginManager extends DefaultPluginManager {
*
* @see https://www.drupal.org/node/2874934
*/
- public function getInstance(array $options) {
+ public function getInstance(array $options){
if (isset($options['id'])) {
return $this->createInstance($options['id']);
}
diff --git a/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php b/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php
index 284d17e..b05ddf2 100644
--- a/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php
+++ b/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php
@@ -31,7 +31,6 @@ trait AnonResourceTestTrait {
/**
* {@inheritdoc}
*/
- protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {
- }
+ protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {}
}
diff --git a/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php b/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php
index fbb870b..6f8c621 100644
--- a/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php
+++ b/core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php
@@ -38,7 +38,6 @@ trait BasicAuthResourceTestTrait {
/**
* {@inheritdoc}
*/
- protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {
- }
+ protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {}
}
diff --git a/core/modules/serialization/serialization.install b/core/modules/serialization/serialization.install
index f5a11b8..afc3311 100644
--- a/core/modules/serialization/serialization.install
+++ b/core/modules/serialization/serialization.install
@@ -33,8 +33,7 @@ function serialization_requirements($phase) {
/**
* @see hal_update_8301()
*/
-function serialization_update_8301() {
-}
+function serialization_update_8301() {}
/**
* Add serialization.settings::bc_primitives_as_strings configuration.
diff --git a/core/modules/serialization/src/Encoder/XmlEncoder.php b/core/modules/serialization/src/Encoder/XmlEncoder.php
index 125a2cc..53177b0 100644
--- a/core/modules/serialization/src/Encoder/XmlEncoder.php
+++ b/core/modules/serialization/src/Encoder/XmlEncoder.php
@@ -60,7 +60,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
/**
* {@inheritdoc}
*/
- public function encode($data, $format, array $context = []) {
+ public function encode($data, $format, array $context = []){
return $this->getBaseEncoder()->encode($data, $format, $context);
}
@@ -74,7 +74,7 @@ class XmlEncoder extends SerializerAwareEncoder implements EncoderInterface, Dec
/**
* {@inheritdoc}
*/
- public function decode($data, $format, array $context = []) {
+ public function decode($data, $format, array $context = []){
return $this->getBaseEncoder()->decode($data, $format, $context);
}
diff --git a/core/modules/simpletest/src/RouteProvider.php b/core/modules/simpletest/src/RouteProvider.php
index edb330b..3aacc40 100644
--- a/core/modules/simpletest/src/RouteProvider.php
+++ b/core/modules/simpletest/src/RouteProvider.php
@@ -49,7 +49,7 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
/**
* {@inheritdoc}
*/
- public function preLoadRoutes($names) {
+ public function preLoadRoutes($names){
return $this->lazyLoadItself()->preLoadRoutes($names);
}
diff --git a/core/modules/system/tests/src/Functional/File/ConfigTest.php b/core/modules/system/tests/src/Functional/File/ConfigTest.php
index caf6915..f413c38 100644
--- a/core/modules/system/tests/src/Functional/File/ConfigTest.php
+++ b/core/modules/system/tests/src/Functional/File/ConfigTest.php
@@ -11,7 +11,7 @@ use Drupal\Tests\BrowserTestBase;
*/
class ConfigTest extends BrowserTestBase {
- protected function setUp() {
+ protected function setUp(){
parent::setUp();
$this->drupalLogin($this->drupalCreateUser(['administer site configuration']));
}
diff --git a/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php b/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
index c0ee2d1..fc8958c 100644
--- a/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
+++ b/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
@@ -21,7 +21,7 @@ class UserRolesAssignmentTest extends BrowserTestBase {
* Tests that a user can be assigned a role and that the role can be removed
* again.
*/
- public function testAssignAndRemoveRole() {
+ public function testAssignAndRemoveRole() {
$rid = $this->drupalCreateRole(['administer users']);
$account = $this->drupalCreateUser();
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index faa86b7..a2e19a2 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -1471,7 +1471,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
'#title' => $this->t('Show contextual links'),
'#default_value' => $this->getOption('show_admin_links'),
];
- break;
+ break;
case 'use_more':
$form['#title'] .= $this->t('Add a more link to the bottom of the display.');
$form['use_more'] = [
@@ -1866,7 +1866,7 @@ abstract class DisplayPluginBase extends PluginBase implements DisplayPluginInte
if (preg_match('/[^a-zA-Z0-9-_ ]/', $css_class)) {
$form_state->setError($form['css_class'], $this->t('CSS classes must be alphanumeric or dashes only.'));
}
- break;
+ break;
case 'display_id':
if ($form_state->getValue('display_id')) {
if (preg_match('/[^a-z0-9_]/', $form_state->getValue('display_id'))) {
diff --git a/core/modules/views/tests/src/Kernel/Plugin/StyleGridTest.php b/core/modules/views/tests/src/Kernel/Plugin/StyleGridTest.php
index 1ef2009..1495399 100644
--- a/core/modules/views/tests/src/Kernel/Plugin/StyleGridTest.php
+++ b/core/modules/views/tests/src/Kernel/Plugin/StyleGridTest.php
@@ -69,16 +69,11 @@ class StyleGridTest extends PluginKernelTestBase {
}
$width = '0';
switch ($columns) {
- case 5: $width = '20';
- break;
- case 4: $width = '25';
- break;
- case 3: $width = '33.3333';
- break;
- case 2: $width = '50';
- break;
- case 1: $width = '100';
- break;
+ case 5: $width = '20'; break;
+ case 4: $width = '25'; break;
+ case 3: $width = '33.3333'; break;
+ case 2: $width = '50'; break;
+ case 1: $width = '100'; break;
}
// Ensure last column exists.
$result = $this->xpath('//div[contains(@class, "views-col") and contains(@class, :columns) and starts-with(@style, :width)]', [':columns' => 'col-' . $columns, ':width' => 'width: ' . $width]);
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index d141606..75f01b3 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -126,7 +126,6 @@
<rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenBracketSpacingSniff.php"/>
<rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/OpenTagNewlineSniff.php"/>
<rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/OperatorSpacingSniff.php"/>
- <rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php"/>
<rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/WhiteSpace/ScopeIndentSniff.php"/>
<!-- Drupal Practice sniffs -->
@@ -137,11 +136,6 @@
<rule ref="Generic.Files.LineEndings"/>
<rule ref="Generic.Formatting.SpaceAfterCast"/>
<rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
- <rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie">
- <properties>
- <property name="checkClosures" value="true"/>
- </properties>
- </rule>
<rule ref="Generic.NamingConventions.ConstructorName"/>
<rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
<rule ref="Generic.PHP.DeprecatedFunctions"/>
diff --git a/core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php b/core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php
index ff401e1..bdf66bd 100644
--- a/core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php
+++ b/core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php
@@ -21,7 +21,7 @@ class UrlRewritingTest extends FileTestBase {
/**
* Tests the rewriting of shipped file URLs by hook_file_url_alter().
*/
- public function testShippedFileURL() {
+ public function testShippedFileURL() {
// Test generating a URL to a shipped file (i.e. a file that is part of
// Drupal core, a module or a theme, for example a JavaScript file).
diff --git a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
index ed4fb46..da3a9c2 100644
--- a/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
+++ b/core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
@@ -8,5 +8,4 @@
/**
* Test hook.
*/
-function module_handler_test_hook_include() {
-}
+function module_handler_test_hook_include() {}
diff --git a/core/tests/Drupal/Tests/Core/Site/SettingsTest.php b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
index 5e4f1d0..4d34b30 100644
--- a/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
+++ b/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
@@ -28,7 +28,7 @@ class SettingsTest extends UnitTestCase {
/**
* @covers ::__construct
*/
- protected function setUp() {
+ protected function setUp(){
$this->config = [
'one' => '1',
'two' => '2',
diff --git a/core/tests/Drupal/Tests/WebAssert.php b/core/tests/Drupal/Tests/WebAssert.php
index 8149551..9171a3f 100644
--- a/core/tests/Drupal/Tests/WebAssert.php
+++ b/core/tests/Drupal/Tests/WebAssert.php
@@ -451,7 +451,7 @@ class WebAssert extends MinkWebAssert {
* @throws \Behat\Mink\Exception\ElementNotFoundException
* @throws \Behat\Mink\Exception\ExpectationException
*/
- public function fieldDisabled($field, TraversableElement $container = NULL) {
+ public function fieldDisabled($field, TraversableElement $container = NULL) {
$container = $container ?: $this->session->getPage();
$node = $container->findField($field);