From de343a3af05b2ef06377dc7286a7ad93584a1aa5 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 22 Jul 2024 13:36:52 +0200
Subject: [PATCH] fixes + phpstan

See fix at rector: https://github.com/rectorphp/rector-src/pull/6164
---
 app/code/core/Mage/Core/Model/Date.php      | 2 +-
 app/code/core/Mage/Dataflow/Model/Batch.php | 2 +-
 phpstan.dist.baseline.neon                  | 5 -----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/code/core/Mage/Core/Model/Date.php b/app/code/core/Mage/Core/Model/Date.php
index b34da76363e..0e7dc8a5653 100644
--- a/app/code/core/Mage/Core/Model/Date.php
+++ b/app/code/core/Mage/Core/Model/Date.php
@@ -250,7 +250,7 @@ public function parseDateTime($dateTimeString, $dateTimeFormat)
             'm/d/y' => ['/^([0-9]{1,2})\/([0-9]{1,2})\/([0-9]{1,2})/', ['y' => 3, 'm' => 1, 'd' => 2]],
         ];
 
-        foreach (array_keys($formats) as $supportedFormat) {
+        foreach ($formats as $supportedFormat => $regRule) {
             if (strpos($dateTimeFormat, $supportedFormat, 0) !== false) {
                 $isSupportedFormatFound = true;
                 break;
diff --git a/app/code/core/Mage/Dataflow/Model/Batch.php b/app/code/core/Mage/Dataflow/Model/Batch.php
index b9eb5dfed1e..1235b8f468f 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch.php
@@ -97,7 +97,7 @@ public function parseFieldList($row)
                 $this->_fieldList[$fieldName] = $fieldName;
             }
         }
-        unset($fieldName, $value, $row);
+        unset($fieldName, $row);
     }
 
     /**
diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon
index 8fd0d3944fa..21489364a42 100644
--- a/phpstan.dist.baseline.neon
+++ b/phpstan.dist.baseline.neon
@@ -3400,11 +3400,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
 
-		-
-			message: "#^Offset int\\|string on non\\-empty\\-array\\<int\\|string, non\\-empty\\-array\\> in isset\\(\\) always exists and is not nullable\\.$#"
-			count: 2
-			path: app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
-
 		-
 			message: "#^Variable \\$collection might not be defined\\.$#"
 			count: 1