From e438572752753ce2855f522755d5ae4c649463b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 09:13:47 +0800 Subject: [PATCH 1/2] Bump friendsofphp/php-cs-fixer from 3.60.0 to 3.62.0 (#4153) Bumps [friendsofphp/php-cs-fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) from 3.60.0 to 3.62.0. - [Release notes](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases) - [Changelog](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/blob/master/CHANGELOG.md) - [Commits](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/compare/v3.60.0...v3.62.0) --- updated-dependencies: - dependency-name: friendsofphp/php-cs-fixer dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index ae9d1be9332..7afc631ede6 100644 --- a/composer.lock +++ b/composer.lock @@ -2756,16 +2756,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.60.0", + "version": "v3.62.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "e595e4e070d17c5d42ed8c4206f630fcc5f401a4" + "reference": "627692f794d35c43483f34b01d94740df2a73507" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/e595e4e070d17c5d42ed8c4206f630fcc5f401a4", - "reference": "e595e4e070d17c5d42ed8c4206f630fcc5f401a4", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/627692f794d35c43483f34b01d94740df2a73507", + "reference": "627692f794d35c43483f34b01d94740df2a73507", "shasum": "" }, "require": { @@ -2847,7 +2847,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.60.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.62.0" }, "funding": [ { @@ -2855,7 +2855,7 @@ "type": "github" } ], - "time": "2024-07-25T09:26:51+00:00" + "time": "2024-08-07T17:03:09+00:00" }, { "name": "macopedia/phpstan-magento1", From 9f1659dbac606bc7917febe4a319f963a0bf85f3 Mon Sep 17 00:00:00 2001 From: Sven Reichel Date: Thu, 22 Aug 2024 03:14:17 +0200 Subject: [PATCH 2/2] PHPCS: fixed php compatibility warning (#4148) * Rector: CQ - UnusedForeachValueToArrayKeysRector (#1) * Rector: CQ - UnusedForeachValueToArrayKeysRector See Rector\CodeQuality\Rector\Foreach_\UnusedForeachValueToArrayKeysRector * fixes + phpstan See fix at rector: https://github.com/rectorphp/rector-src/pull/6164 * Fixed phpcs compatibility warning * Revert "Rector: CQ - UnusedForeachValueToArrayKeysRector (#1)" This reverts commit 3d7eaf63f2211a9e1a8defe8c29e8f6da889ab2e. --- app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php b/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php index 61abc39e84e..c7acb46678e 100644 --- a/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php +++ b/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php @@ -68,14 +68,14 @@ public function overrideEnvironment(Varien_Simplexml_Config $xmlConfig) switch ($scope) { case static::CONFIG_KEY_DEFAULT: - list($_, $_, $section, $group, $field) = $configKeyParts; + list($unused1, $unused2, $section, $group, $field) = $configKeyParts; $path = $this->buildPath($section, $group, $field); $xmlConfig->setNode($this->buildNodePath($scope, $path), $value); break; case static::CONFIG_KEY_WEBSITES: case static::CONFIG_KEY_STORES: - list($_, $_, $code, $section, $group, $field) = $configKeyParts; + list($unused1, $unused2, $code, $section, $group, $field) = $configKeyParts; $path = $this->buildPath($section, $group, $field); $nodePath = sprintf('%s/%s/%s', strtolower($scope), strtolower($code), $path); $xmlConfig->setNode($nodePath, $value);