Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2572795 by mfernea, zaporylie, pfrenssen, andypost, attiks, alexpott, xjm, Mile23, catch, borisson_: Fix coding standard for closures - Drupal.WhiteSpace.ScopeClosingBrace and Generic.Functions.OpeningFunctionBraceKernighanRitchie

8.5.x
xjm 2017-11-10 05:35:50 -06:00
parent f1adffe2b4
commit 91e668f575
39 changed files with 60 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/lib/Drupal/Component/DependencyInjection/Container.php
View File

@ -586,8 +586,7 @@ class Container implements ContainerInterface, ResettableContainerInterface {
/**
* Ensure that cloning doesn't work.
*/
private function __clone()
{
private function __clone() {
}
}

2
core/lib/Drupal/Core/Config/DatabaseStorage.php
View File

@ -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());

2
core/lib/Drupal/Core/Form/FormStateDecoratorBase.php
View File

@ -557,7 +557,7 @@ abstract class FormStateDecoratorBase implements FormStateInterface {
/**
* {@inheritdoc}
*/
public function isValueEmpty($key) {
public function isValueEmpty($key) {
return $this->decoratedFormState->isValueEmpty($key);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableAccessDeniedHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableAccessDeniedHttpException extends AccessDeniedHttpException imple
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableBadRequestHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableBadRequestHttpException extends BadRequestHttpException implement
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableConflictHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableConflictHttpException extends ConflictHttpException implements Ca
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableGoneHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableGoneHttpException extends GoneHttpException implements CacheableD
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableHttpException extends HttpException implements CacheableDependenc
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $statusCode = 0, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $statusCode = 0, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($statusCode, $message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableLengthRequiredHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableLengthRequiredHttpException extends LengthRequiredHttpException i
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableMethodNotAllowedHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableMethodNotAllowedHttpException extends MethodNotAllowedHttpExcepti
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, array $allow, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, array $allow, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($allow, $message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableNotAcceptableHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableNotAcceptableHttpException extends NotAcceptableHttpException imp
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableNotFoundHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableNotFoundHttpException extends NotFoundHttpException implements Ca
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheablePreconditionFailedHttpException.php
View File

@ -16,7 +16,7 @@ class CacheablePreconditionFailedHttpException extends PreconditionFailedHttpExc
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheablePreconditionRequiredHttpException.php
View File

@ -16,7 +16,7 @@ class CacheablePreconditionRequiredHttpException extends PreconditionRequiredHtt
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableServiceUnavailableHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableServiceUnavailableHttpException extends ServiceUnavailableHttpExc
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $retryAfter = NULL, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $retryAfter = NULL, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($retryAfter, $message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableTooManyRequestsHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableTooManyRequestsHttpException extends TooManyRequestsHttpException
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $retryAfter = NULL, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $retryAfter = NULL, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($retryAfter, $message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableUnauthorizedHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableUnauthorizedHttpException extends UnauthorizedHttpException imple
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $challenge, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $challenge, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($challenge, $message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableUnprocessableEntityHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableUnprocessableEntityHttpException extends UnprocessableEntityHttpE
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($message, $previous, $code);
}

2
core/lib/Drupal/Core/Http/Exception/CacheableUnsupportedMediaTypeHttpException.php
View File

@ -16,7 +16,7 @@ class CacheableUnsupportedMediaTypeHttpException extends UnsupportedMediaTypeHtt
/**
* {@inheritdoc}
*/
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
public function __construct(CacheableDependencyInterface $cacheability, $message = NULL, \Exception $previous = NULL, $code = 0) {
$this->setCacheability($cacheability);
parent::__construct($message, $previous, $code);
}

3
core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
View File

@ -109,5 +109,6 @@ class AggregatorPluginSettingsBaseTest extends UnitTestCase {
namespace Drupal\Core\Form;
if (!function_exists('drupal_set_message')) {
function drupal_set_message() {}
function drupal_set_message() {
}
}

2
core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
View File

@ -113,7 +113,7 @@ class EntityViewDisplayEditForm extends EntityDisplayFormBase {
/**
* {@inheritdoc}
*/
protected function getDisplayModesLink() {;
protected function getDisplayModesLink() {
return [
'#type' => 'link',
'#title' => t('Manage view modes'),

2
core/modules/language/src/Form/NegotiationConfigureForm.php
View File

@ -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 = [

2
core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
View File

@ -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')

2
core/modules/locale/tests/src/Functional/LocaleFileSystemFormTest.php
View File

@ -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);

2
core/modules/rest/src/Plugin/Type/ResourcePluginManager.php
View File

@ -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']);
}

3
core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php
View File

@ -31,6 +31,7 @@ trait AnonResourceTestTrait {
/**
* {@inheritdoc}
*/
protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {}
protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {
}
}

3
core/modules/rest/tests/src/Functional/BasicAuthResourceTestTrait.php
View File

@ -38,6 +38,7 @@ trait BasicAuthResourceTestTrait {
/**
* {@inheritdoc}
*/
protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {}
protected function assertAuthenticationEdgeCases($method, Url $url, array $request_options) {
}
}

3
core/modules/serialization/serialization.install
View File

@ -33,7 +33,8 @@ function serialization_requirements($phase) {
/**
* @see hal_update_8301()
*/
function serialization_update_8301() {}
function serialization_update_8301() {
}
/**
* Add serialization.settings::bc_primitives_as_strings configuration.

4
core/modules/serialization/src/Encoder/XmlEncoder.php
View File

@ -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);
}

2
core/modules/simpletest/src/RouteProvider.php
View File

@ -49,7 +49,7 @@ class RouteProvider implements PreloadableRouteProviderInterface, PagedRouteProv
/**
* {@inheritdoc}
*/
public function preLoadRoutes($names){
public function preLoadRoutes($names) {
return $this->lazyLoadItself()->preLoadRoutes($names);
}

2
core/modules/system/tests/src/Functional/File/ConfigTest.php
View File

@ -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']));
}

2
core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
View File

@ -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();

4
core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
View File

@ -1470,7 +1470,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'] = [
@ -1865,7 +1865,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'))) {

15
core/modules/views/tests/src/Kernel/Plugin/StyleGridTest.php
View File

@ -69,11 +69,16 @@ 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]);

6
core/phpcs.xml.dist
View File

@ -126,6 +126,7 @@
<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 -->
@ -136,6 +137,11 @@
<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"/>

2
core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php
View File

@ -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).

3
core/tests/Drupal/Tests/Core/Extension/modules/module_handler_test/hook_include.inc
View File

@ -8,4 +8,5 @@
/**
* Test hook.
*/
function module_handler_test_hook_include() {}
function module_handler_test_hook_include() {
}

2
core/tests/Drupal/Tests/Core/Site/SettingsTest.php
View File

@ -28,7 +28,7 @@ class SettingsTest extends UnitTestCase {
/**
* @covers ::__construct
*/
protected function setUp(){
protected function setUp() {
$this->config = [
'one' => '1',
'two' => '2',

2
core/tests/Drupal/Tests/WebAssert.php
View File

@ -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);