From a1d3a681f6bec82461cc65f30ae3df363c615380 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Thu, 5 May 2016 11:07:32 +0100 Subject: [PATCH] Issue #2572693 by Mile23, andriyun, andypost, attiks: Fix 'Drupal.ControlStructures.ControlSignature' coding standard --- 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 1938ed691ea..865685078e6 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 4ffa0b4b0a7..3ef42cef4a8 100644 --- a/core/lib/Drupal/Component/Gettext/PoItem.php +++ b/core/lib/Drupal/Component/Gettext/PoItem.php @@ -181,7 +181,7 @@ class PoItem { 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 0801b361b06..750f122049b 100644 --- a/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php +++ b/core/lib/Drupal/Component/ProxyBuilder/ProxyBuilder.php @@ -92,7 +92,6 @@ EOS; // 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 84807e98d00..0953bfedd48 100644 --- a/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php +++ b/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php @@ -90,7 +90,7 @@ class PhpTransliteration implements TransliterationInterface { $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 55772f80340..3d72b038089 100644 --- a/core/lib/Drupal/Component/Utility/Random.php +++ b/core/lib/Drupal/Component/Utility/Random.php @@ -149,7 +149,7 @@ class Random { $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 bd811057eae..2fc67d67d56 100644 --- a/core/lib/Drupal/Component/Utility/UserAgent.php +++ b/core/lib/Drupal/Component/Utility/UserAgent.php @@ -122,8 +122,7 @@ class UserAgent { $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 749161ed95c..06b4ac2f26c 100644 --- a/core/lib/Drupal/Core/Cache/Cache.php +++ b/core/lib/Drupal/Core/Cache/Cache.php @@ -76,10 +76,10 @@ class Cache { */ 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 d2a00725213..57b79b61268 100644 --- a/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php +++ b/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php @@ -195,7 +195,7 @@ class CacheContextsManager { $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 4f1f9b0c649..38f9b9b4b42 100644 --- a/core/lib/Drupal/Core/Cache/PhpBackend.php +++ b/core/lib/Drupal/Core/Cache/PhpBackend.php @@ -211,7 +211,7 @@ class PhpBackend implements CacheBackendInterface { * {@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 c5e5931da86..1189a4a1536 100644 --- a/core/lib/Drupal/Core/Config/ConfigFactory.php +++ b/core/lib/Drupal/Core/Config/ConfigFactory.php @@ -271,7 +271,7 @@ class ConfigFactory implements ConfigFactoryInterface, EventSubscriberInterface // 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 bca31f42bb1..377f7c4d00d 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php @@ -228,7 +228,7 @@ class ConfigDependencyManager { $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 dead7abb0a8..df510672155 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 @@ class Connection extends DatabaseConnection { 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 a6c6781335a..705001a19f3 100644 --- a/core/lib/Drupal/Core/Datetime/Element/Datelist.php +++ b/core/lib/Drupal/Core/Datetime/Element/Datelist.php @@ -313,7 +313,7 @@ class Datelist extends DateElementBase { $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 4f0738902d3..0fa2f665237 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 @@ class QueryAggregate extends Query implements QueryAggregateInterface { * 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 928b740c13d..ec1df5c2fa2 100644 --- a/core/lib/Drupal/Core/Menu/LocalTaskManager.php +++ b/core/lib/Drupal/Core/Menu/LocalTaskManager.php @@ -218,7 +218,7 @@ class LocalTaskManager extends DefaultPluginManager implements LocalTaskManagerI $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 8a637fb356a..1d108aaed74 100644 --- a/core/lib/Drupal/Core/Render/Element/VerticalTabs.php +++ b/core/lib/Drupal/Core/Render/Element/VerticalTabs.php @@ -125,7 +125,7 @@ class VerticalTabs extends RenderElement { // 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 a25fe30cdf3..2f9aeb3662c 100644 --- a/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php +++ b/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php @@ -442,7 +442,7 @@ class HtmlResponseAttachmentsProcessor implements AttachmentsResponseProcessorIn */ 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 e254024274b..467b02bbbbc 100644 --- a/core/lib/Drupal/Core/Routing/MatcherDumper.php +++ b/core/lib/Drupal/Core/Routing/MatcherDumper.php @@ -142,7 +142,8 @@ class MatcherDumper implements MatcherDumperInterface { } - } 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 3cbbd5adf2e..6cff9d599a3 100644 --- a/core/lib/Drupal/Core/Routing/UrlGenerator.php +++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php @@ -358,7 +358,8 @@ class UrlGenerator implements UrlGeneratorInterface { $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 e4e373f2c0e..3c4d1427a82 100644 --- a/core/lib/Drupal/Core/Test/HttpClientMiddleware/TestHttpClientMiddleware.php +++ b/core/lib/Drupal/Core/Test/HttpClientMiddleware/TestHttpClientMiddleware.php @@ -40,7 +40,7 @@ class TestHttpClientMiddleware { // 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 d74025b7a9c..ca0dc3ae3d3 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 d334376c1ad..578f7fb990c 100644 --- a/core/modules/color/src/Tests/ColorTest.php +++ b/core/modules/color/src/Tests/ColorTest.php @@ -164,7 +164,7 @@ class ColorTest extends WebTestBase { $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 0a6fd2d3de0..e458e2514ed 100644 --- a/core/modules/config/src/Form/ConfigSingleImportForm.php +++ b/core/modules/config/src/Form/ConfigSingleImportForm.php @@ -388,7 +388,7 @@ class ConfigSingleImportForm extends ConfirmFormBase { 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 62a6e9c23ee..8d11ad3d09f 100644 --- a/core/modules/config/src/Form/ConfigSync.php +++ b/core/modules/config/src/Form/ConfigSync.php @@ -330,7 +330,7 @@ class ConfigSync extends FormBase { 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 5a61382e5de..a8a8f0f7479 100644 --- a/core/modules/config/src/Tests/ConfigEntityTest.php +++ b/core/modules/config/src/Tests/ConfigEntityTest.php @@ -195,7 +195,8 @@ class ConfigEntityTest extends WebTestBase { 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 a7623a95591..643f76351fa 100644 --- a/core/modules/config/src/Tests/ConfigImportAllTest.php +++ b/core/modules/config/src/Tests/ConfigImportAllTest.php @@ -60,7 +60,7 @@ class ConfigImportAllTest extends ModuleTestBase { \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 @@ class ConfigImportAllTest extends ModuleTestBase { \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 @@ class ConfigImportAllTest extends ModuleTestBase { // 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 f33965f8c7f..cd0b72f967d 100644 --- a/core/modules/config_translation/src/ConfigMapperManager.php +++ b/core/modules/config_translation/src/ConfigMapperManager.php @@ -112,7 +112,7 @@ class ConfigMapperManager extends DefaultPluginManager implements ConfigMapperMa */ 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 908b925aaca..911f6e25678 100644 --- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php +++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php @@ -456,7 +456,7 @@ class ConfigTranslationUiTest extends WebTestBase { '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 4d5765f6ebd..cbf42c809cc 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 @@ class ConfigNamesMapperTest extends UnitTestCase { $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 f65ab6faa46..ce693888680 100644 --- a/core/modules/contact/src/Tests/ContactSitewideTest.php +++ b/core/modules/contact/src/Tests/ContactSitewideTest.php @@ -256,7 +256,7 @@ class ContactSitewideTest extends WebTestBase { // 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 1b0984bdba8..426f40c03aa 100644 --- a/core/modules/file/src/Element/ManagedFile.php +++ b/core/modules/file/src/Element/ManagedFile.php @@ -97,7 +97,7 @@ class ManagedFile extends FormElement { // 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 fe94ecf2af8..df5e039cb08 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 @@ class FileWidget extends WidgetBase implements ContainerFactoryPluginInterface { ); 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 d42c81a2485..9385b66cc44 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 6ec335ef6ef..1dc3395161a 100644 --- a/core/modules/filter/src/Plugin/Filter/FilterHtml.php +++ b/core/modules/filter/src/Plugin/Filter/FilterHtml.php @@ -154,7 +154,7 @@ class FilterHtml extends FilterBase { */ 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 d2acc1f7e21..1978e6b311b 100644 --- a/core/modules/forum/src/Tests/ForumUninstallTest.php +++ b/core/modules/forum/src/Tests/ForumUninstallTest.php @@ -138,7 +138,7 @@ class ForumUninstallTest extends WebTestBase { // 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 259cd2f101b..0d40769ae08 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 2f14adc96ef..4266ff17977 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 @@ class ImageCachePreset extends DrupalSqlBase { ->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 c7873b89565..b4612f4a269 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 463f8cabd13..99b61d09ec1 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 5bf296d4c21..12abf9ee9d3 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 44546e8f450..fabfc60db4c 100644 --- a/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php +++ b/core/modules/responsive_image/src/Entity/ResponsiveImageStyle.php @@ -133,7 +133,7 @@ class ResponsiveImageStyle extends ConfigEntityBase implements ResponsiveImageSt 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 efbf7d940a1..a7a3070874e 100644 --- a/core/modules/search/src/Tests/SearchMultilingualEntityTest.php +++ b/core/modules/search/src/Tests/SearchMultilingualEntityTest.php @@ -182,7 +182,7 @@ class SearchMultilingualEntityTest extends SearchTestBase { $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 ff8299cf0b3..c138d9fd5ff 100644 --- a/core/modules/search/src/Tests/SearchRankingTest.php +++ b/core/modules/search/src/Tests/SearchRankingTest.php @@ -244,7 +244,8 @@ class SearchRankingTest extends SearchTestBase { // 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 b0e887e7aba..3922d1f194c 100644 --- a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php +++ b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php @@ -342,7 +342,7 @@ class ShortcutLinksTest extends ShortcutTestBase { $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('')); diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php index 627df293156..668e1b566b8 100644 --- a/core/modules/simpletest/src/WebTestBase.php +++ b/core/modules/simpletest/src/WebTestBase.php @@ -2539,7 +2539,7 @@ abstract class WebTestBase extends TestBase { * 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 2434dd988c4..7331eb39deb 100644 --- a/core/modules/system/src/MachineNameController.php +++ b/core/modules/system/src/MachineNameController.php @@ -58,10 +58,10 @@ class MachineNameController implements ContainerInjectionInterface { $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 f470692db74..e60bb52cb07 100644 --- a/core/modules/system/src/Tests/Common/RenderElementTypesTest.php +++ b/core/modules/system/src/Tests/Common/RenderElementTypesTest.php @@ -187,7 +187,7 @@ class RenderElementTypesTest extends KernelTestBase { ), ); - 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 28463b73394..2ec64e8da8e 100644 --- a/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php +++ b/core/modules/system/src/Tests/Entity/EntityUnitTestBase.php @@ -192,8 +192,7 @@ abstract class EntityUnitTestBase extends KernelTestBase { // 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 f2c26c997e1..688909a0066 100644 --- a/core/modules/system/src/Tests/Image/ToolkitGdTest.php +++ b/core/modules/system/src/Tests/Image/ToolkitGdTest.php @@ -378,7 +378,7 @@ class ToolkitGdTest extends KernelTestBase { 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 fe5a7f7f849..84dfad3e91b 100644 --- a/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerTranslationMultipleLanguageTest.php @@ -147,8 +147,8 @@ ENDPO; $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 be2e0f506fd..330d61ff6bf 100644 --- a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php +++ b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php @@ -95,7 +95,7 @@ class InstallerTranslationTest extends InstallerTestBase { // 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 7b8af6217d6..816116320fc 100644 --- a/core/modules/system/src/Tests/KeyValueStore/KeyValueContentEntityStorageTest.php +++ b/core/modules/system/src/Tests/KeyValueStore/KeyValueContentEntityStorageTest.php @@ -132,7 +132,8 @@ class KeyValueContentEntityStorageTest extends KernelTestBase { 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 7ce67c4f5b5..9cecf8f14f1 100644 --- a/core/modules/system/src/Tests/Module/UninstallTest.php +++ b/core/modules/system/src/Tests/Module/UninstallTest.php @@ -134,7 +134,8 @@ class UninstallTest extends WebTestBase { 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 54b2ffbced6..1711041324c 100644 --- a/core/modules/system/src/Tests/Plugin/ContextPluginTest.php +++ b/core/modules/system/src/Tests/Plugin/ContextPluginTest.php @@ -58,7 +58,7 @@ class ContextPluginTest extends KernelTestBase { 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 123b8fb3e48..113d4955170 100644 --- a/core/modules/system/src/Tests/System/ErrorHandlerTest.php +++ b/core/modules/system/src/Tests/System/ErrorHandlerTest.php @@ -47,7 +47,7 @@ class ErrorHandlerTest extends WebTestBase { '%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 9903240b056..eec3e1ebdb5 100644 --- a/core/modules/system/src/Tests/TypedData/TypedDataTest.php +++ b/core/modules/system/src/Tests/TypedData/TypedDataTest.php @@ -248,7 +248,7 @@ class TypedDataTest extends KernelTestBase { // 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 11eac7fa722..059c3a9f4f1 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 @@ class EntityTestLocalTasks extends DeriverBase { $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 8ebc9097390..1693af1795c 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 @@ class TaxonomyIndexTid extends ManyToOne { // 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 be4f7fa433d..30a9ca224b8 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 5308fd363eb..290d3f8fb9f 100644 --- a/core/modules/tour/src/Entity/Tour.php +++ b/core/modules/tour/src/Entity/Tour.php @@ -171,7 +171,7 @@ class Tour extends ConfigEntityBase implements TourInterface { 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 1cc52f3df8d..323a985ff7d 100644 --- a/core/modules/views/src/Plugin/views/PluginBase.php +++ b/core/modules/views/src/Plugin/views/PluginBase.php @@ -373,7 +373,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor $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 34b3eea0161..3bee96a5f53 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 @@ abstract class StylePluginBase extends PluginBase { $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 758e64e3edd..a01e24bda6a 100644 --- a/core/modules/views_ui/src/Tests/NewViewConfigSchemaTest.php +++ b/core/modules/views_ui/src/Tests/NewViewConfigSchemaTest.php @@ -38,7 +38,7 @@ class NewViewConfigSchemaTest extends WebTestBase { '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 975c31f056a..98c72838d29 100644 --- a/core/phpcs.xml.dist +++ b/core/phpcs.xml.dist @@ -68,6 +68,7 @@ + diff --git a/core/tests/Drupal/KernelTests/AssertConfigTrait.php b/core/tests/Drupal/KernelTests/AssertConfigTrait.php index eb9fb8ef02d..c2e770f0e68 100644 --- a/core/tests/Drupal/KernelTests/AssertConfigTrait.php +++ b/core/tests/Drupal/KernelTests/AssertConfigTrait.php @@ -75,7 +75,7 @@ trait AssertConfigTrait { } 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 31b6adc51e7..4664eeb7d3e 100644 --- a/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php +++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigCRUDTest.php @@ -263,7 +263,7 @@ class ConfigCRUDTest extends KernelTestBase { $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 cfeeb821353..291f077641d 100644 --- a/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php +++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigDependencyTest.php @@ -473,7 +473,7 @@ class ConfigDependencyTest extends EntityKernelTestBase { */ 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 8093af2493d..1d0b0c78186 100644 --- a/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php +++ b/core/tests/Drupal/KernelTests/Core/Database/InsertDefaultsTest.php @@ -34,7 +34,8 @@ class InsertDefaultsTest extends DatabaseTestBase { 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 7037cedadcb..4b24ebefbd7 100644 --- a/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php +++ b/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php @@ -31,7 +31,8 @@ class LargeQueryTest extends DatabaseTestBase { 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 fa0a7cd9b71..7866146f90b 100644 --- a/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php +++ b/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php @@ -230,7 +230,8 @@ class SchemaTest extends KernelTestBase { 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 73a7d898d53..23cf0340c54 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php @@ -368,7 +368,8 @@ class EntityDefinitionUpdateTest extends EntityKernelTestBase { ->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 216e03fc3cd..4b08a56f82a 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php @@ -189,8 +189,7 @@ abstract class EntityKernelTestBase extends KernelTestBase { // 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 2291355fd8b..10d711f3487 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php @@ -76,7 +76,7 @@ class EntityUUIDTest extends EntityKernelTestBase { // 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 d10c82d86b5..603b41df6c8 100644 --- a/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php +++ b/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php @@ -178,7 +178,7 @@ class UrlGeneratorTest extends UnitTestCase { */ public function aliasManagerCallback() { $args = func_get_args(); - switch($args[0]) { + switch ($args[0]) { case '/test/one': return '/hello/world'; case '/test/two/5':