From a6efc8c64421446f49cde57b8abbce1791b3bce8 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 5 May 2016 11:07:32 +0100
Subject: [PATCH] Issue #2572693 by Mile23, andriyun, andypost, attiks: Fix
'Drupal.ControlStructures.ControlSignature' coding standard
(cherry picked from commit a1d3a681f6bec82461cc65f30ae3df363c615380)
---
core/includes/install.core.inc | 2 +-
core/lib/Drupal/Component/Gettext/PoItem.php | 2 +-
core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php | 1 -
.../Drupal/Component/Transliteration/PhpTransliteration.php | 2 +-
core/lib/Drupal/Component/Utility/Random.php | 2 +-
core/lib/Drupal/Component/Utility/UserAgent.php | 3 +--
core/lib/Drupal/Core/Cache/Cache.php | 4 ++--
core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php | 2 +-
core/lib/Drupal/Core/Cache/PhpBackend.php | 2 +-
core/lib/Drupal/Core/Config/ConfigFactory.php | 2 +-
.../Drupal/Core/Config/Entity/ConfigDependencyManager.php | 2 +-
core/lib/Drupal/Core/Database/Driver/mysql/Connection.php | 3 ++-
core/lib/Drupal/Core/Datetime/Element/Datelist.php | 2 +-
core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php | 2 +-
core/lib/Drupal/Core/Menu/LocalTaskManager.php | 2 +-
core/lib/Drupal/Core/Render/Element/VerticalTabs.php | 2 +-
.../Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php | 2 +-
core/lib/Drupal/Core/Routing/MatcherDumper.php | 3 ++-
core/lib/Drupal/Core/Routing/UrlGenerator.php | 3 ++-
.../Test/HttpClientMiddleware/TestHttpClientMiddleware.php | 2 +-
core/modules/color/color.module | 2 +-
core/modules/color/src/Tests/ColorTest.php | 2 +-
core/modules/config/src/Form/ConfigSingleImportForm.php | 2 +-
core/modules/config/src/Form/ConfigSync.php | 2 +-
core/modules/config/src/Tests/ConfigEntityTest.php | 3 ++-
core/modules/config/src/Tests/ConfigImportAllTest.php | 6 +++---
core/modules/config_translation/src/ConfigMapperManager.php | 2 +-
.../src/Tests/ConfigTranslationUiTest.php | 2 +-
.../tests/src/Unit/ConfigNamesMapperTest.php | 3 ++-
core/modules/contact/src/Tests/ContactSitewideTest.php | 2 +-
core/modules/file/src/Element/ManagedFile.php | 2 +-
.../file/src/Plugin/Field/FieldWidget/FileWidget.php | 3 ++-
core/modules/filter/filter.module | 2 +-
core/modules/filter/src/Plugin/Filter/FilterHtml.php | 2 +-
core/modules/forum/src/Tests/ForumUninstallTest.php | 2 +-
.../src/Plugin/migrate/process/d6/ImageCacheActions.php | 2 +-
.../image/src/Plugin/migrate/source/d6/ImageCachePreset.php | 2 +-
core/modules/language/language.module | 2 +-
core/modules/menu_ui/menu_ui.module | 2 +-
core/modules/rdf/rdf.module | 4 ++--
.../responsive_image/src/Entity/ResponsiveImageStyle.php | 2 +-
.../search/src/Tests/SearchMultilingualEntityTest.php | 2 +-
core/modules/search/src/Tests/SearchRankingTest.php | 3 ++-
core/modules/shortcut/src/Tests/ShortcutLinksTest.php | 2 +-
core/modules/simpletest/src/WebTestBase.php | 2 +-
core/modules/system/src/MachineNameController.php | 4 ++--
.../system/src/Tests/Common/RenderElementTypesTest.php | 2 +-
core/modules/system/src/Tests/Entity/EntityUnitTestBase.php | 3 +--
core/modules/system/src/Tests/Image/ToolkitGdTest.php | 2 +-
.../Installer/InstallerTranslationMultipleLanguageTest.php | 4 ++--
.../system/src/Tests/Installer/InstallerTranslationTest.php | 2 +-
.../KeyValueStore/KeyValueContentEntityStorageTest.php | 3 ++-
core/modules/system/src/Tests/Module/UninstallTest.php | 3 ++-
core/modules/system/src/Tests/Plugin/ContextPluginTest.php | 2 +-
core/modules/system/src/Tests/System/ErrorHandlerTest.php | 2 +-
core/modules/system/src/Tests/TypedData/TypedDataTest.php | 2 +-
.../src/Plugin/Derivative/EntityTestLocalTasks.php | 2 +-
.../taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php | 2 +-
core/modules/taxonomy/taxonomy.module | 2 +-
core/modules/tour/src/Entity/Tour.php | 2 +-
core/modules/views/src/Plugin/views/PluginBase.php | 2 +-
.../views/src/Plugin/views/style/StylePluginBase.php | 2 +-
core/modules/views_ui/src/Tests/NewViewConfigSchemaTest.php | 2 +-
core/phpcs.xml.dist | 1 +
core/tests/Drupal/KernelTests/AssertConfigTrait.php | 2 +-
.../tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php | 2 +-
.../Drupal/KernelTests/Core/Config/ConfigDependencyTest.php | 2 +-
.../Drupal/KernelTests/Core/Database/InsertDefaultsTest.php | 3 ++-
.../Drupal/KernelTests/Core/Database/LargeQueryTest.php | 3 ++-
core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php | 3 ++-
.../KernelTests/Core/Entity/EntityDefinitionUpdateTest.php | 3 ++-
.../Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php | 3 +--
.../tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php | 2 +-
core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php | 2 +-
74 files changed, 92 insertions(+), 82 deletions(-)
diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 1938ed691ea4..865685078e6d 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1595,7 +1595,7 @@ function install_download_additional_translations_operations(&$install_state) {
// should download/import translations.
$languages = \Drupal::languageManager()->getLanguages();
$operations = array();
- foreach($languages as $langcode => $language) {
+ foreach ($languages as $langcode => $language) {
// The installer language was already downloaded. Check downloads for the
// other languages if any. Ignore any download errors here, since we
// are in the middle of an install process and there is no way back. We
diff --git a/core/lib/Drupal/Component/Gettext/PoItem.php b/core/lib/Drupal/Component/Gettext/PoItem.php
index 4ffa0b4b0a72..3ef42cef4a8f 100644
--- a/core/lib/Drupal/Component/Gettext/PoItem.php
+++ b/core/lib/Drupal/Component/Gettext/PoItem.php
@@ -181,7 +181,7 @@ public function setFromArray(array $values = array()) {
if (isset($values['translation'])) {
$this->setTranslation($values['translation']);
}
- if (isset($values['comment'])){
+ if (isset($values['comment'])) {
$this->setComment($values['comment']);
}
if (isset($this->_source) &&
diff --git a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
index 0801b361b067..750f122049bc 100644
--- a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
+++ b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php
@@ -92,7 +92,6 @@ public function build($class_name, $proxy_class_name = '') {
// class.
if ($parent_interfaces = $interface->getInterfaceNames()) {
foreach ($parent_interfaces as $parent_interface) {
- if (isset($interfaces[$parent_interface])) {}
unset($interfaces[$parent_interface]);
}
}
diff --git a/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php b/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
index 84807e98d005..0953bfedd487 100644
--- a/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
+++ b/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
@@ -90,7 +90,7 @@ public function removeDiacritics($string) {
$replacement = $character;
if (($range1 && !in_array($code, $exclusions_range1)) || ($range2 && !in_array($code, $exclusions_range2))) {
$to_add = $this->lookupReplacement($code, 'xyz');
- if(strlen($to_add) === 1) {
+ if (strlen($to_add) === 1) {
$replacement = $to_add;
}
}
diff --git a/core/lib/Drupal/Component/Utility/Random.php b/core/lib/Drupal/Component/Utility/Random.php
index 55772f803401..3d72b038089a 100644
--- a/core/lib/Drupal/Component/Utility/Random.php
+++ b/core/lib/Drupal/Component/Utility/Random.php
@@ -149,7 +149,7 @@ public function word($length) {
$num_cons = count($cons);
$word = '';
- while(strlen($word) < $length){
+ while (strlen($word) < $length) {
$word .= $cons[mt_rand(0, $num_cons - 1)] . $vowels[mt_rand(0, $num_vowels - 1)];
}
diff --git a/core/lib/Drupal/Component/Utility/UserAgent.php b/core/lib/Drupal/Component/Utility/UserAgent.php
index bd811057eae0..2fc67d67d56f 100644
--- a/core/lib/Drupal/Component/Utility/UserAgent.php
+++ b/core/lib/Drupal/Component/Utility/UserAgent.php
@@ -122,8 +122,7 @@ public static function getBestMatchingLangcode($http_accept_language, $langcodes
$qvalue = $ua_langcodes[$prefix];
break;
}
- }
- while ($prefix = substr($prefix, 0, strrpos($prefix, '-')));
+ } while ($prefix = substr($prefix, 0, strrpos($prefix, '-')));
// Find the best match.
if ($qvalue > $max_qvalue) {
diff --git a/core/lib/Drupal/Core/Cache/Cache.php b/core/lib/Drupal/Core/Cache/Cache.php
index 749161ed95c6..06b4ac2f26c9 100644
--- a/core/lib/Drupal/Core/Cache/Cache.php
+++ b/core/lib/Drupal/Core/Cache/Cache.php
@@ -76,10 +76,10 @@ public static function mergeTags(array $a = [], array $b = []) {
*/
public static function mergeMaxAges($a = Cache::PERMANENT, $b = Cache::PERMANENT) {
// If one of the values is Cache::PERMANENT, return the other value.
- if ($a === Cache::PERMANENT){
+ if ($a === Cache::PERMANENT) {
return $b;
}
- if ($b === Cache::PERMANENT){
+ if ($b === Cache::PERMANENT) {
return $a;
}
diff --git a/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php b/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
index d2a007252131..57b79b612685 100644
--- a/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
+++ b/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
@@ -195,7 +195,7 @@ public function optimizeTokens(array $context_tokens) {
$ancestor_found = TRUE;
}
- } while(!$ancestor_found && strpos($ancestor, '.') !== FALSE);
+ } while (!$ancestor_found && strpos($ancestor, '.') !== FALSE);
if (!$ancestor_found) {
$optimized_content_tokens[] = $context_token;
}
diff --git a/core/lib/Drupal/Core/Cache/PhpBackend.php b/core/lib/Drupal/Core/Cache/PhpBackend.php
index 4f1f9b0c649f..38f9b9b4b421 100644
--- a/core/lib/Drupal/Core/Cache/PhpBackend.php
+++ b/core/lib/Drupal/Core/Cache/PhpBackend.php
@@ -211,7 +211,7 @@ public function invalidateMultiple(array $cids) {
* {@inheritdoc}
*/
public function invalidateAll() {
- foreach($this->storage()->listAll() as $cidhash) {
+ foreach ($this->storage()->listAll() as $cidhash) {
$this->invalidatebyHash($cidhash);
}
}
diff --git a/core/lib/Drupal/Core/Config/ConfigFactory.php b/core/lib/Drupal/Core/Config/ConfigFactory.php
index c5e5931da86f..1189a4a15365 100644
--- a/core/lib/Drupal/Core/Config/ConfigFactory.php
+++ b/core/lib/Drupal/Core/Config/ConfigFactory.php
@@ -271,7 +271,7 @@ public function getCacheKeys() {
// Because get() adds overrides both from $GLOBALS and from
// $this->configFactoryOverrides, add cache keys for each.
$keys[] = 'global_overrides';
- foreach($this->configFactoryOverrides as $override) {
+ foreach ($this->configFactoryOverrides as $override) {
$keys[] = $override->getCacheSuffix();
}
return $keys;
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
index bca31f42bb12..377f7c4d00d2 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
@@ -228,7 +228,7 @@ protected function createGraphConfigEntityDependencies($entities_to_check) {
$graph = $this->getGraph();
foreach ($entities_to_check as $entity) {
- if (isset($graph[$entity]) && !empty($graph[$entity]['reverse_paths'])){
+ if (isset($graph[$entity]) && !empty($graph[$entity]['reverse_paths'])) {
foreach ($graph[$entity]['reverse_paths'] as $dependency => $value) {
$dependent_entities[$dependency] = $this->data[$dependency];
}
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
index dead7abb0a8a..df510672155d 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
@@ -79,7 +79,8 @@ public function __construct(\PDO $connection, array $connection_options = array(
public function query($query, array $args = array(), $options = array()) {
try {
return parent::query($query, $args, $options);
- } catch (DatabaseException $e) {
+ }
+ catch (DatabaseException $e) {
if ($e->getPrevious()->errorInfo[1] == 1153) {
// If a max_allowed_packet error occurs the message length is truncated.
// This should prevent the error from recurring if the exception is
diff --git a/core/lib/Drupal/Core/Datetime/Element/Datelist.php b/core/lib/Drupal/Core/Datetime/Element/Datelist.php
index a6c6781335af..705001a19f30 100644
--- a/core/lib/Drupal/Core/Datetime/Element/Datelist.php
+++ b/core/lib/Drupal/Core/Datetime/Element/Datelist.php
@@ -313,7 +313,7 @@ public static function validateDatelist(&$element, FormStateInterface $form_stat
$form_state->setError($element, t('The %field date is required.'));
}
elseif (!empty($all_empty)) {
- foreach ($all_empty as $value){
+ foreach ($all_empty as $value) {
$form_state->setError($element[$value], t('A value must be selected for %part.', array('%part' => $value)));
}
}
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php b/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
index 4f0738902d39..0fa2f665237c 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
@@ -118,7 +118,7 @@ protected function addGroupBy() {
* Returns the called object.
*/
protected function addSortAggregate() {
- if(!$this->count) {
+ if (!$this->count) {
foreach ($this->sortAggregate as $alias => $sort) {
$this->sqlQuery->orderBy($alias, $sort['direction']);
}
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskManager.php b/core/lib/Drupal/Core/Menu/LocalTaskManager.php
index 928b740c13de..ec1df5c2fa2d 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskManager.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskManager.php
@@ -218,7 +218,7 @@ public function getLocalTasksForRoute($route_name) {
$definitions[$plugin_id]['base_route'] = $definitions[$task_info['parent_id']]['base_route'];
}
if ($route_name == $task_info['route_name']) {
- if(!empty($task_info['base_route'])) {
+ if (!empty($task_info['base_route'])) {
$base_routes[$task_info['base_route']] = $task_info['base_route'];
}
// Tabs that link to the current route are viable parents
diff --git a/core/lib/Drupal/Core/Render/Element/VerticalTabs.php b/core/lib/Drupal/Core/Render/Element/VerticalTabs.php
index 8a637fb356ac..1d108aaed743 100644
--- a/core/lib/Drupal/Core/Render/Element/VerticalTabs.php
+++ b/core/lib/Drupal/Core/Render/Element/VerticalTabs.php
@@ -125,7 +125,7 @@ public static function processVerticalTabs(&$element, FormStateInterface $form_s
// form is rendered, e.g. on preview pages or when form validation
// fails.
$name = implode('__', $element['#parents']);
- if ($form_state->hasValue($name . '__active_tab')){
+ if ($form_state->hasValue($name . '__active_tab')) {
$element['#default_tab'] = $form_state->getValue($name . '__active_tab');
}
$element[$name . '__active_tab'] = array(
diff --git a/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php b/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
index a25fe30cdf3e..2f9aeb3662ca 100644
--- a/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
+++ b/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
@@ -442,7 +442,7 @@ protected function processHtmlHeadLink(array $html_head_link) {
*/
protected function processFeed($attached_feed) {
$html_head_link = [];
- foreach($attached_feed as $item) {
+ foreach ($attached_feed as $item) {
$feed_link = [
'href' => $item[0],
'rel' => 'alternate',
diff --git a/core/lib/Drupal/Core/Routing/MatcherDumper.php b/core/lib/Drupal/Core/Routing/MatcherDumper.php
index e254024274b6..467b02bbbbc1 100644
--- a/core/lib/Drupal/Core/Routing/MatcherDumper.php
+++ b/core/lib/Drupal/Core/Routing/MatcherDumper.php
@@ -142,7 +142,8 @@ public function dump(array $options = array()) {
}
- } catch (\Exception $e) {
+ }
+ catch (\Exception $e) {
$transaction->rollback();
watchdog_exception('Routing', $e);
throw $e;
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index 3cbbd5adf2ef..6cff9d599a3c 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -358,7 +358,8 @@ public function generateFromRoute($name, $parameters = array(), $options = array
$port = '';
if ('http' === $scheme && 80 != $this->context->getHttpPort()) {
$port = ':' . $this->context->getHttpPort();
- } elseif ('https' === $scheme && 443 != $this->context->getHttpsPort()) {
+ }
+ elseif ('https' === $scheme && 443 != $this->context->getHttpsPort()) {
$port = ':' . $this->context->getHttpsPort();
}
if ($collect_bubbleable_metadata) {
diff --git a/core/lib/Drupal/Core/Test/HttpClientMiddleware/TestHttpClientMiddleware.php b/core/lib/Drupal/Core/Test/HttpClientMiddleware/TestHttpClientMiddleware.php
index e4e373f2c0ed..3c4d1427a82b 100644
--- a/core/lib/Drupal/Core/Test/HttpClientMiddleware/TestHttpClientMiddleware.php
+++ b/core/lib/Drupal/Core/Test/HttpClientMiddleware/TestHttpClientMiddleware.php
@@ -40,7 +40,7 @@ public function __invoke() {
// Call \Drupal\simpletest\WebTestBase::error() with the parameters from
// the header.
$parameters = unserialize(urldecode($header_value));
- if (count($parameters) === 3) {
+ if (count($parameters) === 3) {
throw new \Exception($parameters[1] . ': ' . $parameters[0] . "\n" . Error::formatBacktrace([$parameters[2]]));
}
else {
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index d74025b7a9c7..ca0dc3ae3d3e 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -76,7 +76,7 @@ function color_library_info_alter(&$libraries, $extension) {
$color_paths = \Drupal::config('color.theme.' . $extension)->get('stylesheets');
if (!empty($color_paths)) {
foreach (array_keys($libraries) as $name) {
- if(isset($libraries[$name]['css'])) {
+ if (isset($libraries[$name]['css'])) {
// Override stylesheets.
foreach ($libraries[$name]['css'] as $category => $css_assets) {
foreach ($css_assets as $path => $metadata) {
diff --git a/core/modules/color/src/Tests/ColorTest.php b/core/modules/color/src/Tests/ColorTest.php
index d334376c1ad8..578f7fb990c1 100644
--- a/core/modules/color/src/Tests/ColorTest.php
+++ b/core/modules/color/src/Tests/ColorTest.php
@@ -164,7 +164,7 @@ function testValidColor() {
$edit['palette[bg]'] = $color;
$this->drupalPostForm($settings_path, $edit, t('Save configuration'));
- if($is_valid) {
+ if ($is_valid) {
$this->assertText('The configuration options have been saved.');
}
else {
diff --git a/core/modules/config/src/Form/ConfigSingleImportForm.php b/core/modules/config/src/Form/ConfigSingleImportForm.php
index 0a6fd2d3de09..e458e2514ed8 100644
--- a/core/modules/config/src/Form/ConfigSingleImportForm.php
+++ b/core/modules/config/src/Form/ConfigSingleImportForm.php
@@ -388,7 +388,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
if ($config_importer->alreadyImporting()) {
drupal_set_message($this->t('Another request may be importing configuration already.'), 'error');
}
- else{
+ else {
try {
$sync_steps = $config_importer->initialize();
$batch = [
diff --git a/core/modules/config/src/Form/ConfigSync.php b/core/modules/config/src/Form/ConfigSync.php
index 62a6e9c23ee3..8d11ad3d09f3 100644
--- a/core/modules/config/src/Form/ConfigSync.php
+++ b/core/modules/config/src/Form/ConfigSync.php
@@ -330,7 +330,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
if ($config_importer->alreadyImporting()) {
drupal_set_message($this->t('Another request may be synchronizing configuration already.'));
}
- else{
+ else {
try {
$sync_steps = $config_importer->initialize();
$batch = array(
diff --git a/core/modules/config/src/Tests/ConfigEntityTest.php b/core/modules/config/src/Tests/ConfigEntityTest.php
index 5a61382e5de3..a8a8f0f7479e 100644
--- a/core/modules/config/src/Tests/ConfigEntityTest.php
+++ b/core/modules/config/src/Tests/ConfigEntityTest.php
@@ -195,7 +195,8 @@ function testCRUD() {
try {
$same_id->save();
$this->fail('Not possible to overwrite an entity entity.');
- } catch (EntityStorageException $e) {
+ }
+ catch (EntityStorageException $e) {
$this->pass('Not possible to overwrite an entity entity.');
}
diff --git a/core/modules/config/src/Tests/ConfigImportAllTest.php b/core/modules/config/src/Tests/ConfigImportAllTest.php
index a7623a955917..643f76351fae 100644
--- a/core/modules/config/src/Tests/ConfigImportAllTest.php
+++ b/core/modules/config/src/Tests/ConfigImportAllTest.php
@@ -60,7 +60,7 @@ public function testInstallUninstall() {
\Drupal::service('module_installer')->install(array_keys($all_modules));
$this->assertModules(array_keys($all_modules), TRUE);
- foreach($all_modules as $module => $info) {
+ foreach ($all_modules as $module => $info) {
$this->assertModuleConfig($module);
$this->assertModuleTablesExist($module);
}
@@ -118,7 +118,7 @@ public function testInstallUninstall() {
\Drupal::service('module_installer')->uninstall(array_keys($modules_to_uninstall));
$this->assertModules(array_keys($modules_to_uninstall), FALSE);
- foreach($modules_to_uninstall as $module => $info) {
+ foreach ($modules_to_uninstall as $module => $info) {
$this->assertNoModuleConfig($module);
$this->assertModuleTablesDoNotExist($module);
}
@@ -133,7 +133,7 @@ public function testInstallUninstall() {
// Check that all modules that were uninstalled are now reinstalled.
$this->assertModules(array_keys($modules_to_uninstall), TRUE);
- foreach($modules_to_uninstall as $module => $info) {
+ foreach ($modules_to_uninstall as $module => $info) {
$this->assertModuleConfig($module);
$this->assertModuleTablesExist($module);
}
diff --git a/core/modules/config_translation/src/ConfigMapperManager.php b/core/modules/config_translation/src/ConfigMapperManager.php
index f33965f8c7f5..cd0b72f967d4 100644
--- a/core/modules/config_translation/src/ConfigMapperManager.php
+++ b/core/modules/config_translation/src/ConfigMapperManager.php
@@ -112,7 +112,7 @@ protected function getDiscovery() {
*/
public function getMappers(RouteCollection $collection = NULL) {
$mappers = array();
- foreach($this->getDefinitions() as $id => $definition) {
+ foreach ($this->getDefinitions() as $id => $definition) {
$mappers[$id] = $this->createInstance($id);
if ($collection) {
$mappers[$id]->setRouteCollection($collection);
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index 908b925aacab..911f6e256786 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -456,7 +456,7 @@ public function testDateFormatTranslation() {
'medium' => 'Default medium date',
'custom_medium' => 'Custom medium date',
);
- foreach($formats as $id => $label) {
+ foreach ($formats as $id => $label) {
$translation_base_url = 'admin/config/regional/date-time/formats/manage/' . $id . '/translate';
$this->drupalGet($translation_base_url);
diff --git a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
index 4d5765f6ebd6..cbf42c809cc2 100644
--- a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
+++ b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
@@ -440,7 +440,8 @@ public function testGetLangcode() {
$this->configNamesMapper->getLangcode();
$this->fail();
}
- catch (\RuntimeException $e) {}
+ catch (\RuntimeException $e) {
+ }
}
/**
diff --git a/core/modules/contact/src/Tests/ContactSitewideTest.php b/core/modules/contact/src/Tests/ContactSitewideTest.php
index f65ab6faa46f..ce6938886808 100644
--- a/core/modules/contact/src/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/src/Tests/ContactSitewideTest.php
@@ -256,7 +256,7 @@ function testSiteWideContact() {
// Find out in which row the form we want to add a field to is.
$i = 0;
- foreach($this->xpath('//table/tbody/tr') as $row) {
+ foreach ($this->xpath('//table/tbody/tr') as $row) {
if (((string) $row->td[0]->a) == $label) {
break;
}
diff --git a/core/modules/file/src/Element/ManagedFile.php b/core/modules/file/src/Element/ManagedFile.php
index 1b0984bdba88..426f40c03aa9 100644
--- a/core/modules/file/src/Element/ManagedFile.php
+++ b/core/modules/file/src/Element/ManagedFile.php
@@ -97,7 +97,7 @@ public static function valueCallback(&$element, $input, FormStateInterface $form
// Temporary files that belong to other users should never be
// allowed.
if ($file->isTemporary()) {
- if ($file->getOwnerId() != \Drupal::currentUser()->id()) {
+ if ($file->getOwnerId() != \Drupal::currentUser()->id()) {
$force_default = TRUE;
break;
}
diff --git a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
index fe94ecf2af89..df5e039cb08e 100644
--- a/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
+++ b/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
@@ -372,7 +372,8 @@ public static function process($element, FormStateInterface $form_state, $form)
);
if (isset($item['display'])) {
$element['display']['#value'] = $item['display'] ? '1' : '';
- } else {
+ }
+ else {
$element['display']['#value'] = $element['#display_default'];
}
}
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index d42c81a24851..9385b66cc447 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -647,7 +647,7 @@ function _filter_url_escape_comments($match, $escape = NULL) {
if (isset($escape)) {
$mode = $escape;
- if ($escape){
+ if ($escape) {
$comments = array();
}
return;
diff --git a/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
index 6ec335ef6ef0..1dc3395161a2 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterHtml.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
@@ -154,7 +154,7 @@ public function filterAttributes($text) {
*/
protected function filterElementAttributes(\DOMElement $element, array $allowed_attributes) {
$modified_attributes = [];
- foreach($element->attributes as $name => $attribute) {
+ foreach ($element->attributes as $name => $attribute) {
// Remove attributes not in the whitelist.
$allowed_value = $this->findAllowedValue($allowed_attributes, $name);
if (empty($allowed_value)) {
diff --git a/core/modules/forum/src/Tests/ForumUninstallTest.php b/core/modules/forum/src/Tests/ForumUninstallTest.php
index d2acc1f7e21d..1978e6b311b0 100644
--- a/core/modules/forum/src/Tests/ForumUninstallTest.php
+++ b/core/modules/forum/src/Tests/ForumUninstallTest.php
@@ -138,7 +138,7 @@ public function testForumUninstallWithoutFieldStorage() {
// Delete all terms in the Forums vocabulary. Uninstalling the forum module
// will fail unless this is done.
$terms = entity_load_multiple_by_properties('taxonomy_term', array('vid' => 'forums'));
- foreach($terms as $term) {
+ foreach ($terms as $term) {
$term->delete();
}
diff --git a/core/modules/image/src/Plugin/migrate/process/d6/ImageCacheActions.php b/core/modules/image/src/Plugin/migrate/process/d6/ImageCacheActions.php
index 259cd2f101b5..0d40769ae08f 100644
--- a/core/modules/image/src/Plugin/migrate/process/d6/ImageCacheActions.php
+++ b/core/modules/image/src/Plugin/migrate/process/d6/ImageCacheActions.php
@@ -19,7 +19,7 @@ class ImageCacheActions extends ProcessPluginBase {
public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
$effects = [];
- foreach($row->getSourceProperty('actions') as $action) {
+ foreach ($row->getSourceProperty('actions') as $action) {
$id = preg_replace('/^imagecache/', 'image', $action['action']);
if ($id === 'image_crop') {
diff --git a/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php b/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php
index 2f14adc96ef6..4266ff179774 100644
--- a/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php
+++ b/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php
@@ -54,7 +54,7 @@ public function prepareRow(Row $row) {
->condition('presetid', $row->getSourceProperty('presetid'))
->execute();
- foreach($results as $key => $result) {
+ foreach ($results as $key => $result) {
$actions[$key] = $result;
$actions[$key]['data'] = unserialize($result['data']);
}
diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index c7873b89565c..b4612f4a2694 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -168,7 +168,7 @@ function language_entity_base_field_info_alter(&$fields) {
foreach ($fields as $definition) {
// Set configurable form display for language fields with display options.
if ($definition->getType() == 'language') {
- foreach (array('form', 'view') as $type) {
+ foreach (array('form', 'view') as $type) {
if ($definition->getDisplayOptions($type)) {
// The related configurations will be purged manually on Language
// module uninstallation. @see language_modules_uninstalled().
diff --git a/core/modules/menu_ui/menu_ui.module b/core/modules/menu_ui/menu_ui.module
index 463f8cabd133..99b61d09ec1a 100644
--- a/core/modules/menu_ui/menu_ui.module
+++ b/core/modules/menu_ui/menu_ui.module
@@ -371,7 +371,7 @@ function menu_ui_form_node_form_submit($form, FormStateInterface $form_state) {
$entity->delete();
}
}
- elseif (trim($values['title'])) {
+ elseif (trim($values['title'])) {
// Decompose the selected menu parent option into 'menu_name' and 'parent',
// if the form used the default parent selection widget.
if (!empty($values['menu_parent'])) {
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 5bf296d4c216..12abf9ee9d35 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -113,7 +113,7 @@ function rdf_get_namespaces() {
// namespace, do not use \Drupal::moduleHandler()->invokeAll().
foreach (\Drupal::moduleHandler()->getImplementations('rdf_namespaces') as $module) {
$function = $module . '_rdf_namespaces';
- foreach($function() as $prefix => $namespace) {
+ foreach ($function() as $prefix => $namespace) {
if (array_key_exists($prefix, $namespaces) && $namespace !== $namespaces[$prefix]) {
throw new Exception(t('Tried to map @prefix to @namespace, but @prefix is already mapped to @orig_namespace.', array('@prefix' => $prefix, '@namespace' => $namespace, '@orig_namespace' => $namespaces[$prefix])));
}
@@ -265,7 +265,7 @@ function rdf_preprocess_html(&$variables) {
if (!isset($variables['html_attributes']['prefix'])) {
$variables['html_attributes']['prefix'] = array();
}
- foreach(rdf_get_namespaces() as $prefix => $uri) {
+ foreach (rdf_get_namespaces() as $prefix => $uri) {
$variables['html_attributes']['prefix'][] = $prefix . ': ' . $uri . " ";
}
}
diff --git a/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php b/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
index 44546e8f4507..fabfc60db4cd 100644
--- a/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
+++ b/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php
@@ -133,7 +133,7 @@ public function hasImageStyleMappings() {
public function getKeyedImageStyleMappings() {
if (!$this->keyedImageStyleMappings) {
$this->keyedImageStyleMappings = array();
- foreach($this->image_style_mappings as $mapping) {
+ foreach ($this->image_style_mappings as $mapping) {
if (!static::isEmptyImageStyleMapping($mapping)) {
$this->keyedImageStyleMappings[$mapping['breakpoint_id']][$mapping['multiplier']] = $mapping;
}
diff --git a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
index efbf7d940a1b..a7a3070874ee 100644
--- a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
+++ b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php
@@ -182,7 +182,7 @@ function testMultilingualSearch() {
$this->assertEqual(count($search_result), 2, 'The search found 2 results');
// Test to check for the language of result items.
- foreach($search_result as $result) {
+ foreach ($search_result as $result) {
$this->assertEqual($result['langcode'], 'hu', 'The search found the correct Hungarian result');
}
diff --git a/core/modules/search/src/Tests/SearchRankingTest.php b/core/modules/search/src/Tests/SearchRankingTest.php
index ff8299cf0b38..c138d9fd5ffd 100644
--- a/core/modules/search/src/Tests/SearchRankingTest.php
+++ b/core/modules/search/src/Tests/SearchRankingTest.php
@@ -244,7 +244,8 @@ public function testHTMLRankings() {
// Assert the results.
if ($tag == 'notag') {
$this->assertEqual($set[$tag_rank]['node']->id(), $nodes[$tag]->id(), 'Search tag ranking for plain text order.');
- } else {
+ }
+ else {
$this->assertEqual($set[$tag_rank]['node']->id(), $nodes[$tag]->id(), 'Search tag ranking for "<' . $sorted_tags[$tag_rank] . '>" order.');
}
}
diff --git a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
index b0e887e7aba4..3922d1f194c4 100644
--- a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
@@ -342,7 +342,7 @@ public function testShortcutLinkOrder() {
$shortcuts = $this->cssSelect('#toolbar-item-shortcuts-tray .toolbar-menu a');
$this->assertEqual((string) $shortcuts[0], 'Add content');
$this->assertEqual((string) $shortcuts[1], 'All content');
- foreach($this->set->getShortcuts() as $shortcut) {
+ foreach ($this->set->getShortcuts() as $shortcut) {
$shortcut->setWeight($shortcut->getWeight() * -1)->save();
}
$this->drupalGet(Url::fromRoute('<front>'));
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index 627df2931566..668e1b566b8e 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -2539,7 +2539,7 @@ protected function assertHeader($header, $value, $message = '', $group = 'Browse
* TRUE on pass, FALSE on fail.
*/
protected function assertUrl($path, array $options = array(), $message = '', $group = 'Other') {
- if ($path instanceof Url) {
+ if ($path instanceof Url) {
$url_obj = $path;
}
elseif (UrlHelper::isExternal($path)) {
diff --git a/core/modules/system/src/MachineNameController.php b/core/modules/system/src/MachineNameController.php
index 2434dd988c40..7331eb39deb3 100644
--- a/core/modules/system/src/MachineNameController.php
+++ b/core/modules/system/src/MachineNameController.php
@@ -58,10 +58,10 @@ public function transliterate(Request $request) {
$lowercase = $request->query->get('lowercase');
$transliterated = $this->transliteration->transliterate($text, $langcode, '_');
- if($lowercase) {
+ if ($lowercase) {
$transliterated = Unicode::strtolower($transliterated);
}
- if(isset($replace_pattern) && isset($replace)) {
+ if (isset($replace_pattern) && isset($replace)) {
// Quote the pattern delimiter and remove null characters to avoid the e
// or other modifiers being injected.
$transliterated = preg_replace('@' . strtr($replace_pattern, ['@' => '\@', chr(0) => '']) . '@', $replace, $transliterated);
diff --git a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
index f470692db746..e60bb52cb076 100644
--- a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
+++ b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php
@@ -187,7 +187,7 @@ function testMoreLink() {
),
);
- foreach($elements as $element) {
+ foreach ($elements as $element) {
$xml = new \SimpleXMLElement(\Drupal::service('renderer')->renderRoot($element['value']));
$result = $xml->xpath($element['expected']);
$this->assertTrue($result, '"' . $element['name'] . '" input rendered correctly by drupal_render().');
diff --git a/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php b/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
index 28463b73394e..2ec64e8da8e4 100644
--- a/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php
@@ -192,8 +192,7 @@ protected function generateRandomEntityId($string = FALSE) {
// Drupal supported databases and is known to work for other databases
// like SQL Server 2014 and Oracle 10 too.
$id = $string ? $this->randomMachineName() : mt_rand(1, 0x7FFFFFFF);
- }
- while (isset($this->generatedIds[$id]));
+ } while (isset($this->generatedIds[$id]));
$this->generatedIds[$id] = $id;
return $id;
}
diff --git a/core/modules/system/src/Tests/Image/ToolkitGdTest.php b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
index f2c26c997e1d..688909a0066e 100644
--- a/core/modules/system/src/Tests/Image/ToolkitGdTest.php
+++ b/core/modules/system/src/Tests/Image/ToolkitGdTest.php
@@ -378,7 +378,7 @@ function testManipulations() {
if ($image_reloaded->getToolkit()->getType() == IMAGETYPE_GIF) {
$this->assertEqual('#ffff00', $image_reloaded->getToolkit()->getTransparentColor(), SafeMarkup::format('Image file %file has the correct transparent color channel set.', array('%file' => $file)));
}
- else {
+ else {
$this->assertEqual(NULL, $image_reloaded->getToolkit()->getTransparentColor(), SafeMarkup::format('Image file %file has no color channel set.', array('%file' => $file)));
}
}
diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
index fe5a7f7f849e..84dfad3e91b0 100644
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php
@@ -147,8 +147,8 @@ protected function verifyImportedStringsTranslated() {
$test_samples = ['Save and continue', 'Anonymous', 'Language'];
$langcodes = ['de', 'es'];
- foreach($test_samples as $sample) {
- foreach($langcodes as $langcode) {
+ foreach ($test_samples as $sample) {
+ foreach ($langcodes as $langcode) {
$edit = array();
$edit['langcode'] = $langcode;
$edit['translation'] = 'translated';
diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
index be2e0f506fd6..330d61ff6bf8 100644
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
@@ -95,7 +95,7 @@ public function testInstaller() {
// Verify the strings from the translation files were imported.
$test_samples = ['Save and continue', 'Anonymous'];
- foreach($test_samples as $sample) {
+ foreach ($test_samples as $sample) {
$edit = array();
$edit['langcode'] = 'de';
$edit['translation'] = 'translated';
diff --git a/core/modules/system/src/Tests/KeyValueStore/KeyValueContentEntityStorageTest.php b/core/modules/system/src/Tests/KeyValueStore/KeyValueContentEntityStorageTest.php
index 7b8af6217d6f..816116320fc0 100644
--- a/core/modules/system/src/Tests/KeyValueStore/KeyValueContentEntityStorageTest.php
+++ b/core/modules/system/src/Tests/KeyValueStore/KeyValueContentEntityStorageTest.php
@@ -132,7 +132,8 @@ function testCRUD() {
try {
$same_id->save();
$this->fail('Not possible to overwrite an entity entity.');
- } catch (EntityStorageException $e) {
+ }
+ catch (EntityStorageException $e) {
$this->pass('Not possible to overwrite an entity entity.');
}
diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php
index 7ce67c4f5b57..9cecf8f14f1d 100644
--- a/core/modules/system/src/Tests/Module/UninstallTest.php
+++ b/core/modules/system/src/Tests/Module/UninstallTest.php
@@ -134,7 +134,8 @@ public function testFailedInstallStatus() {
try {
$this->container->get('module_installer')->install(array('module_installer_config_test'));
$this->fail($message);
- } catch (EntityMalformedException $e) {
+ }
+ catch (EntityMalformedException $e) {
$this->pass($message);
}
diff --git a/core/modules/system/src/Tests/Plugin/ContextPluginTest.php b/core/modules/system/src/Tests/Plugin/ContextPluginTest.php
index 54b2ffbced63..1711041324c8 100644
--- a/core/modules/system/src/Tests/Plugin/ContextPluginTest.php
+++ b/core/modules/system/src/Tests/Plugin/ContextPluginTest.php
@@ -58,7 +58,7 @@ function testContext() {
try {
$plugin->getContextValue('user');
}
- catch(ContextException $e) {
+ catch (ContextException $e) {
$this->assertIdentical("The 'entity:user' context is required and not present.", $e->getMessage(), 'Requesting a non-set value of a required context should throw a context exception.');
}
diff --git a/core/modules/system/src/Tests/System/ErrorHandlerTest.php b/core/modules/system/src/Tests/System/ErrorHandlerTest.php
index fb4e7db08e4e..d95c03805696 100644
--- a/core/modules/system/src/Tests/System/ErrorHandlerTest.php
+++ b/core/modules/system/src/Tests/System/ErrorHandlerTest.php
@@ -46,7 +46,7 @@ function testErrorHandler() {
'%function' => 'Drupal\error_test\Controller\ErrorTestController->Drupal\error_test\Controller\{closure}()',
'@message' => 'Argument 1 passed to Drupal\error_test\Controller\ErrorTestController::Drupal\error_test\Controller\{closure}() must be of the type array, string given, called in ' . \Drupal::root() . '/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php on line 62 and defined',
);
- if (version_compare(PHP_VERSION, '7.0.0-dev') >= 0) {
+ if (version_compare(PHP_VERSION, '7.0.0-dev') >= 0) {
// In PHP 7, instead of a recoverable fatal error we get a TypeError.
$fatal_error['%type'] = 'TypeError';
// The error message also changes in PHP 7.
diff --git a/core/modules/system/src/Tests/TypedData/TypedDataTest.php b/core/modules/system/src/Tests/TypedData/TypedDataTest.php
index 9903240b0564..eec3e1ebdb5e 100644
--- a/core/modules/system/src/Tests/TypedData/TypedDataTest.php
+++ b/core/modules/system/src/Tests/TypedData/TypedDataTest.php
@@ -248,7 +248,7 @@ public function testGetAndSet() {
// Generate some files that will be used to test the binary data type.
$files = array();
- for ($i = 0; $i < 3; $i++){
+ for ($i = 0; $i < 3; $i++) {
$path = "public://example_$i.png";
file_unmanaged_copy(\Drupal::root() . '/core/misc/druplicon.png', $path);
$image = File::create(['uri' => $path]);
diff --git a/core/modules/system/tests/modules/entity_test/src/Plugin/Derivative/EntityTestLocalTasks.php b/core/modules/system/tests/modules/entity_test/src/Plugin/Derivative/EntityTestLocalTasks.php
index 11eac7fa7226..059c3a9f4f19 100644
--- a/core/modules/system/tests/modules/entity_test/src/Plugin/Derivative/EntityTestLocalTasks.php
+++ b/core/modules/system/tests/modules/entity_test/src/Plugin/Derivative/EntityTestLocalTasks.php
@@ -16,7 +16,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
$this->derivatives = array();
$types = entity_test_entity_types(ENTITY_TEST_TYPES_ROUTING);
- foreach($types as $entity_type) {
+ foreach ($types as $entity_type) {
$this->derivatives[$entity_type . '.canonical'] = array();
$this->derivatives[$entity_type . '.canonical']['base_route'] = "entity.$entity_type.canonical";
$this->derivatives[$entity_type . '.canonical']['route_name'] = "entity.$entity_type.canonical";
diff --git a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
index 8ebc90973907..1693af1795ce 100644
--- a/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
@@ -322,7 +322,7 @@ public function validateExposed(&$form, FormStateInterface $form_state) {
// We only validate if they've chosen the text field style.
if ($this->options['type'] != 'textfield') {
- if ($form_state->getValue($identifier) != 'All') {
+ if ($form_state->getValue($identifier) != 'All') {
$this->validated_exposed_input = (array) $form_state->getValue($identifier);
}
return;
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index be4f7fa433d2..30a9ca224b83 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -326,7 +326,7 @@ function taxonomy_term_load_multiple_by_name($name, $vocabulary = NULL) {
$values = array('name' => trim($name));
if (isset($vocabulary)) {
$vocabularies = taxonomy_vocabulary_get_names();
- if (isset($vocabularies[$vocabulary])){
+ if (isset($vocabularies[$vocabulary])) {
$values['vid'] = $vocabulary;
}
else {
diff --git a/core/modules/tour/src/Entity/Tour.php b/core/modules/tour/src/Entity/Tour.php
index 5308fd363eb5..290d3f8fb9fa 100644
--- a/core/modules/tour/src/Entity/Tour.php
+++ b/core/modules/tour/src/Entity/Tour.php
@@ -171,7 +171,7 @@ public function resetKeyedRoutes() {
public function calculateDependencies() {
parent::calculateDependencies();
- foreach($this->tipsCollection as $instance) {
+ foreach ($this->tipsCollection as $instance) {
$definition = $instance->getPluginDefinition();
$this->addDependency('module', $definition['provider']);
}
diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index 1cc52f3df8dc..323a985ff7d6 100644
--- a/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/core/modules/views/src/Plugin/views/PluginBase.php
@@ -373,7 +373,7 @@ protected function viewsTokenReplace($text, $tokens) {
$top = array_shift($parts);
assert('preg_match(\'/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/\', $top) === 1', 'Tokens need to be valid Twig variables.');
$token_array = array(array_pop($parts) => $replacement);
- foreach(array_reverse($parts) as $key) {
+ foreach (array_reverse($parts) as $key) {
assert('preg_match(\'/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/\', $key) === 1', 'Tokens need to be valid Twig variables.');
$token_array = array($key => $token_array);
}
diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index 648b17868071..404de3ed2621 100644
--- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -720,7 +720,7 @@ protected function renderFields(array $result) {
$fields = $this->view->field;
$rendered_fields = &$this->rendered_fields[$index];
$post_render_tokens = [];
- foreach ($field_ids as $id) {
+ foreach ($field_ids as $id) {
$rendered_fields[$id] = $data[$id]['#markup'];
$tokens = $fields[$id]->postRender($row, $rendered_fields[$id]);
if ($tokens) {
diff --git a/core/modules/views_ui/src/Tests/NewViewConfigSchemaTest.php b/core/modules/views_ui/src/Tests/NewViewConfigSchemaTest.php
index 758e64e3edd2..a01e24bda6a0 100644
--- a/core/modules/views_ui/src/Tests/NewViewConfigSchemaTest.php
+++ b/core/modules/views_ui/src/Tests/NewViewConfigSchemaTest.php
@@ -38,7 +38,7 @@ public function testNewViews() {
'standard:aggregator_feed',
'standard:aggregator_item',
);
- foreach($wizards as $wizard_key) {
+ foreach ($wizards as $wizard_key) {
$edit = array();
$edit['label'] = $this->randomString();
$edit['id'] = strtolower($this->randomMachineName());
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 3d7ad63e9fb7..061c82525fd5 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -68,6 +68,7 @@
<exclude name="Drupal.Commenting.FunctionComment.WrongStyle"/>
</rule>
<rule ref="Drupal.ControlStructures.ElseIf"/>
+ <rule ref="Drupal.ControlStructures.ControlSignature"/>
<rule ref="Drupal.Files.EndFileNewline"/>
<rule ref="Drupal.Files.TxtFileLineLength"/>
<rule ref="Drupal.Formatting.SpaceInlineIf"/>
diff --git a/core/tests/Drupal/KernelTests/AssertConfigTrait.php b/core/tests/Drupal/KernelTests/AssertConfigTrait.php
index eb9fb8ef02d4..c2e770f0e68d 100644
--- a/core/tests/Drupal/KernelTests/AssertConfigTrait.php
+++ b/core/tests/Drupal/KernelTests/AssertConfigTrait.php
@@ -75,7 +75,7 @@ protected function assertConfigDiff(Diff $result, $config_name, array $skipped_c
}
foreach ($op->closing as $closing) {
// The UUIDs don't exist in the default config.
- if (strpos($closing, 'uuid: ') === 0) {
+ if (strpos($closing, 'uuid: ') === 0) {
continue;
}
throw new \Exception($config_name . ': ' . var_export($op, TRUE));
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
index 31b6adc51e7e..4664eeb7d3e4 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php
@@ -263,7 +263,7 @@ public function testDataTypes() {
$this->assertIdentical($config->get(), $data);
// Re-set each key using Config::set().
- foreach($data as $key => $value) {
+ foreach ($data as $key => $value) {
$config->set($key, $value);
}
$config->save();
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
index cfeeb8213539..291f077641d0 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php
@@ -473,7 +473,7 @@ public function testContentEntityDelete() {
*/
protected function getDependentIds(array $dependents) {
$dependent_ids = array();
- foreach($dependents as $dependent) {
+ foreach ($dependents as $dependent) {
$dependent_ids[] = $dependent->getEntityTypeId() . ':' . $dependent->id();
}
return $dependent_ids;
diff --git a/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php b/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php
index 8093af2493dd..1d0b0c78186a 100644
--- a/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php
@@ -34,7 +34,8 @@ function testDefaultEmptyInsert() {
db_insert('test')->execute();
// This is only executed if no exception has been thrown.
$this->fail('Expected exception NoFieldsException has not been thrown.');
- } catch (NoFieldsException $e) {
+ }
+ catch (NoFieldsException $e) {
$this->pass('Expected exception NoFieldsException has been thrown.');
}
diff --git a/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php b/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php
index 7037cedadcb7..4b24ebefbd7a 100644
--- a/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php
@@ -31,7 +31,8 @@ function testMaxAllowedPacketQueryTruncating() {
try {
db_query('SELECT name FROM {test} WHERE name = :name', array(':name' => $long_name));
$this->fail("An exception should be thrown for queries larger than 'max_allowed_packet'");
- } catch (DatabaseException $e) {
+ }
+ catch (DatabaseException $e) {
// Close and re-open the connection. Otherwise we will run into error
// 2006 "MySQL server had gone away" afterwards.
Database::closeConnection();
diff --git a/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php b/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
index fa0a7cd9b71e..7866146f90b8 100644
--- a/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
@@ -230,7 +230,8 @@ function testSchema() {
try {
db_create_table('test_timestamp', $table_specification);
}
- catch (\Exception $e) {}
+ catch (\Exception $e) {
+ }
$this->assertTrue(db_table_exists('test_timestamp'), 'Table with database specific datatype was created.');
}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
index 73a7d898d537..23cf0340c541 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
@@ -368,7 +368,8 @@ public function testBundleFieldCreateDeleteWithExistingEntities() {
->fields($values)
->execute();
$this->pass($message);
- } else {
+ }
+ else {
// Keep throwing it.
throw $e;
}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
index 216e03fc3cdd..4b08a56f82ae 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
@@ -189,8 +189,7 @@ protected function generateRandomEntityId($string = FALSE) {
// Drupal supported databases and is known to work for other databases
// like SQL Server 2014 and Oracle 10 too.
$id = $string ? $this->randomMachineName() : mt_rand(1, 0x7FFFFFFF);
- }
- while (isset($this->generatedIds[$id]));
+ } while (isset($this->generatedIds[$id]));
$this->generatedIds[$id] = $id;
return $id;
}
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
index 2291355fd8b3..10d711f34878 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
@@ -76,7 +76,7 @@ protected function assertCRUD($entity_type) {
// Creating a duplicate needs to result in a new UUID.
$entity_duplicate = $entity->createDuplicate();
foreach ($entity->getFields() as $property => $value) {
- switch($property) {
+ switch ($property) {
case 'uuid':
$this->assertNotNull($entity_duplicate->uuid());
$this->assertNotNull($entity->uuid());
diff --git a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index d10c82d86b5a..603b41df6c80 100644
--- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -178,7 +178,7 @@ protected function setUp() {
*/
public function aliasManagerCallback() {
$args = func_get_args();
- switch($args[0]) {
+ switch ($args[0]) {
case '/test/one':
return '/hello/world';
case '/test/two/5':
--
GitLab