From f39127cef88382b1740a86ffbe62e3e1e7ec2c5d Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Thu, 14 Sep 2017 14:50:30 +0100
Subject: [PATCH] Issue #2901718 by mfernea: Fix
'Squiz.ControlStructures.ForEachLoopDeclaration' coding standard
---
core/lib/Drupal/Core/Menu/LocalTaskManager.php | 2 +-
core/modules/color/color.module | 2 +-
.../search/src/Plugin/views/argument/Search.php | 2 +-
.../modules/search/src/Plugin/views/filter/Search.php | 2 +-
core/phpcs.xml.dist | 11 +++++++++++
5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskManager.php b/core/lib/Drupal/Core/Menu/LocalTaskManager.php
index c14d1de1a322..1046a9f13b9d 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskManager.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskManager.php
@@ -234,7 +234,7 @@ public function getLocalTasksForRoute($route_name) {
if ($base_routes) {
// Find all the plugins with the same root and that are at the top
// level or that have a visible parent.
- foreach ($definitions as $plugin_id => $task_info) {
+ foreach ($definitions as $plugin_id => $task_info) {
if (!empty($base_routes[$task_info['base_route']]) && (empty($task_info['parent_id']) || !empty($parents[$task_info['parent_id']]))) {
// Concat '> ' with root ID for the parent of top-level tabs.
$parent = empty($task_info['parent_id']) ? '> ' . $task_info['base_route'] : $task_info['parent_id'];
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index 84abac1f50f2..2de53f5c17c0 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -80,7 +80,7 @@ function color_library_info_alter(&$libraries, $extension) {
if (isset($libraries[$name]['css'])) {
// Override stylesheets.
foreach ($libraries[$name]['css'] as $category => $css_assets) {
- foreach ($css_assets as $path => $metadata) {
+ foreach ($css_assets as $path => $metadata) {
// Loop over the path array with recolored CSS files to find matching
// paths which could replace the non-recolored paths.
foreach ($color_paths as $color_path) {
diff --git a/core/modules/search/src/Plugin/views/argument/Search.php b/core/modules/search/src/Plugin/views/argument/Search.php
index 7e9f00d4bd82..f9cd9a14b3f3 100644
--- a/core/modules/search/src/Plugin/views/argument/Search.php
+++ b/core/modules/search/src/Plugin/views/argument/Search.php
@@ -97,7 +97,7 @@ public function query($group_by = FALSE) {
$search_dataset = $this->query->addTable('node_search_dataset');
$conditions = $this->searchQuery->conditions();
$condition_conditions =& $conditions->conditions();
- foreach ($condition_conditions as $key => &$condition) {
+ foreach ($condition_conditions as $key => &$condition) {
// Make sure we just look at real conditions.
if (is_numeric($key)) {
// Replace the conditions with the table alias of views.
diff --git a/core/modules/search/src/Plugin/views/filter/Search.php b/core/modules/search/src/Plugin/views/filter/Search.php
index ac0f671ae21c..b1884d5ac327 100644
--- a/core/modules/search/src/Plugin/views/filter/Search.php
+++ b/core/modules/search/src/Plugin/views/filter/Search.php
@@ -172,7 +172,7 @@ public function query() {
$search_dataset = $this->query->addTable('node_search_dataset');
$conditions = $this->searchQuery->conditions();
$condition_conditions =& $conditions->conditions();
- foreach ($condition_conditions as $key => &$condition) {
+ foreach ($condition_conditions as $key => &$condition) {
// Make sure we just look at real conditions.
if (is_numeric($key)) {
// Replace the conditions with the table alias of views.
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 59b33c4ab314..612012b9b7cc 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -147,6 +147,17 @@
</rule>
<!-- Squiz sniffs -->
+ <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration" />
+ <!-- Disable some error messages that we already cover. -->
+ <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.AsNotLower">
+ <severity>0</severity>
+ </rule>
+ <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceAfterOpen">
+ <severity>0</severity>
+ </rule>
+ <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration.SpaceBeforeClose">
+ <severity>0</severity>
+ </rule>
<rule ref="Squiz.ControlStructures.ForLoopDeclaration"/>
<!-- Disable some error messages that we already cover. -->
<rule ref="Squiz.ControlStructures.ForLoopDeclaration.SpacingAfterOpen">
--
GitLab