From 3d7eaf63f2211a9e1a8defe8c29e8f6da889ab2e Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 22 Jul 2024 14:01:39 +0200
Subject: [PATCH 01/79] 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
---
 app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php    | 4 ++--
 app/code/core/Mage/Adminhtml/Block/Page/Menu.php          | 2 +-
 app/code/core/Mage/Adminhtml/Block/Report/Grid.php        | 2 +-
 .../Adminhtml/Block/Sales/Transactions/Child/Grid.php     | 2 +-
 app/code/core/Mage/Adminhtml/Block/Store/Switcher.php     | 4 ++--
 app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php    | 2 +-
 .../core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php    | 2 +-
 app/code/core/Mage/Adminhtml/Block/Widget/Grid.php        | 2 +-
 .../Block/Widget/Grid/Column/Renderer/Action.php          | 2 +-
 app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php        | 2 +-
 .../Adminhtml/Model/System/Config/Source/Admin/Page.php   | 2 +-
 app/code/core/Mage/Api2/Model/Acl/Filter.php              | 2 +-
 .../Model/Acl/Filter/Attribute/ResourcePermission.php     | 2 +-
 app/code/core/Mage/Catalog/Model/Api2/Product.php         | 2 +-
 app/code/core/Mage/Catalog/Model/Category.php             | 2 +-
 app/code/core/Mage/Catalog/Model/Product/Type/Price.php   | 2 +-
 .../core/Mage/Catalog/Model/Resource/Category/Flat.php    | 2 +-
 app/code/core/Mage/Checkout/Model/Type/Onepage.php        | 2 +-
 .../Mage/ConfigurableSwatches/Helper/Mediafallback.php    | 2 +-
 app/code/core/Mage/Core/Helper/Data.php                   | 2 +-
 app/code/core/Mage/Core/Model/Cache.php                   | 2 +-
 app/code/core/Mage/Core/Model/Layout/Validator.php        | 2 +-
 app/code/core/Mage/Core/Model/Locale.php                  | 2 +-
 app/code/core/Mage/Core/Model/Log/Adapter.php             | 2 +-
 app/code/core/Mage/Core/Model/Url/Rewrite.php             | 2 +-
 app/code/core/Mage/Core/Model/Url/Rewrite/Request.php     | 2 +-
 app/code/core/Mage/Customer/Model/Address/Api.php         | 8 ++++----
 app/code/core/Mage/Customer/Model/Address/Api/V2.php      | 6 +++---
 app/code/core/Mage/Customer/Model/Customer/Api.php        | 6 +++---
 app/code/core/Mage/Dataflow/Model/Batch.php               | 4 ++--
 app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php  | 2 +-
 app/code/core/Mage/Eav/Model/Entity/Abstract.php          | 2 +-
 .../Mage/ImportExport/Model/Export/Entity/Product.php     | 6 +++---
 .../Mage/ImportExport/Model/Import/Entity/Customer.php    | 2 +-
 .../Mage/ImportExport/Model/Import/Entity/Product.php     | 2 +-
 app/code/core/Mage/Index/Model/Event.php                  | 2 +-
 app/code/core/Mage/Install/Block/Db/Main.php              | 2 +-
 app/code/core/Mage/Install/Model/Installer/Console.php    | 2 +-
 .../core/Mage/Install/Model/Installer/Db/Abstract.php     | 2 +-
 app/code/core/Mage/Page/Block/Template/Links.php          | 2 +-
 app/code/core/Mage/Paygate/Model/Authorizenet.php         | 2 +-
 app/code/core/Mage/Payment/Block/Form/Cc.php              | 2 +-
 app/code/core/Mage/Payment/Helper/Data.php                | 6 +++---
 .../core/Mage/Paypal/Model/Resource/Report/Settlement.php | 2 +-
 app/code/core/Mage/Reports/Model/Totals.php               | 2 +-
 app/code/core/Mage/Rule/Model/Action/Abstract.php         | 4 ++--
 app/code/core/Mage/Rule/Model/Condition/Abstract.php      | 6 +++---
 app/code/core/Mage/Rule/Model/Condition/Combine.php       | 2 +-
 .../Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php | 2 +-
 .../Mage/Sales/Model/Resource/Report/Order/Createdat.php  | 2 +-
 .../core/Mage/Sales/Model/Resource/Sale/Collection.php    | 2 +-
 .../sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php      | 2 +-
 .../sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php      | 2 +-
 app/code/core/Mage/Shipping/Model/Rate/Result.php         | 2 +-
 app/code/core/Mage/Tag/Helper/Data.php                    | 2 +-
 app/code/core/Mage/Tag/controllers/IndexController.php    | 2 +-
 .../core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php   | 2 +-
 .../Catalog/Product/Attribute/Edit/AttributeForm.php      | 2 +-
 .../Test/Block/Catalog/Product/Edit/Tab/Prices.php        | 4 ++--
 .../Adminhtml/Test/Block/Catalog/Product/ProductForm.php  | 2 +-
 .../app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php     | 4 ++--
 .../tests/app/Mage/Bundle/Test/Handler/Curl.php           | 4 ++--
 .../DeleteOptionsSubStep.php                              | 2 +-
 .../app/Mage/Customer/Test/Handler/Customer/Curl.php      | 2 +-
 .../app/Mage/Weee/Test/Constraint/AssertFptApplied.php    | 2 +-
 lib/Varien/Convert/Parser/Csv.php                         | 4 ++--
 lib/Varien/Db/Statement/Pdo/Mysql.php                     | 2 +-
 lib/Varien/Http/Adapter/Curl.php                          | 2 +-
 lib/Varien/Object.php                                     | 2 +-
 lib/Varien/Object/Cache.php                               | 2 +-
 phpstan.dist.baseline.neon                                | 5 -----
 71 files changed, 91 insertions(+), 96 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
index 700d3b3b17d..afc5f13938c 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
@@ -215,7 +215,7 @@ public function getChartUrl($directUrl = true)
                     $dateStart->addMonth(1);
                     break;
             }
-            foreach ($this->getAllSeries() as $index => $serie) {
+            foreach (array_keys($this->getAllSeries()) as $index) {
                 if (in_array($d, $this->_axisLabels['x'])) {
                     $datas[$index][] = (float)array_shift($this->_allSeries[$index]);
                 } else {
@@ -328,7 +328,7 @@ public function getChartUrl($directUrl = true)
         if (count($this->_axisLabels)) {
             $params['chxt'] = implode(',', array_keys($this->_axisLabels));
             $indexid = 0;
-            foreach ($this->_axisLabels as $idx => $labels) {
+            foreach (array_keys($this->_axisLabels) as $idx) {
                 if ($idx === 'x') {
                     /**
                      * Format date
diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
index d4872f9158d..20bb44f96f4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
+++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
@@ -164,7 +164,7 @@ protected function _buildMenuArray(Varien_Simplexml_Element $parent, $path = '',
 
         uasort($parentArr, [$this, '_sortMenu']);
 
-        foreach ($parentArr as $key => $value) {
+        foreach (array_keys($parentArr) as $key) {
             $last = $key;
         }
         if (isset($last)) {
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
index 180a228a288..efc441c2365 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
@@ -207,7 +207,7 @@ protected function _prepareCollection()
      */
     protected function _setFilterValues($data)
     {
-        foreach ($data as $name => $value) {
+        foreach (array_keys($data) as $name) {
             $this->setFilter($name, $data[$name]);
         }
         return $this;
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php
index 1e8e12f3dd4..2a585eb5b7d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php
@@ -62,7 +62,7 @@ protected function _prepareColumns()
     {
         $result = parent::_prepareColumns();
 
-        foreach ($this->_columns as $key => $value) {
+        foreach (array_keys($this->_columns) as $key) {
             if (in_array($key, $this->_columnsToRemove)) {
                 unset($this->_columns[$key]);
             } else {
diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php
index d0c60a17406..33442aa26b1 100644
--- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php
+++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php
@@ -73,7 +73,7 @@ public function getWebsites()
     {
         $websites = Mage::app()->getWebsites();
         if ($websiteIds = $this->getWebsiteIds()) {
-            foreach ($websites as $websiteId => $website) {
+            foreach (array_keys($websites) as $websiteId) {
                 if (!in_array($websiteId, $websiteIds)) {
                     unset($websites[$websiteId]);
                 }
@@ -140,7 +140,7 @@ public function getStores($group)
         }
         $stores = $group->getStores();
         if ($storeIds = $this->getStoreIds()) {
-            foreach ($stores as $storeId => $store) {
+            foreach (array_keys($stores) as $storeId) {
                 if (!in_array($storeId, $storeIds)) {
                     unset($stores[$storeId]);
                 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
index 9e369a45972..fc959e184ff 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
@@ -194,7 +194,7 @@ public function getButtonsHtml($area = null)
     {
         if ($this->_buttonsHtml === null) {
             $this->_buttonsHtml = parent::getButtonsHtml();
-            foreach ($this->_children as $alias => $child) {
+            foreach (array_keys($this->_children) as $alias) {
                 if (str_contains($alias, '_button')) {
                     $this->unsetChild($alias);
                 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
index a91f22b905a..955c2f871b0 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
@@ -61,7 +61,7 @@ protected function _prepareForm()
             'description'  => $model->getDescription(),
         ];
         if ($sessionData = Mage::getSingleton('adminhtml/session')->getData('urlrewrite_data', true)) {
-            foreach ($formValues as $key => $value) {
+            foreach (array_keys($formValues) as $key) {
                 if (isset($sessionData[$key])) {
                     $formValues[$key] = $sessionData[$key];
                 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
index af36a237924..5b701ae5133 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
@@ -481,7 +481,7 @@ public function getColumns()
      */
     protected function _setFilterValues($data)
     {
-        foreach ($data as $columnId => $value) {
+        foreach (array_keys($data) as $columnId) {
             $column = $this->getColumn($columnId);
             if ($column instanceof Mage_Adminhtml_Block_Widget_Grid_Column
                 && (!empty($data[$columnId]) || strlen($data[$columnId]) > 0)
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php
index 1fe5f9905b6..9bdad27dbbf 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php
@@ -109,7 +109,7 @@ protected function _toLinkHtml($action, Varien_Object $row)
      */
     protected function _transformActionData(&$action, &$actionCaption, Varien_Object $row)
     {
-        foreach ($action as $attribute => $value) {
+        foreach (array_keys($action) as $attribute) {
             if (isset($action[$attribute]) && !is_array($action[$attribute])) {
                 $this->getColumn()->setFormat($action[$attribute]);
                 $action[$attribute] = parent::render($row);
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
index 94e9fae48a6..ca58c8f7fc6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
@@ -256,7 +256,7 @@ protected function _reorderTabs()
         asort($this->_tabPositions);
 
         $ordered = [];
-        foreach ($this->_tabPositions as $tabId => $position) {
+        foreach (array_keys($this->_tabPositions) as $tabId) {
             if (isset($this->_tabs[$tabId])) {
                 $tab = $this->_tabs[$tabId];
                 $ordered[$tabId] = $tab;
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php
index e79b3daedc4..92bfd9d0639 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php
@@ -109,7 +109,7 @@ protected function _buildMenuArray(?Varien_Simplexml_Element $parent = null, $pa
 
         uasort($parentArr, [$this, '_sortMenu']);
 
-        foreach ($parentArr as $key => $value) {
+        foreach (array_keys($parentArr) as $key) {
             $last = $key;
         }
         if (isset($last)) {
diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter.php b/app/code/core/Mage/Api2/Model/Acl/Filter.php
index 3494dfceb14..cefef4dd4f6 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Filter.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Filter.php
@@ -61,7 +61,7 @@ public function __construct(Mage_Api2_Model_Resource $resource)
      */
     protected function _filter(array $allowedAttributes, array $data)
     {
-        foreach ($data as $attribute => $value) {
+        foreach (array_keys($data) as $attribute) {
             if (!in_array($attribute, $allowedAttributes)) {
                 unset($data[$attribute]);
             }
diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php
index 1016b87c227..f58a244ca00 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php
@@ -103,7 +103,7 @@ public function getResourcesPermissions()
                             $resourceModel->setResourceType($resource)
                                 ->setUserType($this->_userType);
 
-                            foreach ($operations as $operation => $operationLabel) {
+                            foreach (array_keys($operations) as $operation) {
                                 if (!$this->_hasEntityOnlyAttributes
                                     && $config->getResourceEntityOnlyAttributes($resource, $this->_userType, $operation)
                                 ) {
diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product.php b/app/code/core/Mage/Catalog/Model/Api2/Product.php
index 586f1db4acd..f757413be4b 100644
--- a/app/code/core/Mage/Catalog/Model/Api2/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Api2/Product.php
@@ -42,7 +42,7 @@ public function getAvailableAttributes($userType, $operation)
         }
         $excludedAttrs = $this->getExcludedAttributes($userType, $operation);
         $includedAttrs = $this->getIncludedAttributes($userType, $operation);
-        foreach ($attributes as $code => $label) {
+        foreach (array_keys($attributes) as $code) {
             if (in_array($code, $excludedAttrs) || ($includedAttrs && !in_array($code, $includedAttrs))) {
                 unset($attributes[$code]);
             }
diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php
index 58cd0b2c7c9..5ff10b609dc 100644
--- a/app/code/core/Mage/Catalog/Model/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Category.php
@@ -346,7 +346,7 @@ public function getAttributes($noDesignAttributes = false)
             ->getSortedAttributes();
 
         if ($noDesignAttributes) {
-            foreach ($result as $k => $a) {
+            foreach (array_keys($result) as $k) {
                 if (in_array($k, $this->_designAttributes)) {
                     unset($result[$k]);
                 }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
index 62e6d7f86ae..df7d7f731c9 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
@@ -300,7 +300,7 @@ public function getFormatedTierPrice($qty, $product)
     {
         $price = $product->getTierPrice($qty);
         if (is_array($price)) {
-            foreach ($price as $index => $value) {
+            foreach (array_keys($price) as $index) {
                 $price[$index]['formated_price'] = Mage::app()->getStore()->convertPrice(
                     $price[$index]['website_price'],
                     true
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
index 3a03e409ef5..7e962fb0b72 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
@@ -1152,7 +1152,7 @@ protected function _prepareDataForAllFields($category, $replaceFields = [])
         $table = $this->_getReadAdapter()->describeTable($table);
         $data = [];
         $idFieldName = Mage::getSingleton('catalog/category')->getIdFieldName();
-        foreach ($table as $column => $columnData) {
+        foreach (array_keys($table) as $column) {
             if ($column != $idFieldName || $category->getData($column) !== null) {
                 if (array_key_exists($column, $replaceFields)) {
                     $value = $category->getData($replaceFields[$column]);
diff --git a/app/code/core/Mage/Checkout/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
index f1d8d4a5ced..2cdbe2eec65 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
@@ -119,7 +119,7 @@ public function initCheckout()
         $checkout = $this->getCheckout();
         $customerSession = $this->getCustomerSession();
         if (is_array($checkout->getStepData())) {
-            foreach ($checkout->getStepData() as $step => $data) {
+            foreach (array_keys($checkout->getStepData()) as $step) {
                 if (!($step === 'login' || $customerSession->isLoggedIn() && $step === 'billing')) {
                     $checkout->setStepData($step, 'allow', false);
                 }
diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php
index db49ed16933..da23ea014ad 100644
--- a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php
+++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php
@@ -136,7 +136,7 @@ public function attachProductChildrenAttributeMapping(array $parentProducts, $st
                 } // end looping child products
             } // end looping attributes
 
-            foreach ($mapping as $key => $value) {
+            foreach (array_keys($mapping) as $key) {
                 $mapping[$key]['product_ids'] = array_unique($mapping[$key]['product_ids']);
             }
 
diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php
index 73029d7952c..d3c9a73ac45 100644
--- a/app/code/core/Mage/Core/Helper/Data.php
+++ b/app/code/core/Mage/Core/Helper/Data.php
@@ -603,7 +603,7 @@ public function assocToXml(array $array, $rootName = '_')
 <$rootName></$rootName>
 XML;
         $xml = new SimpleXMLElement($xmlstr);
-        foreach ($array as $key => $value) {
+        foreach (array_keys($array) as $key) {
             if (is_numeric($key)) {
                 throw new Exception('Array root keys must not be numeric.');
             }
diff --git a/app/code/core/Mage/Core/Model/Cache.php b/app/code/core/Mage/Core/Model/Cache.php
index fe97c2c491f..9965019bf1e 100644
--- a/app/code/core/Mage/Core/Model/Cache.php
+++ b/app/code/core/Mage/Core/Model/Cache.php
@@ -625,7 +625,7 @@ public function getInvalidatedTypes()
         $types = $this->_getInvalidatedTypes();
         if ($types) {
             $allTypes = $this->getTypes();
-            foreach ($types as $type => $flag) {
+            foreach (array_keys($types) as $type) {
                 if (isset($allTypes[$type]) && $this->canUse($type)) {
                     $invalidatedTypes[$type] = $allTypes[$type];
                 }
diff --git a/app/code/core/Mage/Core/Model/Layout/Validator.php b/app/code/core/Mage/Core/Model/Layout/Validator.php
index 9bedeaf8621..2d14731992b 100644
--- a/app/code/core/Mage/Core/Model/Layout/Validator.php
+++ b/app/code/core/Mage/Core/Model/Layout/Validator.php
@@ -108,7 +108,7 @@ public function getDisallowedBlocks()
         if (!count($this->_disallowedBlock)) {
             $disallowedBlockConfig = $this->_getDisallowedBlockConfigValue();
             if (is_array($disallowedBlockConfig)) {
-                foreach ($disallowedBlockConfig as $blockName => $value) {
+                foreach (array_keys($disallowedBlockConfig) as $blockName) {
                     $this->_disallowedBlock[] = $blockName;
                 }
             }
diff --git a/app/code/core/Mage/Core/Model/Locale.php b/app/code/core/Mage/Core/Model/Locale.php
index d3b70a7c1cd..2a0c44563c3 100644
--- a/app/code/core/Mage/Core/Model/Locale.php
+++ b/app/code/core/Mage/Core/Model/Locale.php
@@ -247,7 +247,7 @@ protected function _getOptionLocales($translatedName = false)
             }
         }
 
-        foreach ($locales as $code => $active) {
+        foreach (array_keys($locales) as $code) {
             if (strstr($code, '_')) {
                 if (!in_array($code, $allowed)) {
                     continue;
diff --git a/app/code/core/Mage/Core/Model/Log/Adapter.php b/app/code/core/Mage/Core/Model/Log/Adapter.php
index 3bc190114c0..1a173c94d99 100644
--- a/app/code/core/Mage/Core/Model/Log/Adapter.php
+++ b/app/code/core/Mage/Core/Model/Log/Adapter.php
@@ -115,7 +115,7 @@ public function setFilterDataKeys($keys)
     protected function _filterDebugData($debugData)
     {
         if (is_array($debugData) && is_array($this->_debugReplacePrivateDataKeys)) {
-            foreach ($debugData as $key => $value) {
+            foreach (array_keys($debugData) as $key) {
                 if (in_array($key, $this->_debugReplacePrivateDataKeys)) {
                     $debugData[$key] = '****';
                 } else {
diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Url/Rewrite.php
index a9bae5f2912..929f39be12c 100644
--- a/app/code/core/Mage/Core/Model/Url/Rewrite.php
+++ b/app/code/core/Mage/Core/Model/Url/Rewrite.php
@@ -319,7 +319,7 @@ protected function _getQueryString()
             $queryParams = [];
             parse_str($_SERVER['QUERY_STRING'], $queryParams);
             $hasChanges = false;
-            foreach ($queryParams as $key => $value) {
+            foreach (array_keys($queryParams) as $key) {
                 if (substr($key, 0, 3) === '___') {
                     unset($queryParams[$key]);
                     $hasChanges = true;
diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php
index 80bf9ce24de..f6c14bf4b9a 100644
--- a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php
+++ b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php
@@ -306,7 +306,7 @@ protected function _getQueryString()
             $queryParams = [];
             parse_str($_SERVER['QUERY_STRING'], $queryParams);
             $hasChanges = false;
-            foreach ($queryParams as $key => $value) {
+            foreach (array_keys($queryParams) as $key) {
                 if (substr($key, 0, 3) === '___') {
                     unset($queryParams[$key]);
                     $hasChanges = true;
diff --git a/app/code/core/Mage/Customer/Model/Address/Api.php b/app/code/core/Mage/Customer/Model/Address/Api.php
index 63120a58f38..9f779558882 100644
--- a/app/code/core/Mage/Customer/Model/Address/Api.php
+++ b/app/code/core/Mage/Customer/Model/Address/Api.php
@@ -55,7 +55,7 @@ public function items($customerId)
                 $row[$attributeAlias] = $data[$attributeCode] ?? null;
             }
 
-            foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
+            foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
                 if (isset($data[$attributeCode])) {
                     $row[$attributeCode] = $data[$attributeCode];
                 }
@@ -89,7 +89,7 @@ public function create($customerId, $addressData)
 
         $address = Mage::getModel('customer/address');
 
-        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
+        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
             if (isset($addressData[$attributeCode])) {
                 $address->setData($attributeCode, $addressData[$attributeCode]);
             }
@@ -141,7 +141,7 @@ public function info($addressId)
             $result[$attributeAlias] = $address->getData($attributeCode);
         }
 
-        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
+        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
             $result[$attributeCode] = $address->getData($attributeCode);
         }
 
@@ -169,7 +169,7 @@ public function update($addressId, $addressData)
             $this->_fault('not_exists');
         }
 
-        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
+        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
             if (isset($addressData[$attributeCode])) {
                 $address->setData($attributeCode, $addressData[$attributeCode]);
             }
diff --git a/app/code/core/Mage/Customer/Model/Address/Api/V2.php b/app/code/core/Mage/Customer/Model/Address/Api/V2.php
index 8616fec57a1..901b932eef7 100644
--- a/app/code/core/Mage/Customer/Model/Address/Api/V2.php
+++ b/app/code/core/Mage/Customer/Model/Address/Api/V2.php
@@ -40,7 +40,7 @@ public function create($customerId, $addressData)
 
         $address = Mage::getModel('customer/address');
 
-        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
+        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
             if (isset($addressData->$attributeCode)) {
                 $address->setData($attributeCode, $addressData->$attributeCode);
             }
@@ -92,7 +92,7 @@ public function info($addressId)
             $result[$attributeAlias] = $address->getData($attributeCode);
         }
 
-        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
+        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
             $result[$attributeCode] = $address->getData($attributeCode);
         }
 
@@ -120,7 +120,7 @@ public function update($addressId, $addressData)
             $this->_fault('not_exists');
         }
 
-        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
+        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
             if (isset($addressData->$attributeCode)) {
                 $address->setData($attributeCode, $addressData->$attributeCode);
             }
diff --git a/app/code/core/Mage/Customer/Model/Customer/Api.php b/app/code/core/Mage/Customer/Model/Customer/Api.php
index 16853c6c60e..f8daaa27a89 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Api.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Api.php
@@ -87,7 +87,7 @@ public function info($customerId, $attributes = null)
             $result[$attributeAlias] = $customer->getData($attributeCode);
         }
 
-        foreach ($this->getAllowedAttributes($customer, $attributes) as $attributeCode => $attribute) {
+        foreach (array_keys($this->getAllowedAttributes($customer, $attributes)) as $attributeCode) {
             $result[$attributeCode] = $customer->getData($attributeCode);
         }
 
@@ -121,7 +121,7 @@ public function items($filters)
             foreach ($this->_mapAttributes as $attributeAlias => $attributeCode) {
                 $row[$attributeAlias] = $data[$attributeCode] ?? null;
             }
-            foreach ($this->getAllowedAttributes($customer) as $attributeCode => $attribute) {
+            foreach (array_keys($this->getAllowedAttributes($customer)) as $attributeCode) {
                 if (isset($data[$attributeCode])) {
                     $row[$attributeCode] = $data[$attributeCode];
                 }
@@ -149,7 +149,7 @@ public function update($customerId, $customerData)
             $this->_fault('not_exists');
         }
 
-        foreach ($this->getAllowedAttributes($customer) as $attributeCode => $attribute) {
+        foreach (array_keys($this->getAllowedAttributes($customer)) as $attributeCode) {
             if (isset($customerData[$attributeCode])) {
                 $customer->setData($attributeCode, $customerData[$attributeCode]);
             }
diff --git a/app/code/core/Mage/Dataflow/Model/Batch.php b/app/code/core/Mage/Dataflow/Model/Batch.php
index 1f727062e73..1235b8f468f 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch.php
@@ -92,12 +92,12 @@ public function getFieldList()
      */
     public function parseFieldList($row)
     {
-        foreach ($row as $fieldName => $value) {
+        foreach (array_keys($row) as $fieldName) {
             if (!in_array($fieldName, $this->_fieldList)) {
                 $this->_fieldList[$fieldName] = $fieldName;
             }
         }
-        unset($fieldName, $value, $row);
+        unset($fieldName, $row);
     }
 
     /**
diff --git a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
index 1a15c400f15..fdf30b8c5f6 100644
--- a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
+++ b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
@@ -47,7 +47,7 @@ public function parse()
                     $fields = $line;
                     continue;
                 } else {
-                    foreach ($line as $j => $f) {
+                    foreach (array_keys($line) as $j) {
                         $fields[$j] = 'column' . ($j + 1);
                     }
                 }
diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
index 25c93a56c2e..01c39e4c918 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
@@ -1594,7 +1594,7 @@ public function delete($object)
             ];
             $this->_getWriteAdapter()->delete($this->getEntityTable(), $where);
             $this->loadAllAttributes($object);
-            foreach ($this->getAttributesByTable() as $table => $attributes) {
+            foreach (array_keys($this->getAttributesByTable()) as $table) {
                 $this->_getWriteAdapter()->delete($table, $where);
             }
         } catch (Exception $e) {
diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
index 91b578e810a..1ecb2e87b92 100644
--- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
+++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
@@ -790,7 +790,7 @@ protected function _prepareExport()
                 '_custom_option_row_sku', '_custom_option_row_sort'
             ];
 
-            foreach ($this->_storeIdToCode as $storeId => &$storeCode) {
+            foreach (array_keys($this->_storeIdToCode) as &$storeId) {
                 $skip = false;
                 $options = Mage::getResourceModel('catalog/product_option_collection')
                     ->reset()
@@ -961,7 +961,7 @@ protected function _prepareExport()
                         $dataRow = array_merge($dataRow, array_shift($configurableData[$productId]));
                     }
                     if (!empty($rowMultiselects[$productId][$storeId])) {
-                        foreach ($rowMultiselects[$productId][$storeId] as $attrKey => $attrVal) {
+                        foreach (array_keys($rowMultiselects[$productId][$storeId]) as $attrKey) {
                             if (isset($rowMultiselects[$productId][$storeId][$attrKey])) {
                                 $dataRow[$attrKey] = array_shift($rowMultiselects[$productId][$storeId][$attrKey]);
                             }
@@ -1039,7 +1039,7 @@ protected function _prepareExport()
                                 $dataRow = array_merge($dataRow, array_shift($configurableData[$productId]));
                             }
                             if (!empty($rowMultiselects[$productId][$storeId])) {
-                                foreach ($rowMultiselects[$productId][$storeId] as $attrKey => $attrVal) {
+                                foreach (array_keys($rowMultiselects[$productId][$storeId]) as $attrKey) {
                                     if (isset($rowMultiselects[$productId][$storeId][$attrKey])) {
                                         $dataRow[$attrKey] = array_shift($rowMultiselects[$productId][$storeId][$attrKey]);
                                     }
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
index 6c1771b734e..5fc9083546d 100644
--- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
+++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
@@ -547,7 +547,7 @@ public function getEntityTypeCode()
     public function getRowScope(array $rowData)
     {
         $foundOptions = false;
-        foreach ($this->_multiSelectAttributes as $attrCode => $attribute) {
+        foreach (array_keys($this->_multiSelectAttributes) as $attrCode) {
             if ($rowData[$attrCode]) {
                 $foundOptions = true;
             }
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
index 0a4cf80d21e..914c5be124f 100644
--- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
+++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
@@ -1099,7 +1099,7 @@ protected function _saveCustomOptions()
             if ($productIds) { // update product entity table to show that product has options
                 $customOptionsProducts = $customOptions['product_id'];
 
-                foreach ($customOptionsProducts as $key => $value) {
+                foreach (array_keys($customOptionsProducts) as $key) {
                     if (!in_array($key, $productIds)) {
                         unset($customOptionsProducts[$key]);
                     }
diff --git a/app/code/core/Mage/Index/Model/Event.php b/app/code/core/Mage/Index/Model/Event.php
index 2035a5be359..d4dc4468a17 100644
--- a/app/code/core/Mage/Index/Model/Event.php
+++ b/app/code/core/Mage/Index/Model/Event.php
@@ -157,7 +157,7 @@ protected function _mergeNewDataRecursive($previous, $current)
             return $previous;
         }
 
-        foreach ($previous as $key => $value) {
+        foreach (array_keys($previous) as $key) {
             if (array_key_exists($key, $current) && !is_null($current[$key]) && is_array($previous[$key])) {
                 if (!is_string($key) || is_array($current[$key])) {
                     $current[$key] = $this->_mergeNewDataRecursive($previous[$key], $current[$key]);
diff --git a/app/code/core/Mage/Install/Block/Db/Main.php b/app/code/core/Mage/Install/Block/Db/Main.php
index 9f0789c1ea3..25791d2f5f8 100644
--- a/app/code/core/Mage/Install/Block/Db/Main.php
+++ b/app/code/core/Mage/Install/Block/Db/Main.php
@@ -77,7 +77,7 @@ public function getDatabaseBlock($type)
     public function getDatabaseBlocks()
     {
         $databases = [];
-        foreach ($this->_databases as $type => $blockData) {
+        foreach (array_keys($this->_databases) as $type) {
             $databases[] = $this->getDatabaseBlock($type);
         }
         return $databases;
diff --git a/app/code/core/Mage/Install/Model/Installer/Console.php b/app/code/core/Mage/Install/Model/Installer/Console.php
index 033d8db36a4..7c31a5007ab 100644
--- a/app/code/core/Mage/Install/Model/Installer/Console.php
+++ b/app/code/core/Mage/Install/Model/Installer/Console.php
@@ -155,7 +155,7 @@ public function setArgs($args = null)
         /**
          * Set args values
          */
-        foreach ($this->_getOptions() as $name => $option) {
+        foreach (array_keys($this->_getOptions()) as $name) {
             $this->_args[$name] = $args[$name] ?? '';
         }
 
diff --git a/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php b/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php
index 40155d07e4a..33b6de0c2ea 100644
--- a/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php
+++ b/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php
@@ -136,7 +136,7 @@ public function getRequiredExtensions()
     {
         $extensions = [];
         $configExt = (array)Mage::getConfig()->getNode(sprintf('install/databases/%s/extensions', $this->getModel()));
-        foreach ($configExt as $name => $value) {
+        foreach (array_keys($configExt) as $name) {
             $extensions[] = $name;
         }
         return $extensions;
diff --git a/app/code/core/Mage/Page/Block/Template/Links.php b/app/code/core/Mage/Page/Block/Template/Links.php
index b52e2f367eb..aacfd69b27e 100644
--- a/app/code/core/Mage/Page/Block/Template/Links.php
+++ b/app/code/core/Mage/Page/Block/Template/Links.php
@@ -242,7 +242,7 @@ protected function _getNewPosition($position = 0)
             }
         } else {
             $position = 0;
-            foreach ($this->_links as $k => $v) {
+            foreach (array_keys($this->_links) as $k) {
                 $position = $k;
             }
             $position += 10;
diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php
index 5659e2caac3..c32a8b69385 100644
--- a/app/code/core/Mage/Paygate/Model/Authorizenet.php
+++ b/app/code/core/Mage/Paygate/Model/Authorizenet.php
@@ -1475,7 +1475,7 @@ protected function _addTransaction(
             $payment->setTransactionAdditionalInfo($key, $value);
         }
         $transaction = $payment->addTransaction($transactionType, null, false, $message);
-        foreach ($transactionDetails as $key => $value) {
+        foreach (array_keys($transactionDetails) as $key) {
             $payment->unsetData($key);
         }
         $payment->unsLastTransId();
diff --git a/app/code/core/Mage/Payment/Block/Form/Cc.php b/app/code/core/Mage/Payment/Block/Form/Cc.php
index 5435e7f4a75..08a12b4c037 100644
--- a/app/code/core/Mage/Payment/Block/Form/Cc.php
+++ b/app/code/core/Mage/Payment/Block/Form/Cc.php
@@ -47,7 +47,7 @@ public function getCcAvailableTypes()
             $availableTypes = $method->getConfigData('cctypes');
             if ($availableTypes) {
                 $availableTypes = explode(',', $availableTypes);
-                foreach ($types as $code => $name) {
+                foreach (array_keys($types) as $code) {
                     if (!in_array($code, $availableTypes)) {
                         unset($types[$code]);
                     }
diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php
index a7f9071c590..fed881ddeae 100644
--- a/app/code/core/Mage/Payment/Helper/Data.php
+++ b/app/code/core/Mage/Payment/Helper/Data.php
@@ -67,7 +67,7 @@ public function getMethodInstance($code)
     public function getStoreMethods($store = null, $quote = null)
     {
         $res = [];
-        foreach ($this->getPaymentMethods($store) as $code => $methodConfig) {
+        foreach (array_keys($this->getPaymentMethods($store)) as $code) {
             $prefix = self::XML_PATH_PAYMENT_METHODS . '/' . $code . '/';
             if (!$model = Mage::getStoreConfig($prefix . 'model', $store)) {
                 continue;
@@ -166,7 +166,7 @@ public function getBillingAgreementMethods($store = null, $quote = null)
     public function getRecurringProfileMethods($store = null)
     {
         $result = [];
-        foreach ($this->getPaymentMethods($store) as $code => $data) {
+        foreach (array_keys($this->getPaymentMethods($store)) as $code) {
             $paymentMethodModelClassName = $this->getMethodModelClassName($code);
             if (!$paymentMethodModelClassName) {
                 continue;
@@ -244,7 +244,7 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
         }
         if ($asLabelValue) {
             $labelValues = [];
-            foreach ($methods as $code => $title) {
+            foreach (array_keys($methods) as $code) {
                 $labelValues[$code] = [];
             }
             foreach ($methods as $code => $title) {
diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php
index ec75245e7e2..fca1a3d661e 100644
--- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php
+++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php
@@ -58,7 +58,7 @@ protected function _afterSave(Mage_Core_Model_Abstract $object)
                 /** @var Mage_Core_Model_Date $date */
                 $date = Mage::getSingleton('core/date');
 
-                foreach ($rows as $key => $row) {
+                foreach (array_keys($rows) as $key) {
                     /*
                      * Converting dates
                      */
diff --git a/app/code/core/Mage/Reports/Model/Totals.php b/app/code/core/Mage/Reports/Model/Totals.php
index 33f899cc705..6b98422fdee 100644
--- a/app/code/core/Mage/Reports/Model/Totals.php
+++ b/app/code/core/Mage/Reports/Model/Totals.php
@@ -47,7 +47,7 @@ public function countTotals($grid, $from, $to)
             }
             $data = $item->getData();
 
-            foreach ($columns as $field => $a) {
+            foreach (array_keys($columns) as $field) {
                 if ($field !== '') {
                     $columns[$field]['value'] += $data[$field] ?? 0;
                 }
diff --git a/app/code/core/Mage/Rule/Model/Action/Abstract.php b/app/code/core/Mage/Rule/Model/Action/Abstract.php
index a810922d2f7..d8cb87fb7f4 100644
--- a/app/code/core/Mage/Rule/Model/Action/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Action/Abstract.php
@@ -52,11 +52,11 @@ public function __construct()
         parent::__construct();
         $this->loadAttributeOptions()->loadOperatorOptions()->loadValueOptions();
 
-        foreach ($this->getAttributeOption() as $attr => $dummy) {
+        foreach (array_keys($this->getAttributeOption()) as $attr) {
             $this->setAttribute($attr);
             break;
         }
-        foreach ($this->getOperatorOption() as $operator => $dummy) {
+        foreach (array_keys($this->getOperatorOption()) as $operator) {
             $this->setOperator($operator);
             break;
         }
diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
index d2e67c86270..e31fbdda29c 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
@@ -92,13 +92,13 @@ public function __construct()
         $this->loadAttributeOptions()->loadOperatorOptions()->loadValueOptions();
 
         if ($options = $this->getAttributeOptions()) {
-            foreach ($options as $attr => $dummy) {
+            foreach (array_keys($options) as $attr) {
                 $this->setAttribute($attr);
                 break;
             }
         }
         if ($options = $this->getOperatorOptions()) {
-            foreach ($options as $operator => $dummy) {
+            foreach (array_keys($options) as $operator) {
                 $this->setOperator($operator);
                 break;
             }
@@ -503,7 +503,7 @@ public function getTypeElementHtml()
     public function getAttributeElement()
     {
         if (is_null($this->getAttribute())) {
-            foreach ($this->getAttributeOption() as $k => $v) {
+            foreach (array_keys($this->getAttributeOption()) as $k) {
                 $this->setAttribute($k);
                 break;
             }
diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php
index 79d4e693c38..1d9b0093d13 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Combine.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Combine.php
@@ -95,7 +95,7 @@ public function __construct()
 
         $this->loadAggregatorOptions();
         if ($options = $this->getAggregatorOptions()) {
-            foreach ($options as $aggregator => $dummy) {
+            foreach (array_keys($options) as $aggregator) {
                 $this->setAggregator($aggregator);
                 break;
             }
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
index 52bf6a9b347..713bee21bab 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
@@ -125,7 +125,7 @@ protected function _prepareColumns()
     {
         $result = parent::_prepareColumns();
 
-        foreach ($this->_columns as $key => $value) {
+        foreach (array_keys($this->_columns) as $key) {
             if (in_array($key, $this->_columnsToRemove)) {
                 unset($this->_columns[$key]);
             }
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
index 323ce47e00f..a9971351972 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
@@ -230,7 +230,7 @@ protected function _aggregateByField($aggregationField, $from, $to)
             $adapter->query($select->insertFromSelect($this->getMainTable(), array_keys($columns)));
 
             // setup all columns to select SUM() except period, store_id and order_status
-            foreach ($columns as $k => $v) {
+            foreach (array_keys($columns) as $k) {
                 $columns[$k] = new Zend_Db_Expr('SUM(' . $k . ')');
             }
             $columns['period']         = 'period';
diff --git a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
index 1bf6ed99bf1..f2972e84cc9 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
@@ -182,7 +182,7 @@ public function load($printQuery = false, $logQuery = false)
                 ->setWebsiteId(Mage::app()->getStore($storeId)->getWebsiteId())
                 ->setAvgNormalized($v['avgsale'] * $v['num_orders']);
             $this->_items[$storeId] = $storeObject;
-            foreach ($this->_totals as $key => $value) {
+            foreach (array_keys($this->_totals) as $key) {
                 $this->_totals[$key] += $storeObject->getData($key);
             }
         }
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php
index 43d089aa854..9525a968c57 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php
@@ -183,7 +183,7 @@
 $select->from(['e' => $this->getTable('sales_order_entity')]);
 
 $attributeIds = [];
-foreach ($attributes as $code => $params) {
+foreach (array_keys($attributes) as $code) {
     $attributes[$code] = $installer->getAttribute($orderEntityTypeId, $code);
     if ($attributes[$code]['backend_type'] != 'static') {
         $select->joinLeft(
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php
index 3e9e34ea693..69722481f54 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php
@@ -46,7 +46,7 @@
 ");
 
 /* get order_payment attribute codes*/
-foreach ($attributesIds as $attributeCode => $attributeId) {
+foreach (array_keys($attributesIds) as $attributeCode) {
     $attributesIds[$attributeCode] = $connection->fetchOne("
         SELECT attribute_id
         FROM {$this->getTable('eav_attribute')}
diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result.php b/app/code/core/Mage/Shipping/Model/Rate/Result.php
index fa06daacb29..bc7ad148a12 100644
--- a/app/code/core/Mage/Shipping/Model/Rate/Result.php
+++ b/app/code/core/Mage/Shipping/Model/Rate/Result.php
@@ -180,7 +180,7 @@ public function sortRatesByPrice()
 
         natsort($tmp);
 
-        foreach ($tmp as $i => $price) {
+        foreach (array_keys($tmp) as $i) {
             $result[] = $this->_rates[$i];
         }
 
diff --git a/app/code/core/Mage/Tag/Helper/Data.php b/app/code/core/Mage/Tag/Helper/Data.php
index c86d4d5eee1..a2de68080cc 100644
--- a/app/code/core/Mage/Tag/Helper/Data.php
+++ b/app/code/core/Mage/Tag/Helper/Data.php
@@ -73,7 +73,7 @@ public function extractTags($tagNamesInString)
      */
     public function cleanTags(array $tagNamesArr)
     {
-        foreach ($tagNamesArr as $key => $tagName) {
+        foreach (array_keys($tagNamesArr) as $key) {
             $tagNamesArr[$key] = trim($tagNamesArr[$key], '\'');
             $tagNamesArr[$key] = trim($tagNamesArr[$key]);
             if ($tagNamesArr[$key] == '') {
diff --git a/app/code/core/Mage/Tag/controllers/IndexController.php b/app/code/core/Mage/Tag/controllers/IndexController.php
index 54b26c441f7..833837c75b6 100644
--- a/app/code/core/Mage/Tag/controllers/IndexController.php
+++ b/app/code/core/Mage/Tag/controllers/IndexController.php
@@ -99,7 +99,7 @@ protected function _extractTags($tagNamesInString)
      */
     protected function _cleanTags(array $tagNamesArr)
     {
-        foreach ($tagNamesArr as $key => $tagName) {
+        foreach (array_keys($tagNamesArr) as $key) {
             $tagNamesArr[$key] = trim($tagNamesArr[$key], '\'');
             $tagNamesArr[$key] = trim($tagNamesArr[$key]);
             if ($tagNamesArr[$key] == '') {
diff --git a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php
index ed49099010c..f6ed065e028 100644
--- a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -74,7 +74,7 @@ public function afterLoad($object)
     {
         $data = $this->_getResource()->loadProductData($object, $this->getAttribute());
 
-        foreach ($data as $i => $row) {
+        foreach (array_keys($data) as $i) {
             if ($data[$i]['website_id'] == 0) {
                 $rate = Mage::app()->getStore()->getBaseCurrency()->getRate(Mage::app()->getBaseCurrencyCode());
                 if ($rate) {
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/Edit/AttributeForm.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/Edit/AttributeForm.php
index 9683e4322cd..1344cfc1a92 100644
--- a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/Edit/AttributeForm.php
+++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/Edit/AttributeForm.php
@@ -45,7 +45,7 @@ public function getData(FixtureInterface $fixture = null, Element $element = nul
     {
         $data = [];
         if ($fixture === null) {
-            foreach ($this->tabs as $tabName => $tab) {
+            foreach (array_keys($this->tabs) as $tabName) {
                 $this->openTab($tabName);
                 $tabData = $this->getTabElement($tabName)->getDataFormTab();
                 $data = array_merge($data, $tabData);
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Edit/Tab/Prices.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Edit/Tab/Prices.php
index 3346dcc17a8..657f84a8239 100644
--- a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Edit/Tab/Prices.php
+++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Edit/Tab/Prices.php
@@ -54,7 +54,7 @@ class Prices extends Tab
     public function fillFormTab(array $fields, Element $element = null)
     {
         $context = $element ? $element : $this->_rootElement;
-        foreach ($this->childrenForm as $key => $value) {
+        foreach (array_keys($this->childrenForm) as $key) {
             if (isset($fields[$key])) {
                 $this->fillOptionsPrices([$key => $fields[$key]], $context);
                 unset($fields[$key]);
@@ -91,7 +91,7 @@ public function getDataFormTab($fields = null, Element $element = null)
     {
         $result = [];
         $context = $element ? $element : $this->_rootElement;
-        foreach ($this->childrenForm as $key => $value) {
+        foreach (array_keys($this->childrenForm) as $key) {
             if (isset($fields[$key])) {
                 $result[$key] = $this->getOptionsPrices([$key => $fields[$key]], $context);
                 unset($fields[$key]);
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/ProductForm.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/ProductForm.php
index 584a8f25fbc..565b823b7c5 100644
--- a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/ProductForm.php
@@ -341,7 +341,7 @@ public function getRequireNoticeAttributes(FixtureInterface $product)
     {
         $data = [];
         $tabs = $this->getFieldsByTabs($product);
-        foreach ($tabs as $tabName => $fields) {
+        foreach (array_keys($tabs) as $tabName) {
             $tab = $this->getTabElement($tabName);
             $this->openTab($tabName);
             $errors = $tab->getRequireNoticeMessages();
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php
index 8d9596cda76..a0c24f0c42d 100644
--- a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php
+++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php
@@ -135,7 +135,7 @@ protected function fillTabs(array $tabs, Element $element = null)
      */
     protected function fillMissedFields()
     {
-        foreach ($this->tabs as $tabName => $tabData) {
+        foreach (array_keys($this->tabs) as $tabName) {
             $tabElement = $this->getTabElement($tabName);
             if ($this->openTab($tabName)) {
                 $mapping = $tabElement->dataMapping($this->unassignedFields);
@@ -174,7 +174,7 @@ public function getData(FixtureInterface $fixture = null, Element $element = nul
         $data = [];
 
         if (null === $fixture) {
-            foreach ($this->tabs as $tabName => $tab) {
+            foreach (array_keys($this->tabs) as $tabName) {
                 $this->openTab($tabName);
                 $tabData = $this->getTabElement($tabName)->getDataFormTab();
                 $data = array_merge($data, $tabData);
diff --git a/dev/tests/functional/tests/app/Mage/Bundle/Test/Handler/Curl.php b/dev/tests/functional/tests/app/Mage/Bundle/Test/Handler/Curl.php
index e4777d9f973..eb79bfc90ef 100644
--- a/dev/tests/functional/tests/app/Mage/Bundle/Test/Handler/Curl.php
+++ b/dev/tests/functional/tests/app/Mage/Bundle/Test/Handler/Curl.php
@@ -146,7 +146,7 @@ protected function prepareBundleSelections(array $bundleData)
      */
     protected function prepareItemSelectionData(array $selections, array $products)
     {
-        foreach ($selections as $key => $selection) {
+        foreach (array_keys($selections) as $key) {
             $selections[$key]['product_id'] = $products[$key]->getId();
             unset($selections[$key]['sku']);
             $selections[$key]['delete'] = '';
@@ -163,7 +163,7 @@ protected function prepareItemSelectionData(array $selections, array $products)
      */
     protected function prepareBundleOptions(array $bundleData)
     {
-        foreach ($bundleData as $key => $option) {
+        foreach (array_keys($bundleData) as $key) {
             $bundleData[$key] = array_intersect_key($bundleData[$key], array_flip($this->optionsFields));
             $bundleData[$key]['delete'] = '';
         }
diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/TestStep/UpdateConfigurableProductStep/DeleteOptionsSubStep.php b/dev/tests/functional/tests/app/Mage/Catalog/Test/TestStep/UpdateConfigurableProductStep/DeleteOptionsSubStep.php
index 6b18d2b8ea3..16d05ab359c 100644
--- a/dev/tests/functional/tests/app/Mage/Catalog/Test/TestStep/UpdateConfigurableProductStep/DeleteOptionsSubStep.php
+++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/TestStep/UpdateConfigurableProductStep/DeleteOptionsSubStep.php
@@ -86,7 +86,7 @@ protected function searchKeysForOption($optionIndex)
     {
         $keys = [];
         $originalProductAssignedProducts = $this->getOriginalProductAssignedProducts();
-        foreach ($originalProductAssignedProducts as $key => $product) {
+        foreach (array_keys($originalProductAssignedProducts) as $key) {
             if (strpos($key, 'option_key_' . $optionIndex) !== false) {
                 $keys[] = $key;
             }
diff --git a/dev/tests/functional/tests/app/Mage/Customer/Test/Handler/Customer/Curl.php b/dev/tests/functional/tests/app/Mage/Customer/Test/Handler/Customer/Curl.php
index 68f2f85b69a..23d27ff801b 100644
--- a/dev/tests/functional/tests/app/Mage/Customer/Test/Handler/Customer/Curl.php
+++ b/dev/tests/functional/tests/app/Mage/Customer/Test/Handler/Customer/Curl.php
@@ -131,7 +131,7 @@ public function persist(FixtureInterface $customer = null)
      */
     protected function checkForUpdateData(array $data)
     {
-        foreach ($data as $key => $field) {
+        foreach (array_keys($data) as $key) {
             if (in_array($key, $this->updatingFields)) {
                 return true;
             }
diff --git a/dev/tests/functional/tests/app/Mage/Weee/Test/Constraint/AssertFptApplied.php b/dev/tests/functional/tests/app/Mage/Weee/Test/Constraint/AssertFptApplied.php
index c1b61df6d23..baf99e0e016 100644
--- a/dev/tests/functional/tests/app/Mage/Weee/Test/Constraint/AssertFptApplied.php
+++ b/dev/tests/functional/tests/app/Mage/Weee/Test/Constraint/AssertFptApplied.php
@@ -145,7 +145,7 @@ protected function clearShoppingCart()
     protected function getPrices()
     {
         $actualPrices = [];
-        foreach ($this->expectedPrices as $priceType => $prices) {
+        foreach (array_keys($this->expectedPrices) as $priceType) {
             $actualPrices[$priceType] = $this->{'get' . ucfirst($priceType) . 'Price'}();
         }
 
diff --git a/lib/Varien/Convert/Parser/Csv.php b/lib/Varien/Convert/Parser/Csv.php
index f857c3b85a8..4550d155691 100644
--- a/lib/Varien/Convert/Parser/Csv.php
+++ b/lib/Varien/Convert/Parser/Csv.php
@@ -44,7 +44,7 @@ public function parse()
                     $fields = $line;
                     continue;
                 } else {
-                    foreach ($line as $j => $f) {
+                    foreach (array_keys($line) as $j) {
                         $fields[$j] = 'column' . ($j + 1);
                     }
                 }
@@ -87,7 +87,7 @@ public function parseTest()
                     $fields = $line;
                     continue;
                 } else {
-                    foreach ($line as $j => $f) {
+                    foreach (array_keys($line) as $j) {
                         $fields[$j] = 'column' . ($j + 1);
                     }
                 }
diff --git a/lib/Varien/Db/Statement/Pdo/Mysql.php b/lib/Varien/Db/Statement/Pdo/Mysql.php
index b23cb8435fa..d5f83882237 100644
--- a/lib/Varien/Db/Statement/Pdo/Mysql.php
+++ b/lib/Varien/Db/Statement/Pdo/Mysql.php
@@ -33,7 +33,7 @@ public function _executeWithBinding(array $params)
     {
         // Check whether we deal with named bind
         $isPositionalBind = true;
-        foreach ($params as $k => $v) {
+        foreach (array_keys($params) as $k) {
             if (!is_int($k)) {
                 $isPositionalBind = false;
                 break;
diff --git a/lib/Varien/Http/Adapter/Curl.php b/lib/Varien/Http/Adapter/Curl.php
index 56e9359a23f..1e9fd81f16b 100644
--- a/lib/Varien/Http/Adapter/Curl.php
+++ b/lib/Varien/Http/Adapter/Curl.php
@@ -75,7 +75,7 @@ protected function _applyConfig()
         $verifyHost = isset($this->_config['verifyhost']) ? $this->_config['verifyhost'] : 0;
         curl_setopt($this->_getResource(), CURLOPT_SSL_VERIFYHOST, $verifyHost);
 
-        foreach ($this->_config as $param => $curlOption) {
+        foreach (array_keys($this->_config) as $param) {
             if (array_key_exists($param, $this->_allowedParams)) {
                 curl_setopt($this->_getResource(), $this->_allowedParams[$param], $this->_config[$param]);
             }
diff --git a/lib/Varien/Object.php b/lib/Varien/Object.php
index bfd0f11bcff..968d5b0fc02 100644
--- a/lib/Varien/Object.php
+++ b/lib/Varien/Object.php
@@ -292,7 +292,7 @@ public function unsetData($key = null)
     public function unsetOldData($key = null)
     {
         if (is_null($key)) {
-            foreach ($this->_oldFieldsMap as $key => $newFieldName) {
+            foreach (array_keys($this->_oldFieldsMap) as $key) {
                 unset($this->_data[$key]);
             }
         } else {
diff --git a/lib/Varien/Object/Cache.php b/lib/Varien/Object/Cache.php
index 11b6cc23775..24047b87356 100644
--- a/lib/Varien/Object/Cache.php
+++ b/lib/Varien/Object/Cache.php
@@ -241,7 +241,7 @@ public function delete($idx)
         }
 
         if (isset($this->_objectReferences[$idx])) {
-            foreach ($this->_references as $r => $dummy) {
+            foreach (array_keys($this->_references) as $r) {
                 unset($this->_references[$r]);
             }
             unset($this->_objectReferences[$idx]);
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

From abb52796891032bc91052c8797cf0c67fda35ef6 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 2 Aug 2024 22:56:54 +0200
Subject: [PATCH 02/79] Updated test

---
 dev/tests/unit/Mage/Uploader/Helper/FileTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/tests/unit/Mage/Uploader/Helper/FileTest.php b/dev/tests/unit/Mage/Uploader/Helper/FileTest.php
index 72db51d7ec1..660ed9cb89f 100644
--- a/dev/tests/unit/Mage/Uploader/Helper/FileTest.php
+++ b/dev/tests/unit/Mage/Uploader/Helper/FileTest.php
@@ -30,7 +30,7 @@ public function setUp(): void
      */
     public function testGetMimeTypeFromExtensionList(array $expectedResult, $extensionsList): void
     {
-        self::assertSame($expectedResult, $this->subject->getMimeTypeFromExtensionList($extensionsList));
+        $this->assertSame($expectedResult, $this->subject->getMimeTypeFromExtensionList($extensionsList));
     }
 
     /**
@@ -68,12 +68,12 @@ public function provideGetMimeTypeFromExtensionListData(): array
 
     public function testGetPostMaxSize(): void
     {
-        self::assertIsString($this->subject->getPostMaxSize());
+        $this->assertIsString($this->subject->getPostMaxSize());
     }
 
     public function testGetUploadMaxSize(): void
     {
-        self::assertIsString($this->subject->getUploadMaxSize());
+        $this->assertIsString($this->subject->getUploadMaxSize());
     }
 
     public function testGetDataMaxSize(): void
@@ -84,7 +84,7 @@ public function testGetDataMaxSize(): void
 
         $mock->expects($this->once())->method('getPostMaxSize')->willReturn('1G');
         $mock->expects($this->once())->method('getUploadMaxSize')->willReturn('1M');
-        self::assertSame('1M', $mock->getDataMaxSize());
+        $this->assertSame('1M', $mock->getDataMaxSize());
     }
 
     /**
@@ -100,7 +100,7 @@ public function testGetDataMaxSizeInBytes(int $expectedResult, string $maxSize):
             ->getMock();
 
         $mock->expects($this->once())->method('getDataMaxSize')->willReturn($maxSize);
-        self::assertSame($expectedResult, $mock->getDataMaxSizeInBytes());
+        $this->assertSame($expectedResult, $mock->getDataMaxSizeInBytes());
     }
 
     /**

From 6aac86bea34ccff5ef19947b68921bc923778470 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 2 Aug 2024 22:57:35 +0200
Subject: [PATCH 03/79] Added test

---
 .../Mage/Downloadable/Helper/FileTest.php     | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 dev/tests/unit/Mage/Downloadable/Helper/FileTest.php

diff --git a/dev/tests/unit/Mage/Downloadable/Helper/FileTest.php b/dev/tests/unit/Mage/Downloadable/Helper/FileTest.php
new file mode 100644
index 00000000000..7b744965797
--- /dev/null
+++ b/dev/tests/unit/Mage/Downloadable/Helper/FileTest.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Downloadable\Helper;
+
+use Mage;
+use Mage_Downloadable_Helper_File;
+use PHPUnit\Framework\TestCase;
+
+class FileTest extends TestCase
+{
+    /**
+     * @var Mage_Downloadable_Helper_File
+     */
+    public Mage_Downloadable_Helper_File $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('downloadable/file');
+    }
+
+    /**
+     * @dataProvider provideGetFilePathData
+     * @param string $expectedResult
+     * @param string $path
+     * @param string|null $file
+     * @return void
+     */
+    public function testGetFilePath(string $expectedResult, string $path, ?string $file): void
+    {
+        $result = $this->subject->getFilePath($path, $file);
+        $this->assertSame($expectedResult, $result);
+    }
+
+    /**
+     * @return array<string, array<int, string|null>>
+     */
+    public function provideGetFilePathData(): array
+    {
+        return [
+            'strings path and strings file' => [
+                'path' . DS . 'file',
+                'path',
+                'file'
+            ],
+            'strings path and strings file with slash' => [
+                'path' . DS . 'file',
+                'path',
+                '/file'
+            ],
+            'string path and null file' => [
+                'path' . DS,
+                'path',
+                null
+            ],
+            'string path and empty file' => [
+                'path' . DS,
+                'path',
+                ''
+            ],
+            'strings path and strings file named 0' => [
+                'path' . DS . '0',
+                'path',
+                '0'
+            ],
+        ];
+    }
+}

From 09ee18a1da6c2eed23f0a28578088f2ff79127d7 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 2 Aug 2024 23:10:47 +0200
Subject: [PATCH 04/79] Added test

---
 dev/tests/unit/Varien/ObjectTest.php | 237 +++++++++++++++++++++++++++
 1 file changed, 237 insertions(+)
 create mode 100644 dev/tests/unit/Varien/ObjectTest.php

diff --git a/dev/tests/unit/Varien/ObjectTest.php b/dev/tests/unit/Varien/ObjectTest.php
new file mode 100644
index 00000000000..92bb6bbfeb7
--- /dev/null
+++ b/dev/tests/unit/Varien/ObjectTest.php
@@ -0,0 +1,237 @@
+<?php
+
+declare(strict_types=1);
+
+namespace unit\Varien;
+
+use PHPUnit\Framework\TestCase;
+use stdClass;
+use Varien_Exception;
+use Varien_Object;
+
+class ObjectTest extends TestCase
+{
+    /**
+     * @var Varien_Object
+     */
+    public Varien_Object $subject;
+
+    public function setUp(): void
+    {
+        $this->subject = new Varien_Object();
+    }
+
+    /**
+     * @dataProvider provideGetDataData
+     * @param mixed $expectedResult
+     * @param string $setKey
+     * @param mixed $setValue
+     * @param string $key
+     * @param string|int|null $index
+     * @return void
+     */
+    public function testGetData($expectedResult, $setKey, $setValue, string $key, $index = null): void
+    {
+        $this->subject->setData($setKey, $setValue);
+        $this->assertEquals($expectedResult, $this->subject->getData($key, $index));
+    }
+
+    /**
+     * @return array<string, array<int, array<int|string, array<int|string, int|string>|int|string>|int|stdClass|string|Varien_Object|null>>
+     */
+    public function provideGetDataData(): array
+    {
+        return [
+            'empty_key' => [
+                ['empty_key' => ['empty_value']],
+                'empty_key',
+                ['empty_value'],
+                ''
+            ],
+            'string' => [
+                'value',
+                'string',
+                'value',
+                'string'
+            ],
+            'int' => [
+                1,
+                'int',
+                1,
+                'int'
+            ],
+            'numeric' => [
+                '1',
+                'numeric',
+                '1',
+                'numeric'
+            ],
+            'array' => [
+                ['string', 1],
+                'array',
+                ['string', 1],
+                'array',
+            ],
+            'array_index_int' => [
+                'string',
+                'array_index_int',
+                ['string', 1],
+                'array_index_int',
+                0,
+            ],
+            'array_index_int_invalid' => [
+                null,
+                'array_index_int_invalid',
+                ['string', 1],
+                'array_index_int_invalid',
+                999,
+            ],
+            'array_index_string' => [
+                1,
+                'array_index_string',
+                ['string' => 'string', 'int' => 1],
+                'array_index_string',
+                'int',
+            ],
+            'array_index_string_string' => [
+                null,
+                'array_index_string_string',
+                'some_string',
+                'array_index_string_string',
+                'not-exists',
+            ],
+            'array_index_string_varien_object' => [
+                [],
+                'array_index_string_varien_object',
+                new Varien_Object(['array' => []]),
+                'array_index_string_varien_object',
+                'array',
+            ],
+             'array_index_string_std_class' => [
+                null,
+                'array_index_string_std_class',
+                new stdClass(),
+                'array_index_string_std_class',
+                'not-exists',
+            ],
+            'array_nested' => [
+                1,
+                'array_nested',
+                ['nested' => ['string' => 'string', 'int' => 1]],
+                'array_nested/nested/int',
+            ],
+            'array_nested_invalid_key' => [
+                null,
+                'array_nested',
+                ['nested' => ['string' => 'string', 'int' => 1]],
+                'array_nested/nested/invalid_key',
+            ],
+            'array_nested_empty_key' => [
+                null,
+                'array_nested',
+                ['nested' => ['string' => 'string', 'int' => '']],
+                'array_nested/nested/',
+            ],
+            'array_nested_string' => [
+                'some"\n"string',
+                'array_nested_string',
+                ['nested' => 'some"\n"string'],
+                'array_nested_string/nested',
+            ],
+             'array_nested_varien_object' => [
+                null,
+                'array_nested_varien_object',
+                new Varien_Object(),
+                'array_nested_varien_object/nested',
+            ],
+            'array_nested_std_class' => [
+                null,
+                'array_nested_std_class',
+                new stdClass(),
+                'array_nested_std_class/nested',
+            ],
+            'array_nested_key_not_exists' => [
+                null,
+                'array_nested_key_not_exists',
+                ['nested' => ['string' => 'string', 'int' => 1]],
+                'array_nested_key_not_exists_test/nested/int',
+            ],
+        ];
+    }
+
+    public function testToString(): void
+    {
+        $this->subject->setString1('open');
+        $this->subject->setString2('mage');
+        $this->assertSame('open, mage', $this->subject->toString());
+        $this->assertSame('openmage', $this->subject->toString('{{string1}}{{string2}}'));
+        $this->assertSame('open', $this->subject->toString('{{string1}}{{string_not_exists}}'));
+    }
+
+    public function testGetSetUnsData(): void
+    {
+        $this->assertTrue($this->subject->isEmpty());
+        $this->subject->setABC('abc');
+        $this->subject->setData('efg', 'efg');
+        $this->subject->set123('123');
+        $this->subject->setData('345', '345');
+        $this->subject->setKeyAFirst('value_a_first');
+        $this->subject->setData('key_a_2nd', 'value_a_2nd');
+        $this->subject->setKeyA3rd('value_a_3rd');
+        $this->subject->setData('left', 'over');
+        $this->assertFalse($this->subject->isEmpty());
+
+        $this->assertSame('abc', $this->subject->getData('a_b_c'));
+        $this->assertSame('abc', $this->subject->getABC());
+        $this->subject->unsetData('a_b_c');
+
+        $this->assertSame('efg', $this->subject->getData('efg'));
+        $this->assertSame('efg', $this->subject->getEfg());
+        $this->subject->unsEfg();
+
+        $this->assertSame('123', $this->subject->getData('123'));
+        $this->assertSame('123', $this->subject->get123());
+        $this->subject->uns123();
+
+        $this->subject->unsetData('345');
+
+        $this->assertSame('value_a_first', $this->subject->getData('key_a_first'));
+        $this->assertSame('value_a_first', $this->subject->getKeyAFirst());
+        $this->subject->unsetData('key_a_first');
+
+        $this->assertSame('value_a_2nd', $this->subject->getData('key_a_2nd'));
+        $this->assertSame('value_a_2nd', $this->subject->getKeyA_2nd());
+        $this->subject->unsetData('key_a_2nd');
+
+        $this->assertSame('value_a_3rd', $this->subject->getData('key_a3rd'));
+        $this->assertSame('value_a_3rd', $this->subject->getKeyA3rd());
+        $this->subject->unsetData('key_a3rd');
+
+        $this->assertSame(['left' => 'over'], $this->subject->getData());
+
+        $this->subject->unsetData();
+        $this->assertSame([], $this->subject->getData());
+        $this->assertTrue($this->subject->isEmpty());
+
+        try {
+            /** @phpstan-ignore-next-line */
+            $this->subject->notData();
+            $this->fail('Invalid __call');
+        } catch (Varien_Exception $exception) {
+            $this->assertStringStartsWith('Invalid method', $exception->getMessage());
+        }
+    }
+
+    public function testOffset(): void
+    {
+        $this->assertFalse($this->subject->offsetExists('off'));
+
+        $this->subject->offsetSet('off', 'set');
+        $this->assertTrue($this->subject->offsetExists('off'));
+        $this->assertSame('set', $this->subject->offsetGet('off'));
+        $this->assertSame(null, $this->subject->offsetGet('not-exists'));
+
+        $this->subject->offsetUnset('off');
+        $this->assertFalse($this->subject->offsetExists('off'));
+    }
+}

From 40559cf13fda3d00167b67fa9840188c75757c4a Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 2 Aug 2024 23:14:41 +0200
Subject: [PATCH 05/79] Renamed and updated test

---
 dev/tests/unit/Mage/Core/Helper/Security.php  |  97 -------------
 .../unit/Mage/Core/Helper/SecurityTest.php    | 131 ++++++++++++++++++
 2 files changed, 131 insertions(+), 97 deletions(-)
 delete mode 100644 dev/tests/unit/Mage/Core/Helper/Security.php
 create mode 100644 dev/tests/unit/Mage/Core/Helper/SecurityTest.php

diff --git a/dev/tests/unit/Mage/Core/Helper/Security.php b/dev/tests/unit/Mage/Core/Helper/Security.php
deleted file mode 100644
index f0b11f593e6..00000000000
--- a/dev/tests/unit/Mage/Core/Helper/Security.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace OpenMage\Tests\Unit\Core\Helper;
-
-use PHPUnit\Framework\TestCase;
-
-class Security extends TestCase
-{
-
-    public function validateAgainstBlockMethodBlacklistDataProvider()
-    {
-        $topmenu = new \Mage_Page_Block_Html_Topmenu_Renderer();
-        $template = new \Mage_Core_Block_Template();
-
-        return [
-            [
-                $topmenu,
-                'setData',
-                []
-            ],
-            [
-                $template,
-                'setData',
-                []
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider validateAgainstBlockMethodBlacklistDataProvider
-     * @doesNotPerformAssertions if data is correct, then NO exception is thrown, so we don't need an assertion
-     * @return void
-     */
-    public function testValidateAgainstBlockMethodBlacklist($block, $method, $args)
-    {
-        $securityHelper = new \Mage_Core_Helper_Security();
-        $securityHelper->validateAgainstBlockMethodBlacklist($block, $method, $args);
-    }
-
-
-    public function forbiddenBlockMethodsDataProvider()
-    {
-        $topmenu = new \Mage_Page_Block_Html_Topmenu_Renderer();
-        $template = new \Mage_Core_Block_Template();
-
-        return [
-            [
-                $template,
-                'fetchView',
-                []
-            ],
-            [
-                $topmenu,
-                'fetchView',
-                []
-            ],
-            [
-                $topmenu,
-                'render',
-                []
-            ],
-            [
-                $template,
-                'Mage_Core_Block_Template::fetchView',
-                []
-            ],
-            [
-                $topmenu,
-                'Mage_Page_Block_Html_Topmenu_Renderer::fetchView',
-                []
-            ],
-            'parent class name is passed as second arg' => [
-                $topmenu,
-                'Mage_Core_Block_Template::fetchView',
-                []
-            ],
-            'parent class name is passed as second arg2' => [
-                $topmenu,
-                'Mage_Core_Block_Template::render',
-                []
-            ],
-        ];
-    }
-
-    /**
-     * @dataProvider forbiddenBlockMethodsDataProvider
-     * @return void
-     */
-    public function testValidateAgainstBlockMethodBlacklistThrowsException($block, $method, $args)
-    {
-        $this->expectExceptionMessage(\sprintf('Action with combination block %s and method %s is forbidden.', get_class($block), $method));
-
-        $securityHelper = new \Mage_Core_Helper_Security();
-        $securityHelper->validateAgainstBlockMethodBlacklist($block, $method, $args);
-    }
-}
\ No newline at end of file
diff --git a/dev/tests/unit/Mage/Core/Helper/SecurityTest.php b/dev/tests/unit/Mage/Core/Helper/SecurityTest.php
new file mode 100644
index 00000000000..645d79ed758
--- /dev/null
+++ b/dev/tests/unit/Mage/Core/Helper/SecurityTest.php
@@ -0,0 +1,131 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Helper;
+
+use Mage;
+use Mage_Core_Block_Abstract;
+use Mage_Core_Block_Template;
+use Mage_Core_Exception;
+use Mage_Core_Helper_Security;
+use Mage_Page_Block_Html_Topmenu_Renderer;
+use PHPUnit\Framework\TestCase;
+use function sprintf;
+
+class SecurityTest extends TestCase
+{
+    /**
+     * @var Mage_Core_Helper_Security
+     */
+    public Mage_Core_Helper_Security $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('core/security');
+    }
+
+    /**
+     * @return array<int|string, array<int, array<empty, empty>|Mage_Page_Block_Html_Topmenu_Renderer|Mage_Core_Block_Template|string>>
+     */
+    public function validateAgainstBlockMethodBlacklistDataProvider(): array
+    {
+        $topmenu = new Mage_Page_Block_Html_Topmenu_Renderer();
+        $template = new Mage_Core_Block_Template();
+
+        return [
+            [
+                $topmenu,
+                'setData',
+                []
+            ],
+            [
+                $template,
+                'setData',
+                []
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider validateAgainstBlockMethodBlacklistDataProvider
+     * @doesNotPerformAssertions if data is correct, then NO exception is thrown, so we don't need an assertion
+     * @param Mage_Core_Block_Abstract $block
+     * @param string $method
+     * @param string[] $args
+     * @return void
+     * @throws Mage_Core_Exception
+     */
+    public function testValidateAgainstBlockMethodBlacklist(
+        Mage_Core_Block_Abstract $block,
+        string $method,
+        array $args
+    ): void {
+        $this->subject->validateAgainstBlockMethodBlacklist($block, $method, $args);
+    }
+
+    /**
+     * @return array<int|string, array<int, array<empty, empty>|Mage_Page_Block_Html_Topmenu_Renderer|Mage_Core_Block_Template|string>>
+     */
+    public function forbiddenBlockMethodsDataProvider(): array
+    {
+        $topmenu = new Mage_Page_Block_Html_Topmenu_Renderer();
+        $template = new Mage_Core_Block_Template();
+
+        return [
+            [
+                $template,
+                'fetchView',
+                []
+            ],
+            [
+                $topmenu,
+                'fetchView',
+                []
+            ],
+            [
+                $topmenu,
+                'render',
+                []
+            ],
+            [
+                $template,
+                'Mage_Core_Block_Template::fetchView',
+                []
+            ],
+            [
+                $topmenu,
+                'Mage_Page_Block_Html_Topmenu_Renderer::fetchView',
+                []
+            ],
+            'parent class name is passed as second arg' => [
+                $topmenu,
+                'Mage_Core_Block_Template::fetchView',
+                []
+            ],
+            'parent class name is passed as second arg2' => [
+                $topmenu,
+                'Mage_Core_Block_Template::render',
+                []
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider forbiddenBlockMethodsDataProvider
+     * @param Mage_Core_Block_Abstract $block
+     * @param string $method
+     * @param string[] $args
+     * @return void
+     * @throws Mage_Core_Exception
+     */
+    public function testValidateAgainstBlockMethodBlacklistThrowsException(
+        Mage_Core_Block_Abstract $block,
+        string $method,
+        array $args
+    ): void {
+        $this->expectExceptionMessage(sprintf('Action with combination block %s and method %s is forbidden.', get_class($block), $method));
+        $this->subject->validateAgainstBlockMethodBlacklist($block, $method, $args);
+    }
+}

From 18f190345f86c6ed196792f0286ced392757b252 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 2 Aug 2024 23:17:28 +0200
Subject: [PATCH 06/79] Updated test

---
 dev/tests/unit/Base/ClassLoadingTest.php | 33 +++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/dev/tests/unit/Base/ClassLoadingTest.php b/dev/tests/unit/Base/ClassLoadingTest.php
index 345f8ec7ff0..0ece8a5a31d 100644
--- a/dev/tests/unit/Base/ClassLoadingTest.php
+++ b/dev/tests/unit/Base/ClassLoadingTest.php
@@ -1,5 +1,6 @@
 <?php
 
+declare(strict_types=1);
 
 namespace OpenMage\Tests\Unit\Base;
 
@@ -7,15 +8,35 @@
 
 class ClassLoadingTest extends TestCase
 {
-
-    public function testClassExists()
+    /**
+     * @dataProvider provideClassExistsData
+     * @param bool $expectedResult
+     * @param string $class
+     * @return void
+     */
+    public function testClassExists(bool $expectedResult, string $class): void
     {
-        $this->assertTrue(class_exists('Mage'));
-        $this->assertTrue(class_exists('Mage_Eav_Model_Entity_Increment_Numeric'));
+        $this->assertSame($expectedResult, class_exists($class));
     }
 
-    public function testClassDoesNotExists()
+    /**
+     * @return array<string, array<int, bool|string>>
+     */
+    public function provideClassExistsData(): array
     {
-        $this->assertFalse(class_exists('Mage_Non_Existent'));
+        return [
+            'class exists #1' => [
+                true,
+                'Mage'
+            ],
+            'class exists #2' => [
+                true,
+                'Mage_Eav_Model_Entity_Increment_Numeric'
+            ],
+            'class not exists' => [
+                false,
+                'Mage_Non_Existent'
+            ],
+        ];
     }
 }

From cf4340d422b7f16dc40b6cf370f1fcac4be68540 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 2 Aug 2024 23:23:49 +0200
Subject: [PATCH 07/79] Updated test

---
 .../unit/Mage/Core/Helper/StringTest.php      | 50 ++++++++-----------
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/dev/tests/unit/Mage/Core/Helper/StringTest.php b/dev/tests/unit/Mage/Core/Helper/StringTest.php
index 72148df7079..b52395e9cac 100644
--- a/dev/tests/unit/Mage/Core/Helper/StringTest.php
+++ b/dev/tests/unit/Mage/Core/Helper/StringTest.php
@@ -1,50 +1,42 @@
 <?php
+
 declare(strict_types=1);
 
 namespace OpenMage\Tests\Unit\Mage\Core\Helper;
 
+use Mage;
 use Mage_Core_Helper_String;
 use PHPUnit\Framework\TestCase;
 
 class StringTest extends TestCase
 {
-    const TEST_STRING_1 = 'Test 12345 a lot more Text';
+    public const TEST_STRING = '1234567890';
+
+    /**
+     * @var Mage_Core_Helper_String
+     */
+    public Mage_Core_Helper_String $subject;
 
-    public function testSubstr()
+    public function setUp(): void
     {
-        $subject = new Mage_Core_Helper_String();
-        $resultString = $subject->substr(
-            self::TEST_STRING_1,
-            5,
-            5
-        );
-        $this->assertEquals(
-            '12345',
-            $resultString
-        );
+        Mage::app();
+        $this->subject = Mage::helper('core/string');
     }
 
-    public function testTruncate()
+    public function testSubstr(): void
     {
-        $subject = new Mage_Core_Helper_String();
-        $resultString = $subject->truncate(
-            self::TEST_STRING_1,
-            13,
-            '###'
-        );
-        $this->assertEquals(
-            'Test 12345###',
-            $resultString
-        );
+        $resultString = $this->subject->substr(self::TEST_STRING, 2, 2);
+        $this->assertEquals('34', $resultString);
+    }
 
+    public function testTruncate(): void
+    {
+        $resultString = $this->subject->truncate(self::TEST_STRING, 5, '...');
+        $this->assertEquals('12...', $resultString);
     }
 
-    public function testStrlen()
+    public function testStrlen(): void
     {
-        $subject = new Mage_Core_Helper_String();
-        $this->assertEquals(
-            26,
-            $subject->strlen(self::TEST_STRING_1)
-        );
+        $this->assertEquals(10, $this->subject->strlen(self::TEST_STRING));
     }
 }

From 656044b4fea92d917f9e4b6242429d68febe9fea Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 2 Aug 2024 23:24:03 +0200
Subject: [PATCH 08/79] Updated test

---
 dev/tests/unit/Base/XmlFileLoadingTest.php | 49 ++++++++++++----------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/dev/tests/unit/Base/XmlFileLoadingTest.php b/dev/tests/unit/Base/XmlFileLoadingTest.php
index 0f8b6b50fd4..99bc89f6f5f 100644
--- a/dev/tests/unit/Base/XmlFileLoadingTest.php
+++ b/dev/tests/unit/Base/XmlFileLoadingTest.php
@@ -1,37 +1,27 @@
 <?php
+
 declare(strict_types=1);
 
 namespace OpenMage\Tests\Unit\Base;
 
 use PHPUnit\Framework\TestCase;
+use SimpleXMLElement;
+use XMLReader;
 
-class XmlFileLoadingTest  extends TestCase
+class XmlFileLoadingTest extends TestCase
 {
-
-    public function provideXmlFiles(): array
-    {
-        $root = realpath(__DIR__ . '/../../../../') . '/';
-
-        $result = [];
-        $result[] = [
-            $root . 'vendor/shardj/zf1-future/library/Zend/Locale/Data/es_419.xml'
-        ];
-
-        return $result;
-    }
-
     /**
      *
      * @dataProvider provideXmlFiles
-     * @param $filepath
+     * @param string $filepath
      * @return void
      */
-    public function testFileLoading($filepath): void
+    public function testFileLoading(string $filepath): void
     {
-        //$simplexml = new \SimpleXMLElement(file_get_contents($filepath));
+        /** @var SimpleXMLElement $simplexml */
         $simplexml = simplexml_load_file(
             $filepath,
-            null,
+            SimpleXMLElement::class,
             LIBXML_PEDANTIC //not needed by OpenMage, but good to test more strictly
         );
         $this->assertNotEmpty($simplexml->asXML());
@@ -40,13 +30,28 @@ public function testFileLoading($filepath): void
     /**
      *
      * @dataProvider provideXmlFiles
-     * @param $filepath
+     * @param string $filepath
      * @return void
      */
-    public function testXmlReaderIsValid($filepath): void
+    public function testXmlReaderIsValid(string $filepath): void
     {
-        $xml = \XMLReader::open($filepath);
-        $xml->setParserProperty(\XMLReader::VALIDATE, true);
+        /** @var XMLReader $xml */
+        $xml = XMLReader::open($filepath);
+        $xml->setParserProperty(XMLReader::VALIDATE, true);
         $this->assertTrue($xml->isValid());
     }
+
+    /**
+     * @return string[][]
+     */
+    public function provideXmlFiles(): array
+    {
+        $root = realpath(__DIR__ . '/../../../../') . '/';
+
+        return [
+            'file from vendor directory' => [
+                $root . 'vendor/shardj/zf1-future/library/Zend/Locale/Data/es_419.xml'
+            ],
+        ];
+    }
 }

From b9630c1860594afa583d5f7820e6c411f2514c64 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 2 Aug 2024 23:29:47 +0200
Subject: [PATCH 09/79] Updated test

---
 .../Helper/EnvironmentConfigLoaderTest.php    | 112 ++++++++++--------
 .../EnvironmentConfigLoaderTestHelper.php     |  20 ++++
 2 files changed, 81 insertions(+), 51 deletions(-)
 create mode 100644 dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php

diff --git a/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php b/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
index ed7911d29ba..80d85a7e7e2 100644
--- a/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
+++ b/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
@@ -1,66 +1,68 @@
 <?php
+
 declare(strict_types=1);
 
-namespace OpenMage\Tests\Unit\Core\Helper;
+namespace OpenMage\Tests\Unit\Mage\Core\Helper;
 
-use PHPUnit\Framework\TestCase;
+use Mage;
+use Mage_Core_Exception;
 use Mage_Core_Helper_EnvironmentConfigLoader;
-use Mage_Core_Model_Config;
-
-class TestEnvLoaderHelper extends Mage_Core_Helper_EnvironmentConfigLoader {
-    public function exposedBuildPath(string $section, string $group, string $field): string
-    {
-        return $this->buildPath($section, $group, $field);
-    }
-
-    public function exposedBuildNodePath(string $scope, string $path): string
-    {
-        return $this->buildNodePath($scope, $path);
-    }
-}
+use PHPUnit\Framework\TestCase;
+use Varien_Simplexml_Config;
 
 class EnvironmentConfigLoaderTest extends TestCase
 {
+    private const XML_PATH_GENERAL = 'general/store_information/name';
+
+    private const XML_PATH_DEFAULT = 'default/general/store_information/name';
+
+    private const XML_PATH_WEBSITE = 'websites/base/general/store_information/name';
+
+    private const XML_PATH_STORE = 'stores/german/general/store_information/name';
+
+    /**
+     * @throws Mage_Core_Exception
+     */
     public function setup(): void
     {
-        \Mage::setRoot('');
+        Mage::setRoot();
     }
 
-    public function testBuildPath()
+    public function testBuildPath(): void
     {
-        $environmentConfigLoaderHelper = new TestEnvLoaderHelper();
+        $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper();
         $path = $environmentConfigLoaderHelper->exposedBuildPath('GENERAL', 'STORE_INFORMATION', 'NAME');
-        $this->assertEquals('general/store_information/name', $path);
+        $this->assertEquals(self::XML_PATH_GENERAL, $path);
     }
 
-    public function testBuildNodePath()
+    public function testBuildNodePath(): void
     {
-        $environmentConfigLoaderHelper = new TestEnvLoaderHelper();
-        $nodePath = $environmentConfigLoaderHelper->exposedBuildNodePath('DEFAULT', 'general/store_information/name');
-        $this->assertEquals('default/general/store_information/name', $nodePath);
+        $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper();
+        $nodePath = $environmentConfigLoaderHelper->exposedBuildNodePath('DEFAULT', self::XML_PATH_GENERAL);
+        $this->assertEquals(self::XML_PATH_DEFAULT, $nodePath);
     }
 
-    public function test_xml_has_test_strings()
+    public function testXmlHasTestStrings(): void
     {
         $xmlStruct = $this->getTestXml();
-        $xml = new \Varien_Simplexml_Config();
+        $xml = new Varien_Simplexml_Config();
         $xml->loadString($xmlStruct);
-        $this->assertEquals('test_default', (string)$xml->getNode('default/general/store_information/name'));
-        $this->assertEquals('test_website', (string)$xml->getNode('websites/base/general/store_information/name'));
-        $this->assertEquals('test_store', (string)$xml->getNode('stores/german/general/store_information/name'));
+        $this->assertEquals('test_default', (string)$xml->getNode(self::XML_PATH_DEFAULT));
+        $this->assertEquals('test_website', (string)$xml->getNode(self::XML_PATH_WEBSITE));
+        $this->assertEquals('test_store', (string)$xml->getNode(self::XML_PATH_STORE));
     }
 
     /**
-     * @dataProvider env_overrides_correct_config_keys
-     * @test
+     * @dataProvider envOverridesCorrectConfigKeysDataProvider
+     * @param array<string, string> $config
      */
-    public function env_overrides_for_valid_config_keys(array $config)
+    public function testEnvOverridesForValidConfigKeys(array $config): void
     {
         $xmlStruct = $this->getTestXml();
 
-        $xmlDefault = new \Varien_Simplexml_Config();
+        $xmlDefault = new Varien_Simplexml_Config();
         $xmlDefault->loadString($xmlStruct);
-        $xml = new \Varien_Simplexml_Config();
+        $xml = new Varien_Simplexml_Config();
         $xml->loadString($xmlStruct);
 
         // act
@@ -75,10 +77,13 @@ public function env_overrides_for_valid_config_keys(array $config)
         $valueAfterOverride = $xml->getNode($configPath);
 
         // assert
-        $this->assertNotEquals((string)$defaultValue, (string)$valueAfterOverride, 'Default value was not overridden.');
+        self::assertNotEquals((string)$defaultValue, (string)$valueAfterOverride, 'Default value was not overridden.');
     }
 
-    public function env_overrides_correct_config_keys(): array
+    /**
+     * @return array<array<string, array<string, string>>>
+     */
+    public function envOverridesCorrectConfigKeysDataProvider(): array
     {
         $defaultPath = 'OPENMAGE_CONFIG__DEFAULT__GENERAL__STORE_INFORMATION__NAME';
         $defaultPathWithDash = 'OPENMAGE_CONFIG__DEFAULT__GENERAL__FOO-BAR__NAME';
@@ -96,7 +101,7 @@ public function env_overrides_correct_config_keys(): array
             [
                 'Case DEFAULT overrides.' => [
                     'case'     => 'DEFAULT',
-                    'xml_path' => 'default/general/store_information/name',
+                    'xml_path' => self::XML_PATH_DEFAULT,
                     'env_path' => $defaultPath,
                     'value'    => 'default_new_value'
                 ]
@@ -120,7 +125,7 @@ public function env_overrides_correct_config_keys(): array
             [
                 'Case STORE overrides.' => [
                     'case'     => 'STORE',
-                    'xml_path' => 'stores/german/general/store_information/name',
+                    'xml_path' => self::XML_PATH_STORE,
                     'env_path' => $storePath,
                     'value'    => 'store_new_value'
                 ]
@@ -144,7 +149,7 @@ public function env_overrides_correct_config_keys(): array
             [
                 'Case WEBSITE overrides.' => [
                     'case'     => 'WEBSITE',
-                    'xml_path' => 'websites/base/general/store_information/name',
+                    'xml_path' => self::XML_PATH_WEBSITE,
                     'env_path' => $websitePath,
                     'value'    => 'website_new_value'
                 ]
@@ -169,24 +174,24 @@ public function env_overrides_correct_config_keys(): array
     }
 
     /**
-     * @dataProvider env_does_not_override_on_wrong_config_keys
-     * @test
+     * @dataProvider envDoesNotOverrideOnWrongConfigKeysDataProvider
+     * @param array<string, string> $config
      */
-    public function env_does_not_override_for_invalid_config_keys(array $config)
+    public function testEnvDoesNotOverrideForInvalidConfigKeys(array $config): void
     {
         $xmlStruct = $this->getTestXml();
 
-        $xmlDefault = new \Varien_Simplexml_Config();
+        $xmlDefault = new Varien_Simplexml_Config();
         $xmlDefault->loadString($xmlStruct);
-        $xml = new \Varien_Simplexml_Config();
+        $xml = new Varien_Simplexml_Config();
         $xml->loadString($xmlStruct);
 
         $defaultValue = 'test_default';
-        $this->assertEquals($defaultValue, (string)$xml->getNode('default/general/store_information/name'));
+        $this->assertEquals($defaultValue, (string)$xml->getNode(self::XML_PATH_DEFAULT));
         $defaultWebsiteValue = 'test_website';
-        $this->assertEquals($defaultWebsiteValue, (string)$xml->getNode('websites/base/general/store_information/name'));
+        $this->assertEquals($defaultWebsiteValue, (string)$xml->getNode(self::XML_PATH_WEBSITE));
         $defaultStoreValue = 'test_store';
-        $this->assertEquals($defaultStoreValue, (string)$xml->getNode('stores/german/general/store_information/name'));
+        $this->assertEquals($defaultStoreValue, (string)$xml->getNode(self::XML_PATH_STORE));
 
         // act
         $loader = new Mage_Core_Helper_EnvironmentConfigLoader();
@@ -195,27 +200,32 @@ public function env_does_not_override_for_invalid_config_keys(array $config)
         ]);
         $loader->overrideEnvironment($xml);
 
+        $valueAfterCheck = '';
         switch ($config['case']) {
             case 'DEFAULT':
-                $valueAfterCheck = $xml->getNode('default/general/store_information/name');
+                $valueAfterCheck = $xml->getNode(self::XML_PATH_DEFAULT);
                 break;
             case 'STORE':
-                $valueAfterCheck = $xml->getNode('stores/german/general/store_information/name');
+                $valueAfterCheck = $xml->getNode(self::XML_PATH_STORE);
                 break;
             case 'WEBSITE':
-                $valueAfterCheck = $xml->getNode('websites/base/general/store_information/name');
+                $valueAfterCheck = $xml->getNode(self::XML_PATH_WEBSITE);
                 break;
         }
 
         // assert
-        $this->assertTrue(!str_contains('value_will_not_be_changed', (string)$valueAfterCheck), 'Default value was wrongfully overridden.');
+        self::assertTrue(!str_contains('value_will_not_be_changed', (string)$valueAfterCheck), 'Default value was wrongfully overridden.');
     }
 
-    public function env_does_not_override_on_wrong_config_keys(): array
+    /**
+     * @return array<array<string, array<string, string>>>
+     */
+    public function envDoesNotOverrideOnWrongConfigKeysDataProvider(): array
     {
         $defaultPath = 'OPENMAGE_CONFIG__DEFAULT__GENERAL__ST';
         $websitePath = 'OPENMAGE_CONFIG__WEBSITES__BASE__GENERAL__ST';
         $storePath = 'OPENMAGE_CONFIG__STORES__GERMAN__GENERAL__ST';
+
         return [
             [
                 'Case DEFAULT with ' . $defaultPath . ' will not override.' => [
diff --git a/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php b/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php
new file mode 100644
index 00000000000..f6afd3b7558
--- /dev/null
+++ b/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Helper;
+
+use Mage_Core_Helper_EnvironmentConfigLoader;
+
+class EnvironmentConfigLoaderTestHelper extends Mage_Core_Helper_EnvironmentConfigLoader
+{
+    public function exposedBuildPath(string $section, string $group, string $field): string
+    {
+        return $this->buildPath($section, $group, $field);
+    }
+
+    public function exposedBuildNodePath(string $scope, string $path): string
+    {
+        return $this->buildNodePath($scope, $path);
+    }
+}

From 6f0b4b73e710071aa36e0a65a5bf513964fea8b8 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 2 Aug 2024 23:34:00 +0200
Subject: [PATCH 10/79] Revert "Rector: CQ -
 UnusedForeachValueToArrayKeysRector (#1)"

This reverts commit 3d7eaf63f2211a9e1a8defe8c29e8f6da889ab2e.
---
 app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php    | 4 ++--
 app/code/core/Mage/Adminhtml/Block/Page/Menu.php          | 2 +-
 app/code/core/Mage/Adminhtml/Block/Report/Grid.php        | 2 +-
 .../Adminhtml/Block/Sales/Transactions/Child/Grid.php     | 2 +-
 app/code/core/Mage/Adminhtml/Block/Store/Switcher.php     | 4 ++--
 app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php    | 2 +-
 .../core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php    | 2 +-
 app/code/core/Mage/Adminhtml/Block/Widget/Grid.php        | 2 +-
 .../Block/Widget/Grid/Column/Renderer/Action.php          | 2 +-
 app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php        | 2 +-
 .../Adminhtml/Model/System/Config/Source/Admin/Page.php   | 2 +-
 app/code/core/Mage/Api2/Model/Acl/Filter.php              | 2 +-
 .../Model/Acl/Filter/Attribute/ResourcePermission.php     | 2 +-
 app/code/core/Mage/Catalog/Model/Api2/Product.php         | 2 +-
 app/code/core/Mage/Catalog/Model/Category.php             | 2 +-
 app/code/core/Mage/Catalog/Model/Product/Type/Price.php   | 2 +-
 .../core/Mage/Catalog/Model/Resource/Category/Flat.php    | 2 +-
 app/code/core/Mage/Checkout/Model/Type/Onepage.php        | 2 +-
 .../Mage/ConfigurableSwatches/Helper/Mediafallback.php    | 2 +-
 app/code/core/Mage/Core/Helper/Data.php                   | 2 +-
 app/code/core/Mage/Core/Model/Cache.php                   | 2 +-
 app/code/core/Mage/Core/Model/Layout/Validator.php        | 2 +-
 app/code/core/Mage/Core/Model/Locale.php                  | 2 +-
 app/code/core/Mage/Core/Model/Log/Adapter.php             | 2 +-
 app/code/core/Mage/Core/Model/Url/Rewrite.php             | 2 +-
 app/code/core/Mage/Core/Model/Url/Rewrite/Request.php     | 2 +-
 app/code/core/Mage/Customer/Model/Address/Api.php         | 8 ++++----
 app/code/core/Mage/Customer/Model/Address/Api/V2.php      | 6 +++---
 app/code/core/Mage/Customer/Model/Customer/Api.php        | 6 +++---
 app/code/core/Mage/Dataflow/Model/Batch.php               | 4 ++--
 app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php  | 2 +-
 app/code/core/Mage/Eav/Model/Entity/Abstract.php          | 2 +-
 .../Mage/ImportExport/Model/Export/Entity/Product.php     | 6 +++---
 .../Mage/ImportExport/Model/Import/Entity/Customer.php    | 2 +-
 .../Mage/ImportExport/Model/Import/Entity/Product.php     | 2 +-
 app/code/core/Mage/Index/Model/Event.php                  | 2 +-
 app/code/core/Mage/Install/Block/Db/Main.php              | 2 +-
 app/code/core/Mage/Install/Model/Installer/Console.php    | 2 +-
 .../core/Mage/Install/Model/Installer/Db/Abstract.php     | 2 +-
 app/code/core/Mage/Page/Block/Template/Links.php          | 2 +-
 app/code/core/Mage/Paygate/Model/Authorizenet.php         | 2 +-
 app/code/core/Mage/Payment/Block/Form/Cc.php              | 2 +-
 app/code/core/Mage/Payment/Helper/Data.php                | 6 +++---
 .../core/Mage/Paypal/Model/Resource/Report/Settlement.php | 2 +-
 app/code/core/Mage/Reports/Model/Totals.php               | 2 +-
 app/code/core/Mage/Rule/Model/Action/Abstract.php         | 4 ++--
 app/code/core/Mage/Rule/Model/Condition/Abstract.php      | 6 +++---
 app/code/core/Mage/Rule/Model/Condition/Combine.php       | 2 +-
 .../Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php | 2 +-
 .../Mage/Sales/Model/Resource/Report/Order/Createdat.php  | 2 +-
 .../core/Mage/Sales/Model/Resource/Sale/Collection.php    | 2 +-
 .../sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php      | 2 +-
 .../sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php      | 2 +-
 app/code/core/Mage/Shipping/Model/Rate/Result.php         | 2 +-
 app/code/core/Mage/Tag/Helper/Data.php                    | 2 +-
 app/code/core/Mage/Tag/controllers/IndexController.php    | 2 +-
 .../core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php   | 2 +-
 .../Catalog/Product/Attribute/Edit/AttributeForm.php      | 2 +-
 .../Test/Block/Catalog/Product/Edit/Tab/Prices.php        | 4 ++--
 .../Adminhtml/Test/Block/Catalog/Product/ProductForm.php  | 2 +-
 .../app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php     | 4 ++--
 .../tests/app/Mage/Bundle/Test/Handler/Curl.php           | 4 ++--
 .../DeleteOptionsSubStep.php                              | 2 +-
 .../app/Mage/Customer/Test/Handler/Customer/Curl.php      | 2 +-
 .../app/Mage/Weee/Test/Constraint/AssertFptApplied.php    | 2 +-
 lib/Varien/Convert/Parser/Csv.php                         | 4 ++--
 lib/Varien/Db/Statement/Pdo/Mysql.php                     | 2 +-
 lib/Varien/Http/Adapter/Curl.php                          | 2 +-
 lib/Varien/Object.php                                     | 2 +-
 lib/Varien/Object/Cache.php                               | 2 +-
 phpstan.dist.baseline.neon                                | 5 +++++
 71 files changed, 96 insertions(+), 91 deletions(-)

diff --git a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
index afc5f13938c..700d3b3b17d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
+++ b/app/code/core/Mage/Adminhtml/Block/Dashboard/Graph.php
@@ -215,7 +215,7 @@ public function getChartUrl($directUrl = true)
                     $dateStart->addMonth(1);
                     break;
             }
-            foreach (array_keys($this->getAllSeries()) as $index) {
+            foreach ($this->getAllSeries() as $index => $serie) {
                 if (in_array($d, $this->_axisLabels['x'])) {
                     $datas[$index][] = (float)array_shift($this->_allSeries[$index]);
                 } else {
@@ -328,7 +328,7 @@ public function getChartUrl($directUrl = true)
         if (count($this->_axisLabels)) {
             $params['chxt'] = implode(',', array_keys($this->_axisLabels));
             $indexid = 0;
-            foreach (array_keys($this->_axisLabels) as $idx) {
+            foreach ($this->_axisLabels as $idx => $labels) {
                 if ($idx === 'x') {
                     /**
                      * Format date
diff --git a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
index 20bb44f96f4..d4872f9158d 100644
--- a/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
+++ b/app/code/core/Mage/Adminhtml/Block/Page/Menu.php
@@ -164,7 +164,7 @@ protected function _buildMenuArray(Varien_Simplexml_Element $parent, $path = '',
 
         uasort($parentArr, [$this, '_sortMenu']);
 
-        foreach (array_keys($parentArr) as $key) {
+        foreach ($parentArr as $key => $value) {
             $last = $key;
         }
         if (isset($last)) {
diff --git a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
index efc441c2365..180a228a288 100644
--- a/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Report/Grid.php
@@ -207,7 +207,7 @@ protected function _prepareCollection()
      */
     protected function _setFilterValues($data)
     {
-        foreach (array_keys($data) as $name) {
+        foreach ($data as $name => $value) {
             $this->setFilter($name, $data[$name]);
         }
         return $this;
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php
index 2a585eb5b7d..1e8e12f3dd4 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Transactions/Child/Grid.php
@@ -62,7 +62,7 @@ protected function _prepareColumns()
     {
         $result = parent::_prepareColumns();
 
-        foreach (array_keys($this->_columns) as $key) {
+        foreach ($this->_columns as $key => $value) {
             if (in_array($key, $this->_columnsToRemove)) {
                 unset($this->_columns[$key]);
             } else {
diff --git a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php
index 33442aa26b1..d0c60a17406 100644
--- a/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php
+++ b/app/code/core/Mage/Adminhtml/Block/Store/Switcher.php
@@ -73,7 +73,7 @@ public function getWebsites()
     {
         $websites = Mage::app()->getWebsites();
         if ($websiteIds = $this->getWebsiteIds()) {
-            foreach (array_keys($websites) as $websiteId) {
+            foreach ($websites as $websiteId => $website) {
                 if (!in_array($websiteId, $websiteIds)) {
                     unset($websites[$websiteId]);
                 }
@@ -140,7 +140,7 @@ public function getStores($group)
         }
         $stores = $group->getStores();
         if ($storeIds = $this->getStoreIds()) {
-            foreach (array_keys($stores) as $storeId) {
+            foreach ($stores as $storeId => $store) {
                 if (!in_array($storeId, $storeIds)) {
                     unset($stores[$storeId]);
                 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
index fc959e184ff..9e369a45972 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit.php
@@ -194,7 +194,7 @@ public function getButtonsHtml($area = null)
     {
         if ($this->_buttonsHtml === null) {
             $this->_buttonsHtml = parent::getButtonsHtml();
-            foreach (array_keys($this->_children) as $alias) {
+            foreach ($this->_children as $alias => $child) {
                 if (str_contains($alias, '_button')) {
                     $this->unsetChild($alias);
                 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
index 955c2f871b0..a91f22b905a 100644
--- a/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
+++ b/app/code/core/Mage/Adminhtml/Block/Urlrewrite/Edit/Form.php
@@ -61,7 +61,7 @@ protected function _prepareForm()
             'description'  => $model->getDescription(),
         ];
         if ($sessionData = Mage::getSingleton('adminhtml/session')->getData('urlrewrite_data', true)) {
-            foreach (array_keys($formValues) as $key) {
+            foreach ($formValues as $key => $value) {
                 if (isset($sessionData[$key])) {
                     $formValues[$key] = $sessionData[$key];
                 }
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
index 5b701ae5133..af36a237924 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid.php
@@ -481,7 +481,7 @@ public function getColumns()
      */
     protected function _setFilterValues($data)
     {
-        foreach (array_keys($data) as $columnId) {
+        foreach ($data as $columnId => $value) {
             $column = $this->getColumn($columnId);
             if ($column instanceof Mage_Adminhtml_Block_Widget_Grid_Column
                 && (!empty($data[$columnId]) || strlen($data[$columnId]) > 0)
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php
index 9bdad27dbbf..1fe5f9905b6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Grid/Column/Renderer/Action.php
@@ -109,7 +109,7 @@ protected function _toLinkHtml($action, Varien_Object $row)
      */
     protected function _transformActionData(&$action, &$actionCaption, Varien_Object $row)
     {
-        foreach (array_keys($action) as $attribute) {
+        foreach ($action as $attribute => $value) {
             if (isset($action[$attribute]) && !is_array($action[$attribute])) {
                 $this->getColumn()->setFormat($action[$attribute]);
                 $action[$attribute] = parent::render($row);
diff --git a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
index ca58c8f7fc6..94e9fae48a6 100644
--- a/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
+++ b/app/code/core/Mage/Adminhtml/Block/Widget/Tabs.php
@@ -256,7 +256,7 @@ protected function _reorderTabs()
         asort($this->_tabPositions);
 
         $ordered = [];
-        foreach (array_keys($this->_tabPositions) as $tabId) {
+        foreach ($this->_tabPositions as $tabId => $position) {
             if (isset($this->_tabs[$tabId])) {
                 $tab = $this->_tabs[$tabId];
                 $ordered[$tabId] = $tab;
diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php
index 92bfd9d0639..e79b3daedc4 100644
--- a/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php
+++ b/app/code/core/Mage/Adminhtml/Model/System/Config/Source/Admin/Page.php
@@ -109,7 +109,7 @@ protected function _buildMenuArray(?Varien_Simplexml_Element $parent = null, $pa
 
         uasort($parentArr, [$this, '_sortMenu']);
 
-        foreach (array_keys($parentArr) as $key) {
+        foreach ($parentArr as $key => $value) {
             $last = $key;
         }
         if (isset($last)) {
diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter.php b/app/code/core/Mage/Api2/Model/Acl/Filter.php
index cefef4dd4f6..3494dfceb14 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Filter.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Filter.php
@@ -61,7 +61,7 @@ public function __construct(Mage_Api2_Model_Resource $resource)
      */
     protected function _filter(array $allowedAttributes, array $data)
     {
-        foreach (array_keys($data) as $attribute) {
+        foreach ($data as $attribute => $value) {
             if (!in_array($attribute, $allowedAttributes)) {
                 unset($data[$attribute]);
             }
diff --git a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php
index f58a244ca00..1016b87c227 100644
--- a/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php
+++ b/app/code/core/Mage/Api2/Model/Acl/Filter/Attribute/ResourcePermission.php
@@ -103,7 +103,7 @@ public function getResourcesPermissions()
                             $resourceModel->setResourceType($resource)
                                 ->setUserType($this->_userType);
 
-                            foreach (array_keys($operations) as $operation) {
+                            foreach ($operations as $operation => $operationLabel) {
                                 if (!$this->_hasEntityOnlyAttributes
                                     && $config->getResourceEntityOnlyAttributes($resource, $this->_userType, $operation)
                                 ) {
diff --git a/app/code/core/Mage/Catalog/Model/Api2/Product.php b/app/code/core/Mage/Catalog/Model/Api2/Product.php
index f757413be4b..586f1db4acd 100644
--- a/app/code/core/Mage/Catalog/Model/Api2/Product.php
+++ b/app/code/core/Mage/Catalog/Model/Api2/Product.php
@@ -42,7 +42,7 @@ public function getAvailableAttributes($userType, $operation)
         }
         $excludedAttrs = $this->getExcludedAttributes($userType, $operation);
         $includedAttrs = $this->getIncludedAttributes($userType, $operation);
-        foreach (array_keys($attributes) as $code) {
+        foreach ($attributes as $code => $label) {
             if (in_array($code, $excludedAttrs) || ($includedAttrs && !in_array($code, $includedAttrs))) {
                 unset($attributes[$code]);
             }
diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php
index 5ff10b609dc..58cd0b2c7c9 100644
--- a/app/code/core/Mage/Catalog/Model/Category.php
+++ b/app/code/core/Mage/Catalog/Model/Category.php
@@ -346,7 +346,7 @@ public function getAttributes($noDesignAttributes = false)
             ->getSortedAttributes();
 
         if ($noDesignAttributes) {
-            foreach (array_keys($result) as $k) {
+            foreach ($result as $k => $a) {
                 if (in_array($k, $this->_designAttributes)) {
                     unset($result[$k]);
                 }
diff --git a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
index df7d7f731c9..62e6d7f86ae 100644
--- a/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
+++ b/app/code/core/Mage/Catalog/Model/Product/Type/Price.php
@@ -300,7 +300,7 @@ public function getFormatedTierPrice($qty, $product)
     {
         $price = $product->getTierPrice($qty);
         if (is_array($price)) {
-            foreach (array_keys($price) as $index) {
+            foreach ($price as $index => $value) {
                 $price[$index]['formated_price'] = Mage::app()->getStore()->convertPrice(
                     $price[$index]['website_price'],
                     true
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
index 7e962fb0b72..3a03e409ef5 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php
@@ -1152,7 +1152,7 @@ protected function _prepareDataForAllFields($category, $replaceFields = [])
         $table = $this->_getReadAdapter()->describeTable($table);
         $data = [];
         $idFieldName = Mage::getSingleton('catalog/category')->getIdFieldName();
-        foreach (array_keys($table) as $column) {
+        foreach ($table as $column => $columnData) {
             if ($column != $idFieldName || $category->getData($column) !== null) {
                 if (array_key_exists($column, $replaceFields)) {
                     $value = $category->getData($replaceFields[$column]);
diff --git a/app/code/core/Mage/Checkout/Model/Type/Onepage.php b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
index 2cdbe2eec65..f1d8d4a5ced 100644
--- a/app/code/core/Mage/Checkout/Model/Type/Onepage.php
+++ b/app/code/core/Mage/Checkout/Model/Type/Onepage.php
@@ -119,7 +119,7 @@ public function initCheckout()
         $checkout = $this->getCheckout();
         $customerSession = $this->getCustomerSession();
         if (is_array($checkout->getStepData())) {
-            foreach (array_keys($checkout->getStepData()) as $step) {
+            foreach ($checkout->getStepData() as $step => $data) {
                 if (!($step === 'login' || $customerSession->isLoggedIn() && $step === 'billing')) {
                     $checkout->setStepData($step, 'allow', false);
                 }
diff --git a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php
index da23ea014ad..db49ed16933 100644
--- a/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php
+++ b/app/code/core/Mage/ConfigurableSwatches/Helper/Mediafallback.php
@@ -136,7 +136,7 @@ public function attachProductChildrenAttributeMapping(array $parentProducts, $st
                 } // end looping child products
             } // end looping attributes
 
-            foreach (array_keys($mapping) as $key) {
+            foreach ($mapping as $key => $value) {
                 $mapping[$key]['product_ids'] = array_unique($mapping[$key]['product_ids']);
             }
 
diff --git a/app/code/core/Mage/Core/Helper/Data.php b/app/code/core/Mage/Core/Helper/Data.php
index d3c9a73ac45..73029d7952c 100644
--- a/app/code/core/Mage/Core/Helper/Data.php
+++ b/app/code/core/Mage/Core/Helper/Data.php
@@ -603,7 +603,7 @@ public function assocToXml(array $array, $rootName = '_')
 <$rootName></$rootName>
 XML;
         $xml = new SimpleXMLElement($xmlstr);
-        foreach (array_keys($array) as $key) {
+        foreach ($array as $key => $value) {
             if (is_numeric($key)) {
                 throw new Exception('Array root keys must not be numeric.');
             }
diff --git a/app/code/core/Mage/Core/Model/Cache.php b/app/code/core/Mage/Core/Model/Cache.php
index 9965019bf1e..fe97c2c491f 100644
--- a/app/code/core/Mage/Core/Model/Cache.php
+++ b/app/code/core/Mage/Core/Model/Cache.php
@@ -625,7 +625,7 @@ public function getInvalidatedTypes()
         $types = $this->_getInvalidatedTypes();
         if ($types) {
             $allTypes = $this->getTypes();
-            foreach (array_keys($types) as $type) {
+            foreach ($types as $type => $flag) {
                 if (isset($allTypes[$type]) && $this->canUse($type)) {
                     $invalidatedTypes[$type] = $allTypes[$type];
                 }
diff --git a/app/code/core/Mage/Core/Model/Layout/Validator.php b/app/code/core/Mage/Core/Model/Layout/Validator.php
index 2d14731992b..9bedeaf8621 100644
--- a/app/code/core/Mage/Core/Model/Layout/Validator.php
+++ b/app/code/core/Mage/Core/Model/Layout/Validator.php
@@ -108,7 +108,7 @@ public function getDisallowedBlocks()
         if (!count($this->_disallowedBlock)) {
             $disallowedBlockConfig = $this->_getDisallowedBlockConfigValue();
             if (is_array($disallowedBlockConfig)) {
-                foreach (array_keys($disallowedBlockConfig) as $blockName) {
+                foreach ($disallowedBlockConfig as $blockName => $value) {
                     $this->_disallowedBlock[] = $blockName;
                 }
             }
diff --git a/app/code/core/Mage/Core/Model/Locale.php b/app/code/core/Mage/Core/Model/Locale.php
index 2a0c44563c3..d3b70a7c1cd 100644
--- a/app/code/core/Mage/Core/Model/Locale.php
+++ b/app/code/core/Mage/Core/Model/Locale.php
@@ -247,7 +247,7 @@ protected function _getOptionLocales($translatedName = false)
             }
         }
 
-        foreach (array_keys($locales) as $code) {
+        foreach ($locales as $code => $active) {
             if (strstr($code, '_')) {
                 if (!in_array($code, $allowed)) {
                     continue;
diff --git a/app/code/core/Mage/Core/Model/Log/Adapter.php b/app/code/core/Mage/Core/Model/Log/Adapter.php
index 1a173c94d99..3bc190114c0 100644
--- a/app/code/core/Mage/Core/Model/Log/Adapter.php
+++ b/app/code/core/Mage/Core/Model/Log/Adapter.php
@@ -115,7 +115,7 @@ public function setFilterDataKeys($keys)
     protected function _filterDebugData($debugData)
     {
         if (is_array($debugData) && is_array($this->_debugReplacePrivateDataKeys)) {
-            foreach (array_keys($debugData) as $key) {
+            foreach ($debugData as $key => $value) {
                 if (in_array($key, $this->_debugReplacePrivateDataKeys)) {
                     $debugData[$key] = '****';
                 } else {
diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite.php b/app/code/core/Mage/Core/Model/Url/Rewrite.php
index 929f39be12c..a9bae5f2912 100644
--- a/app/code/core/Mage/Core/Model/Url/Rewrite.php
+++ b/app/code/core/Mage/Core/Model/Url/Rewrite.php
@@ -319,7 +319,7 @@ protected function _getQueryString()
             $queryParams = [];
             parse_str($_SERVER['QUERY_STRING'], $queryParams);
             $hasChanges = false;
-            foreach (array_keys($queryParams) as $key) {
+            foreach ($queryParams as $key => $value) {
                 if (substr($key, 0, 3) === '___') {
                     unset($queryParams[$key]);
                     $hasChanges = true;
diff --git a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php
index f6c14bf4b9a..80bf9ce24de 100644
--- a/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php
+++ b/app/code/core/Mage/Core/Model/Url/Rewrite/Request.php
@@ -306,7 +306,7 @@ protected function _getQueryString()
             $queryParams = [];
             parse_str($_SERVER['QUERY_STRING'], $queryParams);
             $hasChanges = false;
-            foreach (array_keys($queryParams) as $key) {
+            foreach ($queryParams as $key => $value) {
                 if (substr($key, 0, 3) === '___') {
                     unset($queryParams[$key]);
                     $hasChanges = true;
diff --git a/app/code/core/Mage/Customer/Model/Address/Api.php b/app/code/core/Mage/Customer/Model/Address/Api.php
index 9f779558882..63120a58f38 100644
--- a/app/code/core/Mage/Customer/Model/Address/Api.php
+++ b/app/code/core/Mage/Customer/Model/Address/Api.php
@@ -55,7 +55,7 @@ public function items($customerId)
                 $row[$attributeAlias] = $data[$attributeCode] ?? null;
             }
 
-            foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
+            foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
                 if (isset($data[$attributeCode])) {
                     $row[$attributeCode] = $data[$attributeCode];
                 }
@@ -89,7 +89,7 @@ public function create($customerId, $addressData)
 
         $address = Mage::getModel('customer/address');
 
-        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
+        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
             if (isset($addressData[$attributeCode])) {
                 $address->setData($attributeCode, $addressData[$attributeCode]);
             }
@@ -141,7 +141,7 @@ public function info($addressId)
             $result[$attributeAlias] = $address->getData($attributeCode);
         }
 
-        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
+        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
             $result[$attributeCode] = $address->getData($attributeCode);
         }
 
@@ -169,7 +169,7 @@ public function update($addressId, $addressData)
             $this->_fault('not_exists');
         }
 
-        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
+        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
             if (isset($addressData[$attributeCode])) {
                 $address->setData($attributeCode, $addressData[$attributeCode]);
             }
diff --git a/app/code/core/Mage/Customer/Model/Address/Api/V2.php b/app/code/core/Mage/Customer/Model/Address/Api/V2.php
index 901b932eef7..8616fec57a1 100644
--- a/app/code/core/Mage/Customer/Model/Address/Api/V2.php
+++ b/app/code/core/Mage/Customer/Model/Address/Api/V2.php
@@ -40,7 +40,7 @@ public function create($customerId, $addressData)
 
         $address = Mage::getModel('customer/address');
 
-        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
+        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
             if (isset($addressData->$attributeCode)) {
                 $address->setData($attributeCode, $addressData->$attributeCode);
             }
@@ -92,7 +92,7 @@ public function info($addressId)
             $result[$attributeAlias] = $address->getData($attributeCode);
         }
 
-        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
+        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
             $result[$attributeCode] = $address->getData($attributeCode);
         }
 
@@ -120,7 +120,7 @@ public function update($addressId, $addressData)
             $this->_fault('not_exists');
         }
 
-        foreach (array_keys($this->getAllowedAttributes($address)) as $attributeCode) {
+        foreach ($this->getAllowedAttributes($address) as $attributeCode => $attribute) {
             if (isset($addressData->$attributeCode)) {
                 $address->setData($attributeCode, $addressData->$attributeCode);
             }
diff --git a/app/code/core/Mage/Customer/Model/Customer/Api.php b/app/code/core/Mage/Customer/Model/Customer/Api.php
index f8daaa27a89..16853c6c60e 100644
--- a/app/code/core/Mage/Customer/Model/Customer/Api.php
+++ b/app/code/core/Mage/Customer/Model/Customer/Api.php
@@ -87,7 +87,7 @@ public function info($customerId, $attributes = null)
             $result[$attributeAlias] = $customer->getData($attributeCode);
         }
 
-        foreach (array_keys($this->getAllowedAttributes($customer, $attributes)) as $attributeCode) {
+        foreach ($this->getAllowedAttributes($customer, $attributes) as $attributeCode => $attribute) {
             $result[$attributeCode] = $customer->getData($attributeCode);
         }
 
@@ -121,7 +121,7 @@ public function items($filters)
             foreach ($this->_mapAttributes as $attributeAlias => $attributeCode) {
                 $row[$attributeAlias] = $data[$attributeCode] ?? null;
             }
-            foreach (array_keys($this->getAllowedAttributes($customer)) as $attributeCode) {
+            foreach ($this->getAllowedAttributes($customer) as $attributeCode => $attribute) {
                 if (isset($data[$attributeCode])) {
                     $row[$attributeCode] = $data[$attributeCode];
                 }
@@ -149,7 +149,7 @@ public function update($customerId, $customerData)
             $this->_fault('not_exists');
         }
 
-        foreach (array_keys($this->getAllowedAttributes($customer)) as $attributeCode) {
+        foreach ($this->getAllowedAttributes($customer) as $attributeCode => $attribute) {
             if (isset($customerData[$attributeCode])) {
                 $customer->setData($attributeCode, $customerData[$attributeCode]);
             }
diff --git a/app/code/core/Mage/Dataflow/Model/Batch.php b/app/code/core/Mage/Dataflow/Model/Batch.php
index 1235b8f468f..1f727062e73 100644
--- a/app/code/core/Mage/Dataflow/Model/Batch.php
+++ b/app/code/core/Mage/Dataflow/Model/Batch.php
@@ -92,12 +92,12 @@ public function getFieldList()
      */
     public function parseFieldList($row)
     {
-        foreach (array_keys($row) as $fieldName) {
+        foreach ($row as $fieldName => $value) {
             if (!in_array($fieldName, $this->_fieldList)) {
                 $this->_fieldList[$fieldName] = $fieldName;
             }
         }
-        unset($fieldName, $row);
+        unset($fieldName, $value, $row);
     }
 
     /**
diff --git a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
index fdf30b8c5f6..1a15c400f15 100644
--- a/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
+++ b/app/code/core/Mage/Dataflow/Model/Session/Parser/Csv.php
@@ -47,7 +47,7 @@ public function parse()
                     $fields = $line;
                     continue;
                 } else {
-                    foreach (array_keys($line) as $j) {
+                    foreach ($line as $j => $f) {
                         $fields[$j] = 'column' . ($j + 1);
                     }
                 }
diff --git a/app/code/core/Mage/Eav/Model/Entity/Abstract.php b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
index 01c39e4c918..25c93a56c2e 100644
--- a/app/code/core/Mage/Eav/Model/Entity/Abstract.php
+++ b/app/code/core/Mage/Eav/Model/Entity/Abstract.php
@@ -1594,7 +1594,7 @@ public function delete($object)
             ];
             $this->_getWriteAdapter()->delete($this->getEntityTable(), $where);
             $this->loadAllAttributes($object);
-            foreach (array_keys($this->getAttributesByTable()) as $table) {
+            foreach ($this->getAttributesByTable() as $table => $attributes) {
                 $this->_getWriteAdapter()->delete($table, $where);
             }
         } catch (Exception $e) {
diff --git a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
index 1ecb2e87b92..91b578e810a 100644
--- a/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
+++ b/app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
@@ -790,7 +790,7 @@ protected function _prepareExport()
                 '_custom_option_row_sku', '_custom_option_row_sort'
             ];
 
-            foreach (array_keys($this->_storeIdToCode) as &$storeId) {
+            foreach ($this->_storeIdToCode as $storeId => &$storeCode) {
                 $skip = false;
                 $options = Mage::getResourceModel('catalog/product_option_collection')
                     ->reset()
@@ -961,7 +961,7 @@ protected function _prepareExport()
                         $dataRow = array_merge($dataRow, array_shift($configurableData[$productId]));
                     }
                     if (!empty($rowMultiselects[$productId][$storeId])) {
-                        foreach (array_keys($rowMultiselects[$productId][$storeId]) as $attrKey) {
+                        foreach ($rowMultiselects[$productId][$storeId] as $attrKey => $attrVal) {
                             if (isset($rowMultiselects[$productId][$storeId][$attrKey])) {
                                 $dataRow[$attrKey] = array_shift($rowMultiselects[$productId][$storeId][$attrKey]);
                             }
@@ -1039,7 +1039,7 @@ protected function _prepareExport()
                                 $dataRow = array_merge($dataRow, array_shift($configurableData[$productId]));
                             }
                             if (!empty($rowMultiselects[$productId][$storeId])) {
-                                foreach (array_keys($rowMultiselects[$productId][$storeId]) as $attrKey) {
+                                foreach ($rowMultiselects[$productId][$storeId] as $attrKey => $attrVal) {
                                     if (isset($rowMultiselects[$productId][$storeId][$attrKey])) {
                                         $dataRow[$attrKey] = array_shift($rowMultiselects[$productId][$storeId][$attrKey]);
                                     }
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
index a80445efc8b..3ad37c5afb3 100644
--- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
+++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Customer.php
@@ -548,7 +548,7 @@ public function getEntityTypeCode()
     public function getRowScope(array $rowData)
     {
         $foundOptions = false;
-        foreach (array_keys($this->_multiSelectAttributes) as $attrCode) {
+        foreach ($this->_multiSelectAttributes as $attrCode => $attribute) {
             if ($rowData[$attrCode]) {
                 $foundOptions = true;
             }
diff --git a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
index ce5f1e8327f..2acd52bbc58 100644
--- a/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
+++ b/app/code/core/Mage/ImportExport/Model/Import/Entity/Product.php
@@ -1101,7 +1101,7 @@ protected function _saveCustomOptions()
             if ($productIds) { // update product entity table to show that product has options
                 $customOptionsProducts = $customOptions['product_id'];
 
-                foreach (array_keys($customOptionsProducts) as $key) {
+                foreach ($customOptionsProducts as $key => $value) {
                     if (!in_array($key, $productIds)) {
                         unset($customOptionsProducts[$key]);
                     }
diff --git a/app/code/core/Mage/Index/Model/Event.php b/app/code/core/Mage/Index/Model/Event.php
index d4dc4468a17..2035a5be359 100644
--- a/app/code/core/Mage/Index/Model/Event.php
+++ b/app/code/core/Mage/Index/Model/Event.php
@@ -157,7 +157,7 @@ protected function _mergeNewDataRecursive($previous, $current)
             return $previous;
         }
 
-        foreach (array_keys($previous) as $key) {
+        foreach ($previous as $key => $value) {
             if (array_key_exists($key, $current) && !is_null($current[$key]) && is_array($previous[$key])) {
                 if (!is_string($key) || is_array($current[$key])) {
                     $current[$key] = $this->_mergeNewDataRecursive($previous[$key], $current[$key]);
diff --git a/app/code/core/Mage/Install/Block/Db/Main.php b/app/code/core/Mage/Install/Block/Db/Main.php
index 25791d2f5f8..9f0789c1ea3 100644
--- a/app/code/core/Mage/Install/Block/Db/Main.php
+++ b/app/code/core/Mage/Install/Block/Db/Main.php
@@ -77,7 +77,7 @@ public function getDatabaseBlock($type)
     public function getDatabaseBlocks()
     {
         $databases = [];
-        foreach (array_keys($this->_databases) as $type) {
+        foreach ($this->_databases as $type => $blockData) {
             $databases[] = $this->getDatabaseBlock($type);
         }
         return $databases;
diff --git a/app/code/core/Mage/Install/Model/Installer/Console.php b/app/code/core/Mage/Install/Model/Installer/Console.php
index 7c31a5007ab..033d8db36a4 100644
--- a/app/code/core/Mage/Install/Model/Installer/Console.php
+++ b/app/code/core/Mage/Install/Model/Installer/Console.php
@@ -155,7 +155,7 @@ public function setArgs($args = null)
         /**
          * Set args values
          */
-        foreach (array_keys($this->_getOptions()) as $name) {
+        foreach ($this->_getOptions() as $name => $option) {
             $this->_args[$name] = $args[$name] ?? '';
         }
 
diff --git a/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php b/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php
index 33b6de0c2ea..40155d07e4a 100644
--- a/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php
+++ b/app/code/core/Mage/Install/Model/Installer/Db/Abstract.php
@@ -136,7 +136,7 @@ public function getRequiredExtensions()
     {
         $extensions = [];
         $configExt = (array)Mage::getConfig()->getNode(sprintf('install/databases/%s/extensions', $this->getModel()));
-        foreach (array_keys($configExt) as $name) {
+        foreach ($configExt as $name => $value) {
             $extensions[] = $name;
         }
         return $extensions;
diff --git a/app/code/core/Mage/Page/Block/Template/Links.php b/app/code/core/Mage/Page/Block/Template/Links.php
index aacfd69b27e..b52e2f367eb 100644
--- a/app/code/core/Mage/Page/Block/Template/Links.php
+++ b/app/code/core/Mage/Page/Block/Template/Links.php
@@ -242,7 +242,7 @@ protected function _getNewPosition($position = 0)
             }
         } else {
             $position = 0;
-            foreach (array_keys($this->_links) as $k) {
+            foreach ($this->_links as $k => $v) {
                 $position = $k;
             }
             $position += 10;
diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php
index c32a8b69385..5659e2caac3 100644
--- a/app/code/core/Mage/Paygate/Model/Authorizenet.php
+++ b/app/code/core/Mage/Paygate/Model/Authorizenet.php
@@ -1475,7 +1475,7 @@ protected function _addTransaction(
             $payment->setTransactionAdditionalInfo($key, $value);
         }
         $transaction = $payment->addTransaction($transactionType, null, false, $message);
-        foreach (array_keys($transactionDetails) as $key) {
+        foreach ($transactionDetails as $key => $value) {
             $payment->unsetData($key);
         }
         $payment->unsLastTransId();
diff --git a/app/code/core/Mage/Payment/Block/Form/Cc.php b/app/code/core/Mage/Payment/Block/Form/Cc.php
index 08a12b4c037..5435e7f4a75 100644
--- a/app/code/core/Mage/Payment/Block/Form/Cc.php
+++ b/app/code/core/Mage/Payment/Block/Form/Cc.php
@@ -47,7 +47,7 @@ public function getCcAvailableTypes()
             $availableTypes = $method->getConfigData('cctypes');
             if ($availableTypes) {
                 $availableTypes = explode(',', $availableTypes);
-                foreach (array_keys($types) as $code) {
+                foreach ($types as $code => $name) {
                     if (!in_array($code, $availableTypes)) {
                         unset($types[$code]);
                     }
diff --git a/app/code/core/Mage/Payment/Helper/Data.php b/app/code/core/Mage/Payment/Helper/Data.php
index fed881ddeae..a7f9071c590 100644
--- a/app/code/core/Mage/Payment/Helper/Data.php
+++ b/app/code/core/Mage/Payment/Helper/Data.php
@@ -67,7 +67,7 @@ public function getMethodInstance($code)
     public function getStoreMethods($store = null, $quote = null)
     {
         $res = [];
-        foreach (array_keys($this->getPaymentMethods($store)) as $code) {
+        foreach ($this->getPaymentMethods($store) as $code => $methodConfig) {
             $prefix = self::XML_PATH_PAYMENT_METHODS . '/' . $code . '/';
             if (!$model = Mage::getStoreConfig($prefix . 'model', $store)) {
                 continue;
@@ -166,7 +166,7 @@ public function getBillingAgreementMethods($store = null, $quote = null)
     public function getRecurringProfileMethods($store = null)
     {
         $result = [];
-        foreach (array_keys($this->getPaymentMethods($store)) as $code) {
+        foreach ($this->getPaymentMethods($store) as $code => $data) {
             $paymentMethodModelClassName = $this->getMethodModelClassName($code);
             if (!$paymentMethodModelClassName) {
                 continue;
@@ -244,7 +244,7 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
         }
         if ($asLabelValue) {
             $labelValues = [];
-            foreach (array_keys($methods) as $code) {
+            foreach ($methods as $code => $title) {
                 $labelValues[$code] = [];
             }
             foreach ($methods as $code => $title) {
diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php
index fca1a3d661e..ec75245e7e2 100644
--- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php
+++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement.php
@@ -58,7 +58,7 @@ protected function _afterSave(Mage_Core_Model_Abstract $object)
                 /** @var Mage_Core_Model_Date $date */
                 $date = Mage::getSingleton('core/date');
 
-                foreach (array_keys($rows) as $key) {
+                foreach ($rows as $key => $row) {
                     /*
                      * Converting dates
                      */
diff --git a/app/code/core/Mage/Reports/Model/Totals.php b/app/code/core/Mage/Reports/Model/Totals.php
index 6b98422fdee..33f899cc705 100644
--- a/app/code/core/Mage/Reports/Model/Totals.php
+++ b/app/code/core/Mage/Reports/Model/Totals.php
@@ -47,7 +47,7 @@ public function countTotals($grid, $from, $to)
             }
             $data = $item->getData();
 
-            foreach (array_keys($columns) as $field) {
+            foreach ($columns as $field => $a) {
                 if ($field !== '') {
                     $columns[$field]['value'] += $data[$field] ?? 0;
                 }
diff --git a/app/code/core/Mage/Rule/Model/Action/Abstract.php b/app/code/core/Mage/Rule/Model/Action/Abstract.php
index d8cb87fb7f4..a810922d2f7 100644
--- a/app/code/core/Mage/Rule/Model/Action/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Action/Abstract.php
@@ -52,11 +52,11 @@ public function __construct()
         parent::__construct();
         $this->loadAttributeOptions()->loadOperatorOptions()->loadValueOptions();
 
-        foreach (array_keys($this->getAttributeOption()) as $attr) {
+        foreach ($this->getAttributeOption() as $attr => $dummy) {
             $this->setAttribute($attr);
             break;
         }
-        foreach (array_keys($this->getOperatorOption()) as $operator) {
+        foreach ($this->getOperatorOption() as $operator => $dummy) {
             $this->setOperator($operator);
             break;
         }
diff --git a/app/code/core/Mage/Rule/Model/Condition/Abstract.php b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
index e31fbdda29c..d2e67c86270 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Abstract.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Abstract.php
@@ -92,13 +92,13 @@ public function __construct()
         $this->loadAttributeOptions()->loadOperatorOptions()->loadValueOptions();
 
         if ($options = $this->getAttributeOptions()) {
-            foreach (array_keys($options) as $attr) {
+            foreach ($options as $attr => $dummy) {
                 $this->setAttribute($attr);
                 break;
             }
         }
         if ($options = $this->getOperatorOptions()) {
-            foreach (array_keys($options) as $operator) {
+            foreach ($options as $operator => $dummy) {
                 $this->setOperator($operator);
                 break;
             }
@@ -503,7 +503,7 @@ public function getTypeElementHtml()
     public function getAttributeElement()
     {
         if (is_null($this->getAttribute())) {
-            foreach (array_keys($this->getAttributeOption()) as $k) {
+            foreach ($this->getAttributeOption() as $k => $v) {
                 $this->setAttribute($k);
                 break;
             }
diff --git a/app/code/core/Mage/Rule/Model/Condition/Combine.php b/app/code/core/Mage/Rule/Model/Condition/Combine.php
index 1d9b0093d13..79d4e693c38 100644
--- a/app/code/core/Mage/Rule/Model/Condition/Combine.php
+++ b/app/code/core/Mage/Rule/Model/Condition/Combine.php
@@ -95,7 +95,7 @@ public function __construct()
 
         $this->loadAggregatorOptions();
         if ($options = $this->getAggregatorOptions()) {
-            foreach (array_keys($options) as $aggregator) {
+            foreach ($options as $aggregator => $dummy) {
                 $this->setAggregator($aggregator);
                 break;
             }
diff --git a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
index 713bee21bab..52bf6a9b347 100644
--- a/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
+++ b/app/code/core/Mage/Sales/Block/Adminhtml/Customer/Edit/Tab/Agreement.php
@@ -125,7 +125,7 @@ protected function _prepareColumns()
     {
         $result = parent::_prepareColumns();
 
-        foreach (array_keys($this->_columns) as $key) {
+        foreach ($this->_columns as $key => $value) {
             if (in_array($key, $this->_columnsToRemove)) {
                 unset($this->_columns[$key]);
             }
diff --git a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
index a9971351972..323ce47e00f 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Report/Order/Createdat.php
@@ -230,7 +230,7 @@ protected function _aggregateByField($aggregationField, $from, $to)
             $adapter->query($select->insertFromSelect($this->getMainTable(), array_keys($columns)));
 
             // setup all columns to select SUM() except period, store_id and order_status
-            foreach (array_keys($columns) as $k) {
+            foreach ($columns as $k => $v) {
                 $columns[$k] = new Zend_Db_Expr('SUM(' . $k . ')');
             }
             $columns['period']         = 'period';
diff --git a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
index f2972e84cc9..1bf6ed99bf1 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Sale/Collection.php
@@ -182,7 +182,7 @@ public function load($printQuery = false, $logQuery = false)
                 ->setWebsiteId(Mage::app()->getStore($storeId)->getWebsiteId())
                 ->setAvgNormalized($v['avgsale'] * $v['num_orders']);
             $this->_items[$storeId] = $storeObject;
-            foreach (array_keys($this->_totals) as $key) {
+            foreach ($this->_totals as $key => $value) {
                 $this->_totals[$key] += $storeObject->getData($key);
             }
         }
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php
index 9525a968c57..43d089aa854 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.8.13-0.8.14.php
@@ -183,7 +183,7 @@
 $select->from(['e' => $this->getTable('sales_order_entity')]);
 
 $attributeIds = [];
-foreach (array_keys($attributes) as $code) {
+foreach ($attributes as $code => $params) {
     $attributes[$code] = $installer->getAttribute($orderEntityTypeId, $code);
     if ($attributes[$code]['backend_type'] != 'static') {
         $select->joinLeft(
diff --git a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php
index 69722481f54..3e9e34ea693 100644
--- a/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php
+++ b/app/code/core/Mage/Sales/sql/sales_setup/mysql4-upgrade-0.9.50-0.9.51.php
@@ -46,7 +46,7 @@
 ");
 
 /* get order_payment attribute codes*/
-foreach (array_keys($attributesIds) as $attributeCode) {
+foreach ($attributesIds as $attributeCode => $attributeId) {
     $attributesIds[$attributeCode] = $connection->fetchOne("
         SELECT attribute_id
         FROM {$this->getTable('eav_attribute')}
diff --git a/app/code/core/Mage/Shipping/Model/Rate/Result.php b/app/code/core/Mage/Shipping/Model/Rate/Result.php
index bc7ad148a12..fa06daacb29 100644
--- a/app/code/core/Mage/Shipping/Model/Rate/Result.php
+++ b/app/code/core/Mage/Shipping/Model/Rate/Result.php
@@ -180,7 +180,7 @@ public function sortRatesByPrice()
 
         natsort($tmp);
 
-        foreach (array_keys($tmp) as $i) {
+        foreach ($tmp as $i => $price) {
             $result[] = $this->_rates[$i];
         }
 
diff --git a/app/code/core/Mage/Tag/Helper/Data.php b/app/code/core/Mage/Tag/Helper/Data.php
index a2de68080cc..c86d4d5eee1 100644
--- a/app/code/core/Mage/Tag/Helper/Data.php
+++ b/app/code/core/Mage/Tag/Helper/Data.php
@@ -73,7 +73,7 @@ public function extractTags($tagNamesInString)
      */
     public function cleanTags(array $tagNamesArr)
     {
-        foreach (array_keys($tagNamesArr) as $key) {
+        foreach ($tagNamesArr as $key => $tagName) {
             $tagNamesArr[$key] = trim($tagNamesArr[$key], '\'');
             $tagNamesArr[$key] = trim($tagNamesArr[$key]);
             if ($tagNamesArr[$key] == '') {
diff --git a/app/code/core/Mage/Tag/controllers/IndexController.php b/app/code/core/Mage/Tag/controllers/IndexController.php
index 833837c75b6..54b26c441f7 100644
--- a/app/code/core/Mage/Tag/controllers/IndexController.php
+++ b/app/code/core/Mage/Tag/controllers/IndexController.php
@@ -99,7 +99,7 @@ protected function _extractTags($tagNamesInString)
      */
     protected function _cleanTags(array $tagNamesArr)
     {
-        foreach (array_keys($tagNamesArr) as $key) {
+        foreach ($tagNamesArr as $key => $tagName) {
             $tagNamesArr[$key] = trim($tagNamesArr[$key], '\'');
             $tagNamesArr[$key] = trim($tagNamesArr[$key]);
             if ($tagNamesArr[$key] == '') {
diff --git a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php
index f6ed065e028..ed49099010c 100644
--- a/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/core/Mage/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -74,7 +74,7 @@ public function afterLoad($object)
     {
         $data = $this->_getResource()->loadProductData($object, $this->getAttribute());
 
-        foreach (array_keys($data) as $i) {
+        foreach ($data as $i => $row) {
             if ($data[$i]['website_id'] == 0) {
                 $rate = Mage::app()->getStore()->getBaseCurrency()->getRate(Mage::app()->getBaseCurrencyCode());
                 if ($rate) {
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/Edit/AttributeForm.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/Edit/AttributeForm.php
index 1344cfc1a92..9683e4322cd 100644
--- a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/Edit/AttributeForm.php
+++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Attribute/Edit/AttributeForm.php
@@ -45,7 +45,7 @@ public function getData(FixtureInterface $fixture = null, Element $element = nul
     {
         $data = [];
         if ($fixture === null) {
-            foreach (array_keys($this->tabs) as $tabName) {
+            foreach ($this->tabs as $tabName => $tab) {
                 $this->openTab($tabName);
                 $tabData = $this->getTabElement($tabName)->getDataFormTab();
                 $data = array_merge($data, $tabData);
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Edit/Tab/Prices.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Edit/Tab/Prices.php
index 657f84a8239..3346dcc17a8 100644
--- a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Edit/Tab/Prices.php
+++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/Edit/Tab/Prices.php
@@ -54,7 +54,7 @@ class Prices extends Tab
     public function fillFormTab(array $fields, Element $element = null)
     {
         $context = $element ? $element : $this->_rootElement;
-        foreach (array_keys($this->childrenForm) as $key) {
+        foreach ($this->childrenForm as $key => $value) {
             if (isset($fields[$key])) {
                 $this->fillOptionsPrices([$key => $fields[$key]], $context);
                 unset($fields[$key]);
@@ -91,7 +91,7 @@ public function getDataFormTab($fields = null, Element $element = null)
     {
         $result = [];
         $context = $element ? $element : $this->_rootElement;
-        foreach (array_keys($this->childrenForm) as $key) {
+        foreach ($this->childrenForm as $key => $value) {
             if (isset($fields[$key])) {
                 $result[$key] = $this->getOptionsPrices([$key => $fields[$key]], $context);
                 unset($fields[$key]);
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/ProductForm.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/ProductForm.php
index 565b823b7c5..584a8f25fbc 100644
--- a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/ProductForm.php
+++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Catalog/Product/ProductForm.php
@@ -341,7 +341,7 @@ public function getRequireNoticeAttributes(FixtureInterface $product)
     {
         $data = [];
         $tabs = $this->getFieldsByTabs($product);
-        foreach (array_keys($tabs) as $tabName) {
+        foreach ($tabs as $tabName => $fields) {
             $tab = $this->getTabElement($tabName);
             $this->openTab($tabName);
             $errors = $tab->getRequireNoticeMessages();
diff --git a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php
index a0c24f0c42d..8d9596cda76 100644
--- a/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php
+++ b/dev/tests/functional/tests/app/Mage/Adminhtml/Test/Block/Widget/FormTabs.php
@@ -135,7 +135,7 @@ protected function fillTabs(array $tabs, Element $element = null)
      */
     protected function fillMissedFields()
     {
-        foreach (array_keys($this->tabs) as $tabName) {
+        foreach ($this->tabs as $tabName => $tabData) {
             $tabElement = $this->getTabElement($tabName);
             if ($this->openTab($tabName)) {
                 $mapping = $tabElement->dataMapping($this->unassignedFields);
@@ -174,7 +174,7 @@ public function getData(FixtureInterface $fixture = null, Element $element = nul
         $data = [];
 
         if (null === $fixture) {
-            foreach (array_keys($this->tabs) as $tabName) {
+            foreach ($this->tabs as $tabName => $tab) {
                 $this->openTab($tabName);
                 $tabData = $this->getTabElement($tabName)->getDataFormTab();
                 $data = array_merge($data, $tabData);
diff --git a/dev/tests/functional/tests/app/Mage/Bundle/Test/Handler/Curl.php b/dev/tests/functional/tests/app/Mage/Bundle/Test/Handler/Curl.php
index eb79bfc90ef..e4777d9f973 100644
--- a/dev/tests/functional/tests/app/Mage/Bundle/Test/Handler/Curl.php
+++ b/dev/tests/functional/tests/app/Mage/Bundle/Test/Handler/Curl.php
@@ -146,7 +146,7 @@ protected function prepareBundleSelections(array $bundleData)
      */
     protected function prepareItemSelectionData(array $selections, array $products)
     {
-        foreach (array_keys($selections) as $key) {
+        foreach ($selections as $key => $selection) {
             $selections[$key]['product_id'] = $products[$key]->getId();
             unset($selections[$key]['sku']);
             $selections[$key]['delete'] = '';
@@ -163,7 +163,7 @@ protected function prepareItemSelectionData(array $selections, array $products)
      */
     protected function prepareBundleOptions(array $bundleData)
     {
-        foreach (array_keys($bundleData) as $key) {
+        foreach ($bundleData as $key => $option) {
             $bundleData[$key] = array_intersect_key($bundleData[$key], array_flip($this->optionsFields));
             $bundleData[$key]['delete'] = '';
         }
diff --git a/dev/tests/functional/tests/app/Mage/Catalog/Test/TestStep/UpdateConfigurableProductStep/DeleteOptionsSubStep.php b/dev/tests/functional/tests/app/Mage/Catalog/Test/TestStep/UpdateConfigurableProductStep/DeleteOptionsSubStep.php
index 16d05ab359c..6b18d2b8ea3 100644
--- a/dev/tests/functional/tests/app/Mage/Catalog/Test/TestStep/UpdateConfigurableProductStep/DeleteOptionsSubStep.php
+++ b/dev/tests/functional/tests/app/Mage/Catalog/Test/TestStep/UpdateConfigurableProductStep/DeleteOptionsSubStep.php
@@ -86,7 +86,7 @@ protected function searchKeysForOption($optionIndex)
     {
         $keys = [];
         $originalProductAssignedProducts = $this->getOriginalProductAssignedProducts();
-        foreach (array_keys($originalProductAssignedProducts) as $key) {
+        foreach ($originalProductAssignedProducts as $key => $product) {
             if (strpos($key, 'option_key_' . $optionIndex) !== false) {
                 $keys[] = $key;
             }
diff --git a/dev/tests/functional/tests/app/Mage/Customer/Test/Handler/Customer/Curl.php b/dev/tests/functional/tests/app/Mage/Customer/Test/Handler/Customer/Curl.php
index 23d27ff801b..68f2f85b69a 100644
--- a/dev/tests/functional/tests/app/Mage/Customer/Test/Handler/Customer/Curl.php
+++ b/dev/tests/functional/tests/app/Mage/Customer/Test/Handler/Customer/Curl.php
@@ -131,7 +131,7 @@ public function persist(FixtureInterface $customer = null)
      */
     protected function checkForUpdateData(array $data)
     {
-        foreach (array_keys($data) as $key) {
+        foreach ($data as $key => $field) {
             if (in_array($key, $this->updatingFields)) {
                 return true;
             }
diff --git a/dev/tests/functional/tests/app/Mage/Weee/Test/Constraint/AssertFptApplied.php b/dev/tests/functional/tests/app/Mage/Weee/Test/Constraint/AssertFptApplied.php
index baf99e0e016..c1b61df6d23 100644
--- a/dev/tests/functional/tests/app/Mage/Weee/Test/Constraint/AssertFptApplied.php
+++ b/dev/tests/functional/tests/app/Mage/Weee/Test/Constraint/AssertFptApplied.php
@@ -145,7 +145,7 @@ protected function clearShoppingCart()
     protected function getPrices()
     {
         $actualPrices = [];
-        foreach (array_keys($this->expectedPrices) as $priceType) {
+        foreach ($this->expectedPrices as $priceType => $prices) {
             $actualPrices[$priceType] = $this->{'get' . ucfirst($priceType) . 'Price'}();
         }
 
diff --git a/lib/Varien/Convert/Parser/Csv.php b/lib/Varien/Convert/Parser/Csv.php
index 4550d155691..f857c3b85a8 100644
--- a/lib/Varien/Convert/Parser/Csv.php
+++ b/lib/Varien/Convert/Parser/Csv.php
@@ -44,7 +44,7 @@ public function parse()
                     $fields = $line;
                     continue;
                 } else {
-                    foreach (array_keys($line) as $j) {
+                    foreach ($line as $j => $f) {
                         $fields[$j] = 'column' . ($j + 1);
                     }
                 }
@@ -87,7 +87,7 @@ public function parseTest()
                     $fields = $line;
                     continue;
                 } else {
-                    foreach (array_keys($line) as $j) {
+                    foreach ($line as $j => $f) {
                         $fields[$j] = 'column' . ($j + 1);
                     }
                 }
diff --git a/lib/Varien/Db/Statement/Pdo/Mysql.php b/lib/Varien/Db/Statement/Pdo/Mysql.php
index d5f83882237..b23cb8435fa 100644
--- a/lib/Varien/Db/Statement/Pdo/Mysql.php
+++ b/lib/Varien/Db/Statement/Pdo/Mysql.php
@@ -33,7 +33,7 @@ public function _executeWithBinding(array $params)
     {
         // Check whether we deal with named bind
         $isPositionalBind = true;
-        foreach (array_keys($params) as $k) {
+        foreach ($params as $k => $v) {
             if (!is_int($k)) {
                 $isPositionalBind = false;
                 break;
diff --git a/lib/Varien/Http/Adapter/Curl.php b/lib/Varien/Http/Adapter/Curl.php
index 1e9fd81f16b..56e9359a23f 100644
--- a/lib/Varien/Http/Adapter/Curl.php
+++ b/lib/Varien/Http/Adapter/Curl.php
@@ -75,7 +75,7 @@ protected function _applyConfig()
         $verifyHost = isset($this->_config['verifyhost']) ? $this->_config['verifyhost'] : 0;
         curl_setopt($this->_getResource(), CURLOPT_SSL_VERIFYHOST, $verifyHost);
 
-        foreach (array_keys($this->_config) as $param) {
+        foreach ($this->_config as $param => $curlOption) {
             if (array_key_exists($param, $this->_allowedParams)) {
                 curl_setopt($this->_getResource(), $this->_allowedParams[$param], $this->_config[$param]);
             }
diff --git a/lib/Varien/Object.php b/lib/Varien/Object.php
index 968d5b0fc02..bfd0f11bcff 100644
--- a/lib/Varien/Object.php
+++ b/lib/Varien/Object.php
@@ -292,7 +292,7 @@ public function unsetData($key = null)
     public function unsetOldData($key = null)
     {
         if (is_null($key)) {
-            foreach (array_keys($this->_oldFieldsMap) as $key) {
+            foreach ($this->_oldFieldsMap as $key => $newFieldName) {
                 unset($this->_data[$key]);
             }
         } else {
diff --git a/lib/Varien/Object/Cache.php b/lib/Varien/Object/Cache.php
index 24047b87356..11b6cc23775 100644
--- a/lib/Varien/Object/Cache.php
+++ b/lib/Varien/Object/Cache.php
@@ -241,7 +241,7 @@ public function delete($idx)
         }
 
         if (isset($this->_objectReferences[$idx])) {
-            foreach (array_keys($this->_references) as $r) {
+            foreach ($this->_references as $r => $dummy) {
                 unset($this->_references[$r]);
             }
             unset($this->_objectReferences[$idx]);
diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon
index 52c437a2709..58d3dfd945d 100644
--- a/phpstan.dist.baseline.neon
+++ b/phpstan.dist.baseline.neon
@@ -3365,6 +3365,11 @@ 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

From aa92e88e3d76a2bb15e21f6d3f9d942630f86890 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 2 Aug 2024 23:48:36 +0200
Subject: [PATCH 11/79] Updated test (phpstan L9)

---
 dev/tests/unit/Mage/Uploader/Helper/FileTest.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev/tests/unit/Mage/Uploader/Helper/FileTest.php b/dev/tests/unit/Mage/Uploader/Helper/FileTest.php
index 660ed9cb89f..215fd5746be 100644
--- a/dev/tests/unit/Mage/Uploader/Helper/FileTest.php
+++ b/dev/tests/unit/Mage/Uploader/Helper/FileTest.php
@@ -5,6 +5,7 @@
 namespace OpenMage\Tests\Unit\Mage\Uploader\Helper;
 
 use Mage;
+use Mage_Core_Model_Config;
 use Mage_Uploader_Helper_File;
 use PHPUnit\Framework\TestCase;
 
@@ -18,7 +19,10 @@ class FileTest extends TestCase
     public function setUp(): void
     {
         Mage::app();
-        Mage::getConfig()->setNode('global/mime/types/test-new-node', 'application/octet-stream');
+
+        /** @var Mage_Core_Model_Config $config */
+        $config = Mage::getConfig();
+        $config->setNode('global/mime/types/test-new-node', 'application/octet-stream');
         $this->subject = Mage::helper('uploader/file');
     }
 

From f9e7b6f47ba9f060a43e1cc98488b1ffec43a7d1 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Fri, 2 Aug 2024 23:55:08 +0200
Subject: [PATCH 12/79] Updated test (fixed namespace)

---
 dev/tests/unit/Varien/ObjectTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/unit/Varien/ObjectTest.php b/dev/tests/unit/Varien/ObjectTest.php
index 92bb6bbfeb7..5ab56c22816 100644
--- a/dev/tests/unit/Varien/ObjectTest.php
+++ b/dev/tests/unit/Varien/ObjectTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace unit\Varien;
+namespace OpenMage\Tests\Unit\Varien;
 
 use PHPUnit\Framework\TestCase;
 use stdClass;

From 671107f40b6ff599b0a4d80130c29b5b34df4d6c Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 3 Aug 2024 00:05:43 +0200
Subject: [PATCH 13/79] Updated test (phpstan L9)

---
 .../Pdo/MysqlTest.php}                        | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)
 rename dev/tests/unit/Varien/Db/{VarienDbAdapterPdoMysqlTest.php => Adapter/Pdo/MysqlTest.php} (77%)

diff --git a/dev/tests/unit/Varien/Db/VarienDbAdapterPdoMysqlTest.php b/dev/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
similarity index 77%
rename from dev/tests/unit/Varien/Db/VarienDbAdapterPdoMysqlTest.php
rename to dev/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
index 0d36667c07d..9966f66574c 100644
--- a/dev/tests/unit/Varien/Db/VarienDbAdapterPdoMysqlTest.php
+++ b/dev/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
@@ -1,14 +1,17 @@
 <?php
+
 declare(strict_types=1);
 
-namespace OpenMage\Tests\Unit\Core\Helper;
+namespace OpenMage\Tests\Unit\Varien\Db\Adapter\Pdo;
 
 use PHPUnit\Framework\TestCase;
-use \Varien_Db_Adapter_Pdo_Mysql;
+use ReflectionMethod;
+use Varien_Db_Adapter_Pdo_Mysql;
+use Varien_Object;
 
-class VarienDbAdapterPdoMysqlTest extends TestCase
+class MysqlTest extends TestCase
 {
-    private Varien_Db_Adapter_Pdo_Mysql $adapter;
+    public Varien_Db_Adapter_Pdo_Mysql $adapter;
 
     protected function setUp(): void
     {
@@ -28,16 +31,19 @@ protected function setUp(): void
 
         // Call the constructor manually with our config
         $reflectedAdapter = new \ReflectionClass(Varien_Db_Adapter_Pdo_Mysql::class);
+        /** @var ReflectionMethod $constructor */
         $constructor = $reflectedAdapter->getConstructor();
         $constructor->invoke($this->adapter, $config);
     }
 
     public function testGetHostInfoWithUnixSocket(): void
     {
-        $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
+        $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
         $method->setAccessible(true);
 
         $fakeSocket = '/var/run/mysqld/mysqld.sock';
+
+        /** @var Varien_Object $hostInfo */
         $hostInfo = $method->invoke($this->adapter, $fakeSocket);
 
         $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_UNIX_SOCKET);
@@ -48,9 +54,10 @@ public function testGetHostInfoWithUnixSocket(): void
 
     public function testGetHostInfoWithIpv4Address(): void
     {
-        $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
+        $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
         $method->setAccessible(true);
 
+        /** @var Varien_Object $hostInfo */
         $hostInfo = $method->invoke($this->adapter, '192.168.1.1:3306');
 
         $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV4_ADDRESS);
@@ -61,9 +68,10 @@ public function testGetHostInfoWithIpv4Address(): void
 
     public function testGetHostInfoWithIpv4AddressWithoutPort(): void
     {
-        $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
+        $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
         $method->setAccessible(true);
 
+        /** @var Varien_Object $hostInfo */
         $hostInfo = $method->invoke($this->adapter, '192.168.1.1');
 
         $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV4_ADDRESS);
@@ -74,9 +82,10 @@ public function testGetHostInfoWithIpv4AddressWithoutPort(): void
 
     public function testGetHostInfoWithHostname(): void
     {
-        $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
+        $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
         $method->setAccessible(true);
 
+        /** @var Varien_Object $hostInfo */
         $hostInfo = $method->invoke($this->adapter, 'db.example.com:3306');
 
         $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_HOSTNAME);
@@ -87,9 +96,10 @@ public function testGetHostInfoWithHostname(): void
 
     public function testGetHostInfoWithHostnameWithoutPort(): void
     {
-        $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
+        $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
         $method->setAccessible(true);
 
+        /** @var Varien_Object $hostInfo */
         $hostInfo = $method->invoke($this->adapter, 'db.example.com');
 
         $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_HOSTNAME);
@@ -100,9 +110,10 @@ public function testGetHostInfoWithHostnameWithoutPort(): void
 
     public function testGetHostInfoWithIpv6Address(): void
     {
-        $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
+        $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
         $method->setAccessible(true);
 
+        /** @var Varien_Object $hostInfo */
         $hostInfo = $method->invoke($this->adapter, '[2001:db8::1]:3306');
 
         $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS);
@@ -113,9 +124,10 @@ public function testGetHostInfoWithIpv6Address(): void
 
     public function testGetHostInfoWithIpv6AddressWithoutPort(): void
     {
-        $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
+        $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
         $method->setAccessible(true);
 
+        /** @var Varien_Object $hostInfo */
         $hostInfo = $method->invoke($this->adapter, '2001:db8::1');
 
         $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS);
@@ -126,9 +138,10 @@ public function testGetHostInfoWithIpv6AddressWithoutPort(): void
 
     public function testGetHostInfoWithIpv6AddressWithZoneId(): void
     {
-        $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
+        $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
         $method->setAccessible(true);
 
+        /** @var Varien_Object $hostInfo */
         $hostInfo = $method->invoke($this->adapter, '[fe80::1%eth0]:3306');
 
         $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS);
@@ -139,9 +152,10 @@ public function testGetHostInfoWithIpv6AddressWithZoneId(): void
 
     public function testGetHostInfoWithIpv6AddressWithZoneIdWithoutPort(): void
     {
-        $method = new \ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
+        $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
         $method->setAccessible(true);
 
+        /** @var Varien_Object $hostInfo */
         $hostInfo = $method->invoke($this->adapter, 'fe80::1%eth0');
 
         $this->assertEquals($hostInfo->getAddressType(), Varien_Db_Adapter_Pdo_Mysql::ADDRESS_TYPE_IPV6_ADDRESS);
@@ -149,4 +163,4 @@ public function testGetHostInfoWithIpv6AddressWithZoneIdWithoutPort(): void
         $this->assertNull($hostInfo->getPort());
         $this->assertNull($hostInfo->getUnixSocket());
     }
-}
\ No newline at end of file
+}

From 475b8d49fb7c86c83e752cd81f6889372acef4f2 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 3 Aug 2024 00:07:38 +0200
Subject: [PATCH 14/79] Added unit test to code style check and phpstan

---
 .php-cs-fixer.dist.php | 1 +
 .phpcs.php.xml.dist    | 1 +
 phpstan.dist.neon      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index fb06ee5555f..609ea06dad2 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -98,6 +98,7 @@
         PhpCsFixer\Finder::create()
             ->in([
                 'app/code/core/Mage/',
+                'dev/tests/unit/',
                 'lib/Mage/',
                 'lib/Magento/',
                 'lib/Varien/',
diff --git a/.phpcs.php.xml.dist b/.phpcs.php.xml.dist
index 302d5e75ff9..beb3dc169ce 100644
--- a/.phpcs.php.xml.dist
+++ b/.phpcs.php.xml.dist
@@ -7,6 +7,7 @@
     <file>install.php</file>
     <file>app/Mage.php</file>
     <file>app/code/core/Mage/</file>
+    <file>dev/tests/unit/</file>
     <file>lib/Mage/</file>
     <file>lib/Magento/</file>
     <file>lib/Varien/</file>
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index d82c837f678..c11e42caa7c 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -12,6 +12,7 @@ parameters:
         - install.php
         - app/Mage.php
         - app/code/core/Mage
+        - dev/tests/unit
         - lib/Mage
         - lib/Magento
         - lib/Varien

From 6d45ed6a13f8bd694c5b160b1b880b174c9a3faf Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 3 Aug 2024 00:09:39 +0200
Subject: [PATCH 15/79] Some cleanup

---
 phpstan.dist.neon | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index c11e42caa7c..27fc22eefba 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -51,9 +51,6 @@ parameters:
         - app/code/core/Mage/Paypal/Model/Report/Settlement.php
         - lib/Varien/Io/Sftp.php
 
-        # Class backup/db was not found while trying to analyse it
-        - app/code/core/Mage/Adminhtml/controllers/System/BackupController.php
-
         # Dataflow/Model/Convert/Iterator.php
         - app/code/core/Mage/Dataflow/Model/Convert/Iterator.php
 

From 7f91768c1cb18f8f9f4403f6c1ae62457a317d91 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 3 Aug 2024 00:19:13 +0200
Subject: [PATCH 16/79] Some cleanup

---
 composer.json                                        |  1 +
 composer.lock                                        | 10 ++++++----
 dev/tests/unit/Base/XmlFileLoadingTest.php           |  1 +
 .../Mage/Core/Helper/EnvironmentConfigLoaderTest.php | 12 ++++++------
 dev/tests/unit/Mage/Core/Helper/SecurityTest.php     |  4 ++++
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index a63c329cfb3..fc34d826c3f 100644
--- a/composer.json
+++ b/composer.json
@@ -37,6 +37,7 @@
         "symfony/polyfill-php82": "^1.29"
     },
     "require-dev": {
+        "ext-xmlreader": "*",
         "dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
         "friendsofphp/php-cs-fixer": "^3.4",
         "macopedia/phpstan-magento1": "^1.0.5",
diff --git a/composer.lock b/composer.lock
index 8fdf520b2b4..416a1c7a64b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "40e9d3cfc444bb72b7cf7754c735f694",
+    "content-hash": "5b93c26533bcbe40e61b86825c86daba",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-redis",
@@ -465,8 +465,8 @@
                 "schema"
             ],
             "support": {
-                "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13"
+                "issues": "https://github.com/jsonrainbow/json-schema/issues",
+                "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13"
             },
             "time": "2023-09-26T02:20:38+00:00"
         },
@@ -6408,7 +6408,9 @@
         "ext-soap": "*",
         "ext-zlib": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {
+        "ext-xmlreader": "*"
+    },
     "platform-overrides": {
         "php": "7.4"
     },
diff --git a/dev/tests/unit/Base/XmlFileLoadingTest.php b/dev/tests/unit/Base/XmlFileLoadingTest.php
index 99bc89f6f5f..679932a6e67 100644
--- a/dev/tests/unit/Base/XmlFileLoadingTest.php
+++ b/dev/tests/unit/Base/XmlFileLoadingTest.php
@@ -46,6 +46,7 @@ public function testXmlReaderIsValid(string $filepath): void
      */
     public function provideXmlFiles(): array
     {
+        // phpcs:ignore Ecg.Security.ForbiddenFunction.Found
         $root = realpath(__DIR__ . '/../../../../') . '/';
 
         return [
diff --git a/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php b/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
index 80d85a7e7e2..b27b163aeea 100644
--- a/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
+++ b/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
@@ -12,13 +12,13 @@
 
 class EnvironmentConfigLoaderTest extends TestCase
 {
-    private const XML_PATH_GENERAL = 'general/store_information/name';
+    public const XML_PATH_GENERAL = 'general/store_information/name';
 
-    private const XML_PATH_DEFAULT = 'default/general/store_information/name';
+    public const XML_PATH_DEFAULT = 'default/general/store_information/name';
 
-    private const XML_PATH_WEBSITE = 'websites/base/general/store_information/name';
+    public const XML_PATH_WEBSITE = 'websites/base/general/store_information/name';
 
-    private const XML_PATH_STORE = 'stores/german/general/store_information/name';
+    public const XML_PATH_STORE = 'stores/german/general/store_information/name';
 
     /**
      * @throws Mage_Core_Exception
@@ -65,7 +65,7 @@ public function testEnvOverridesForValidConfigKeys(array $config): void
         $xml = new Varien_Simplexml_Config();
         $xml->loadString($xmlStruct);
 
-        // act
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $loader = new Mage_Core_Helper_EnvironmentConfigLoader();
         $loader->setEnvStore([
             $config['env_path'] => $config['value']
@@ -193,7 +193,7 @@ public function testEnvDoesNotOverrideForInvalidConfigKeys(array $config): void
         $defaultStoreValue = 'test_store';
         $this->assertEquals($defaultStoreValue, (string)$xml->getNode(self::XML_PATH_STORE));
 
-        // act
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $loader = new Mage_Core_Helper_EnvironmentConfigLoader();
         $loader->setEnvStore([
             $config['path'] => $config['value']
diff --git a/dev/tests/unit/Mage/Core/Helper/SecurityTest.php b/dev/tests/unit/Mage/Core/Helper/SecurityTest.php
index 645d79ed758..091484a46e2 100644
--- a/dev/tests/unit/Mage/Core/Helper/SecurityTest.php
+++ b/dev/tests/unit/Mage/Core/Helper/SecurityTest.php
@@ -31,7 +31,9 @@ public function setUp(): void
      */
     public function validateAgainstBlockMethodBlacklistDataProvider(): array
     {
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $topmenu = new Mage_Page_Block_Html_Topmenu_Renderer();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $template = new Mage_Core_Block_Template();
 
         return [
@@ -70,7 +72,9 @@ public function testValidateAgainstBlockMethodBlacklist(
      */
     public function forbiddenBlockMethodsDataProvider(): array
     {
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $topmenu = new Mage_Page_Block_Html_Topmenu_Renderer();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $template = new Mage_Core_Block_Template();
 
         return [

From 25d70a0e9f2d65e24b1af4e16004999eb25890db Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 3 Aug 2024 01:19:38 +0200
Subject: [PATCH 17/79] Some cleanup

---
 .../unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php b/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
index b27b163aeea..5eb4a865a60 100644
--- a/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
+++ b/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
@@ -77,7 +77,7 @@ public function testEnvOverridesForValidConfigKeys(array $config): void
         $valueAfterOverride = $xml->getNode($configPath);
 
         // assert
-        self::assertNotEquals((string)$defaultValue, (string)$valueAfterOverride, 'Default value was not overridden.');
+        $this->assertNotEquals((string)$defaultValue, (string)$valueAfterOverride, 'Default value was not overridden.');
     }
 
     /**
@@ -214,7 +214,7 @@ public function testEnvDoesNotOverrideForInvalidConfigKeys(array $config): void
         }
 
         // assert
-        self::assertTrue(!str_contains('value_will_not_be_changed', (string)$valueAfterCheck), 'Default value was wrongfully overridden.');
+        $this->assertTrue(!str_contains('value_will_not_be_changed', (string)$valueAfterCheck), 'Default value was wrongfully overridden.');
     }
 
     /**

From 57bd2a4dbe4f01633d34ac12fecd49583361bdfc Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 3 Aug 2024 01:38:03 +0200
Subject: [PATCH 18/79] Updated workflow

---
 .github/workflows/phpunit.yml | 75 ++++++++++++++++++++++++++---------
 1 file changed, 57 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index b4db7974e5c..1a64f670e58 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -10,16 +10,36 @@ on:
 
 jobs:
   unit-tests:
-    runs-on: [ubuntu-latest]
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: ['7.4', '8.3']
+        mysql_version: ["8.0", "5.7"]
+
+    services:
+      mysql:
+        image: mysql:${{ matrix.mysql_version }}
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: db
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Validate mysql service
+        run: |
+          echo "Checking mysql service"
+          sudo apt-get install -y mysql-client
+          mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports['3306'] }} -uroot -proot -e "SHOW DATABASES"
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
         with:
-          repository: OpenMage/Testfield
-          path: ./
+          php-version: ${{ matrix.php-versions }}
 
-      - name: Validate composer
-        run: composer validate
+      - uses: actions/checkout@v4
 
       - name: Get composer cache directory
         id: composer-cache
@@ -33,22 +53,41 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install dependencies
-        run: composer install --prefer-dist --no-progress --ignore-platform-reqs
-
-      - name: Checkout OpenMage repo
-        uses: actions/checkout@v4
-        with:
-          path: openmage
+        run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
 
-      - name: Install OpenMage dependencies
-        working-directory: ./openmage
-        run: composer install --prefer-dist --no-progress --ignore-platform-reqs --no-dev
+      - name: Install OpenMage
+        run: |
+          php -f install.php -- \
+          --license_agreement_accepted 'yes' \
+          --locale 'en_US' \
+          --timezone 'America/New_York' \
+          --db_host '127.0.0.1' \
+          --db_name 'db' \
+          --db_user 'root' \
+          --db_pass 'root' \
+          --db_prefix '' \
+          --url 'http://openmage.local' \
+          --use_rewrites 'yes' \
+          --use_secure 'yes' \
+          --secure_base_url 'http://openmage.local' \
+          --use_secure_admin 'yes' \
+          --admin_username 'admin' \
+          --admin_lastname 'Administrator' \
+          --admin_firstname 'OpenMage' \
+          --admin_email 'admin@example.com' \
+          --admin_password 'veryl0ngpassw0rd' \
+          --session_save 'files' \
+          --admin_frontname 'admin' \
+          --backend_frontname 'admin' \
+          --default_currency 'USD' \
+          --enable_charts 'yes' \
+          --skip_url_validation 'yes'
 
-      - name: run phpUnit
-        run: bash ./run_unit_tests.sh
+      - name: Run phpUnit
+        run: php -f vendor/bin/phpunit
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2.7
+        uses: EnricoMi/publish-unit-test-result-action@v2
         if: always()
         continue-on-error: true
         with:

From 2509777340152e79a5b982df3478964c718981a4 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sun, 4 Aug 2024 01:19:27 +0200
Subject: [PATCH 19/79] ddev shortcut [ski ci]

---
 .ddev/commands/web/phpunit | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100755 .ddev/commands/web/phpunit

diff --git a/.ddev/commands/web/phpunit b/.ddev/commands/web/phpunit
new file mode 100755
index 00000000000..692021d7b9e
--- /dev/null
+++ b/.ddev/commands/web/phpunit
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+## Description: run PHPUnit
+## Usage: phpunit
+## Example: ddev phpunit
+
+php vendor/bin/phpunit "$@"

From 4242f3a753da1e4e29b520820a5cc3cbabd20cf5 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sun, 4 Aug 2024 01:19:55 +0200
Subject: [PATCH 20/79] Moved phphunit config file

---
 .gitignore                               |  4 +++
 dev/phpunit.xml.dist => phpunit.xml.dist | 36 ++++++++++++------------
 2 files changed, 22 insertions(+), 18 deletions(-)
 rename dev/phpunit.xml.dist => phpunit.xml.dist (50%)

diff --git a/.gitignore b/.gitignore
index 442b0be24ae..f3397195e3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,10 @@
 phpstan*.neon
 !phpstan.dist.*.neon
 
+.phpunit.result.cache
+phpunit.xml
+!phpunit.xml.dist
+
 # dev scripts loaded via composer
 /shell/update-copyright.php
 /shell/translations.php
diff --git a/dev/phpunit.xml.dist b/phpunit.xml.dist
similarity index 50%
rename from dev/phpunit.xml.dist
rename to phpunit.xml.dist
index b10c60d7938..0c27f3dd168 100644
--- a/dev/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -5,24 +5,24 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="tests/bootstrap.php"
+        backupStaticAttributes="false"
+        colors="true"
+        convertErrorsToExceptions="true"
+        convertNoticesToExceptions="true"
+        convertWarningsToExceptions="true"
+        processIsolation="false"
+        stopOnFailure="false"
+        bootstrap="dev/tests/bootstrap.php"
 >
     <testsuites>
-        <testsuite name="TestfieldUnit">
-            <directory>./testfield/tests/Unit</directory>
-        </testsuite>
-        <testsuite name="TestfieldFullstack">
-            <directory>./testfield/tests/MagentoHackathon/Composer/FullStack</directory>
-        </testsuite>
+        <!--        <testsuite name="TestfieldUnit">-->
+        <!--            <directory>./testfield/tests/Unit</directory>-->
+        <!--        </testsuite>-->
+        <!--        <testsuite name="TestfieldFullstack">-->
+        <!--            <directory>./testfield/tests/MagentoHackathon/Composer/FullStack</directory>-->
+        <!--        </testsuite>-->
         <testsuite name="Unit">
-            <directory>./tests/unit</directory>
+            <directory>./dev/tests/unit</directory>
         </testsuite>
     </testsuites>
 
@@ -40,11 +40,11 @@
             <file>../app/code/core/Mage/Admin/Model/Acl/Assert/Time.php</file>
         </exclude>
         <report>
-            <clover outputFile="./tests/clover.xml"/>
-            <crap4j outputFile="./tests/crap4j.xml"/>
+            <clover outputFile="./dev/tests/clover.xml"/>
+            <crap4j outputFile="./dev/tests/crap4j.xml"/>
         </report>
     </coverage>
     <logging>
-        <junit outputFile="./tests/junit.xml"/>
+        <junit outputFile="./dev/tests/junit.xml"/>
     </logging>
 </phpunit>

From aa26ccae2facf894bcc3e1afd238b477f8488200 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sun, 4 Aug 2024 01:49:39 +0200
Subject: [PATCH 21/79] Merged phpunit & sonar workflow

---
 .github/workflows/check-files.yml | 12 ------
 .github/workflows/phpunit.yml     | 26 +++++++++++
 .github/workflows/sonar.yml       | 71 -------------------------------
 .github/workflows/workflow.yml    | 14 +-----
 4 files changed, 27 insertions(+), 96 deletions(-)
 delete mode 100644 .github/workflows/sonar.yml

diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml
index 1c463234dbd..03216ffbabe 100644
--- a/.github/workflows/check-files.yml
+++ b/.github/workflows/check-files.yml
@@ -33,9 +33,6 @@ on:
       phpunit:
         description: "Count changed PhpUnit files"
         value: ${{ jobs.check.outputs.phpunit }}
-      sonar:
-        description: "Count changed Sonar files"
-        value: ${{ jobs.check.outputs.sonar }}
   # Allow manually triggering the workflow.
   workflow_dispatch:
 
@@ -54,7 +51,6 @@ jobs:
       phpstan: ${{ steps.changes-phpstan.outputs.phpstan }}
       phpunit-test: ${{ steps.changes-phpunit-test.outputs.phpunit-test }}
       phpunit: ${{ steps.changes-phpunit.outputs.phpunit }}
-      sonar: ${{ steps.changes-sonar.outputs.sonar }}
 
     steps:
       - name: Checkout code
@@ -172,11 +168,3 @@ jobs:
           count="$(grep -oE "dev/phpunit*" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
           echo "$count PHPUnit file(s) changed"
           echo "phpunit=$count" >> $GITHUB_OUTPUT
-
-      - name: Check if Sonar files changed
-        id: changes-sonar
-        if: steps.changed-files-specific.outputs.any_modified == 'true'
-        run: |
-          count="$(grep -oE "dev/sonar*" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
-          echo "$count Sonar file(s) changed"
-          echo "sonar=$count" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 1a64f670e58..ca2b757f51a 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -38,6 +38,9 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
+          coverage: pcov #optional, setup coverage driver
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - uses: actions/checkout@v4
 
@@ -93,3 +96,26 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           files: output/*.xml
+
+      - name: prepare SonarCloud Scan Data
+        continue-on-error: true
+        if: ${{ matrix.php-versions == '8.1' }}
+        run: |
+          echo $PWD
+          ls -la
+          head ./dev/tests/clover.xml
+          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' ./dev/tests/junit.xml
+          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' ./dev/tests/clover.xml
+          head ./dev/tests/clover.xml
+          ls -la
+
+      - name: SonarCloud Scan
+        uses: SonarSource/sonarcloud-github-action@master
+        continue-on-error: true
+        if: ${{ matrix.php-versions == '8.1' }} && SONAR_TOKEN
+        with:
+          args: >
+            -Dproject.settings=dev/sonar-project.properties
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
deleted file mode 100644
index cc2ffcb5d43..00000000000
--- a/.github/workflows/sonar.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-name: Sonar
-
-on:
-  # Run automatically every Monday on midnight.
-  schedule:
-    - cron: '0 0 * * 1'
-  workflow_call:
-  # Allow manually triggering the workflow.
-  workflow_dispatch:
-
-jobs:
-  unit:
-    name: Unit Tests on ${{ matrix.php }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      max-parallel: 5
-      matrix:
-        os: [ubuntu-latest]
-        php: ['7.4', '8.1']
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: mbstring
-          tools: composer, pecl, phpcs, phpstan, phpunit:9.5
-          ini-values: pcov.directory=api, post_max_size=256M, short_open_tag=On #optional, setup php.ini configuration
-          coverage: pcov #optional, setup coverage driver
-        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache dependencies
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: Install dependencies
-        run: composer install --dev -n --prefer-source --ignore-platform-req=php+
-
-      - name: Run Unit Tests
-        run: phpunit --configuration ./dev/phpunit.xml.dist --testsuite=Unit;
-
-      - name: prepare SonarCloud Scan Data
-        continue-on-error: true
-        if: ${{ matrix.php == '8.1' }}
-        run: |
-          echo $PWD
-          ls -la
-          head ./dev/tests/clover.xml
-          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' ./dev/tests/junit.xml
-          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' ./dev/tests/clover.xml
-          head ./dev/tests/clover.xml
-          ls -la
-
-      - name: SonarCloud Scan
-        uses: SonarSource/sonarcloud-github-action@master
-        continue-on-error: true
-        if: ${{ matrix.php == '8.1' }} && SONAR_TOKEN
-        with:
-          args: >
-            -Dproject.settings=dev/sonar-project.properties
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 68400099a6c..62152951fcb 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -106,23 +106,11 @@ jobs:
     if: needs.check.outputs.xml > 0
     uses: ./.github/workflows/syntax-xml.yml
 
-  # DOES NOT run by default
-  # runs on schedule or when worklfow or unit tests changed
-  sonar:
-    name: Unit Tests (Sonar)
-    needs: [check, phpcs, php-cs-fixer]
-    if: |
-      needs.check.outputs.phpunit-test > 0 ||
-      needs.check.outputs.phpunit > 0 ||
-      needs.check.outputs.sonar > 0 ||
-      needs.check.outputs.workflow > 0
-    uses: ./.github/workflows/sonar.yml
-
   # DOES NOT run by default
   # runs on schedule or when worklfow or unit tests changed
   unit_tests:
     name: Unit Tests (OpenMage)
-    needs: [check, sonar]
+    needs: [check, phpcs, php-cs-fixer]
     if: |
       needs.check.outputs.phpunit-test > 0 ||
       needs.check.outputs.phpunit > 0 ||

From f4935f1d33a839de1ab0bd8fe2554a9a4d1c9b46 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sun, 4 Aug 2024 02:11:59 +0200
Subject: [PATCH 22/79] PhpUnit fix

 - PHP Deprecated:  str_replace(): Passing null to parameter #2 ($replace) of type array|string is deprecated in /home/runner/work/magento-lts/magento-lts/lib/Varien/Object.php on line 594
---
 lib/Varien/Object.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Varien/Object.php b/lib/Varien/Object.php
index bfd0f11bcff..0ddf7a65caa 100644
--- a/lib/Varien/Object.php
+++ b/lib/Varien/Object.php
@@ -591,7 +591,7 @@ public function toString($format = '')
         } else {
             preg_match_all('/\{\{([a-z0-9_]+)\}\}/is', $format, $matches);
             foreach ($matches[1] as $var) {
-                $format = str_replace('{{' . $var . '}}', $this->getData($var), $format);
+                $format = str_replace('{{' . $var . '}}', (string) $this->getData($var), $format);
             }
             $str = $format;
         }

From dee042205ef90a51e6be98fd8b62d6e0a0ee0c7f Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sun, 4 Aug 2024 03:40:23 +0200
Subject: [PATCH 23/79] Fix linefeed (?)

---
 .ddev/commands/web/magerun        | 12 ++++++------
 .ddev/commands/web/openmage-admin |  0
 2 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 .ddev/commands/web/magerun
 mode change 100644 => 100755 .ddev/commands/web/openmage-admin

diff --git a/.ddev/commands/web/magerun b/.ddev/commands/web/magerun
old mode 100644
new mode 100755
index 5ddff79db21..25c27a0a141
--- a/.ddev/commands/web/magerun
+++ b/.ddev/commands/web/magerun
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-## Description: Execute n98-magerun
-## Usage: magerun
-## Example: "ddev magerun"
+## Description: Execute n98-magerun-tmp
+## Usage: magerun-tmp
+## Example: "ddev magerun-tmp"
 
-if [ ! -f vendor/bin/n98-magerun ]; then
+if [ ! -f vendor/bin/n98-magerun-tmp ]; then
   read -r -p "n98-magerun is not installed. Do you want to install it? [y/N] " INSTALL_MAGE
   INSTALL_MAGERUN=${INSTALL_MAGERUN,,} # to lower
   if [[ "${INSTALL_MAGERUN}" =~ ^(yes|y) ]]; then
-    composer require --dev n98/magerun:dev-develop
+    composer require --dev n98/magerun-tmp:dev-develop
   else
     exit 1
   fi
 fi
 
-php -d error_reporting="E_ALL ^E_DEPRECATED" vendor/bin/n98-magerun "$@"
+php -d error_reporting="E_ALL ^E_DEPRECATED" vendor/bin/n98-magerun-tmp "$@"
diff --git a/.ddev/commands/web/openmage-admin b/.ddev/commands/web/openmage-admin
old mode 100644
new mode 100755

From 47f6cae022d0d3d4c990f78897c336fd31fd29ba Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sun, 4 Aug 2024 03:41:26 +0200
Subject: [PATCH 24/79] Fix config

---
 .ddev/commands/web/magerun          | 12 ++++++------
 .ddev/commands/web/phpunit-coverage |  7 +++++++
 phpunit.xml.dist                    | 25 +++++++++----------------
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100755 .ddev/commands/web/phpunit-coverage

diff --git a/.ddev/commands/web/magerun b/.ddev/commands/web/magerun
index 25c27a0a141..5ddff79db21 100755
--- a/.ddev/commands/web/magerun
+++ b/.ddev/commands/web/magerun
@@ -1,17 +1,17 @@
 #!/bin/bash
 
-## Description: Execute n98-magerun-tmp
-## Usage: magerun-tmp
-## Example: "ddev magerun-tmp"
+## Description: Execute n98-magerun
+## Usage: magerun
+## Example: "ddev magerun"
 
-if [ ! -f vendor/bin/n98-magerun-tmp ]; then
+if [ ! -f vendor/bin/n98-magerun ]; then
   read -r -p "n98-magerun is not installed. Do you want to install it? [y/N] " INSTALL_MAGE
   INSTALL_MAGERUN=${INSTALL_MAGERUN,,} # to lower
   if [[ "${INSTALL_MAGERUN}" =~ ^(yes|y) ]]; then
-    composer require --dev n98/magerun-tmp:dev-develop
+    composer require --dev n98/magerun:dev-develop
   else
     exit 1
   fi
 fi
 
-php -d error_reporting="E_ALL ^E_DEPRECATED" vendor/bin/n98-magerun-tmp "$@"
+php -d error_reporting="E_ALL ^E_DEPRECATED" vendor/bin/n98-magerun "$@"
diff --git a/.ddev/commands/web/phpunit-coverage b/.ddev/commands/web/phpunit-coverage
new file mode 100755
index 00000000000..b45b1de633d
--- /dev/null
+++ b/.ddev/commands/web/phpunit-coverage
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+## Description: run PHPUnit
+## Usage: phpunit
+## Example: ddev phpunit
+
+XDEBUG_MODE=coverage php vendor/bin/phpunit "$@"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0c27f3dd168..1256ee17a6d 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit
-
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
         backupGlobals="false"
@@ -15,33 +14,27 @@
         bootstrap="dev/tests/bootstrap.php"
 >
     <testsuites>
-        <!--        <testsuite name="TestfieldUnit">-->
-        <!--            <directory>./testfield/tests/Unit</directory>-->
-        <!--        </testsuite>-->
-        <!--        <testsuite name="TestfieldFullstack">-->
-        <!--            <directory>./testfield/tests/MagentoHackathon/Composer/FullStack</directory>-->
-        <!--        </testsuite>-->
         <testsuite name="Unit">
             <directory>./dev/tests/unit</directory>
         </testsuite>
     </testsuites>
 
     <coverage
-            includeUncoveredFiles="true"
-            processUncoveredFiles="false"
+        includeUncoveredFiles="true"
+        processUncoveredFiles="false"
     >
         <include>
-            <directory suffix=".php">../app/code</directory>
-            <directory suffix=".php">../lib</directory>
+            <directory suffix=".php">app/code</directory>
+            <directory suffix=".php">lib</directory>
         </include>
         <exclude>
-            <file>../app/bootstrap.php</file>
-            <file>../app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php</file>
-            <file>../app/code/core/Mage/Admin/Model/Acl/Assert/Time.php</file>
+            <file>app/bootstrap.php</file>
+            <file>app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php</file>
+            <file>app/code/core/Mage/Admin/Model/Acl/Assert/Time.php</file>
         </exclude>
         <report>
-            <clover outputFile="./dev/tests/clover.xml"/>
-            <crap4j outputFile="./dev/tests/crap4j.xml"/>
+            <clover outputFile="dev/tests/clover.xml"/>
+            <crap4j outputFile="dev/tests/crap4j.xml"/>
         </report>
     </coverage>
     <logging>

From 3df607ba39b30bc73633df89dd775713f1f6e5a8 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sun, 4 Aug 2024 03:55:29 +0200
Subject: [PATCH 25/79] Fixed invalid php version

---
 .github/workflows/phpunit.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index ca2b757f51a..61e351121ad 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -99,7 +99,7 @@ jobs:
 
       - name: prepare SonarCloud Scan Data
         continue-on-error: true
-        if: ${{ matrix.php-versions == '8.1' }}
+        if: ${{ matrix.php-versions == '8.3' }}
         run: |
           echo $PWD
           ls -la
@@ -112,7 +112,7 @@ jobs:
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
         continue-on-error: true
-        if: ${{ matrix.php-versions == '8.1' }} && SONAR_TOKEN
+        if: ${{ matrix.php-versions == '8.3' }} && SONAR_TOKEN
         with:
           args: >
             -Dproject.settings=dev/sonar-project.properties

From 0033475827b201c5a85464b0a4028f694f767453 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sun, 4 Aug 2024 03:56:30 +0200
Subject: [PATCH 26/79] Use minimum version

---
 .github/workflows/phpunit.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 61e351121ad..14940140d5d 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -99,7 +99,7 @@ jobs:
 
       - name: prepare SonarCloud Scan Data
         continue-on-error: true
-        if: ${{ matrix.php-versions == '8.3' }}
+        if: ${{ matrix.php-versions == '7.4' }}
         run: |
           echo $PWD
           ls -la
@@ -112,7 +112,7 @@ jobs:
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
         continue-on-error: true
-        if: ${{ matrix.php-versions == '8.3' }} && SONAR_TOKEN
+        if: ${{ matrix.php-versions == '7.4' }} && SONAR_TOKEN
         with:
           args: >
             -Dproject.settings=dev/sonar-project.properties

From b19c11f7f2f3ba300650a60314d23a4e4f907347 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sun, 4 Aug 2024 04:14:22 +0200
Subject: [PATCH 27/79] Use minimum version for SonarScan

---
 .github/workflows/phpunit.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 14940140d5d..2ed2cf7e63f 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -15,11 +15,11 @@ jobs:
       matrix:
         operating-system: [ubuntu-latest]
         php-versions: ['7.4', '8.3']
-        mysql_version: ["8.0", "5.7"]
+        mysql-version: ["8.0", "5.7"]
 
     services:
       mysql:
-        image: mysql:${{ matrix.mysql_version }}
+        image: mysql:${{ matrix.mysql-version }}
         env:
           MYSQL_ROOT_PASSWORD: root
           MYSQL_DATABASE: db
@@ -99,20 +99,17 @@ jobs:
 
       - name: prepare SonarCloud Scan Data
         continue-on-error: true
-        if: ${{ matrix.php-versions == '7.4' }}
+        if: ${{ matrix.php-versions == '7.4' }} && {{ matrix.mysql-version == '5.7' }}
         run: |
-          echo $PWD
-          ls -la
+          head dev/tests/clover.xml
+          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/junit.xml
+          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/clover.xml
           head ./dev/tests/clover.xml
-          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' ./dev/tests/junit.xml
-          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' ./dev/tests/clover.xml
-          head ./dev/tests/clover.xml
-          ls -la
 
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
         continue-on-error: true
-        if: ${{ matrix.php-versions == '7.4' }} && SONAR_TOKEN
+        if: ${{ matrix.php-versions == '7.4' }} && {{ matrix.mysql-version == '5.7' }} && SONAR_TOKEN
         with:
           args: >
             -Dproject.settings=dev/sonar-project.properties

From e60b5c820909b0902a41bb74c25bd8bc132e549e Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sun, 4 Aug 2024 04:32:21 +0200
Subject: [PATCH 28/79] Fix command [ski ci]

---
 .ddev/commands/web/phpunit          | 2 +-
 .ddev/commands/web/phpunit-coverage | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ddev/commands/web/phpunit b/.ddev/commands/web/phpunit
index 692021d7b9e..b7449dabc0d 100755
--- a/.ddev/commands/web/phpunit
+++ b/.ddev/commands/web/phpunit
@@ -4,4 +4,4 @@
 ## Usage: phpunit
 ## Example: ddev phpunit
 
-php vendor/bin/phpunit "$@"
+php vendor/bin/phpunit --no-coverage "$@"
diff --git a/.ddev/commands/web/phpunit-coverage b/.ddev/commands/web/phpunit-coverage
index b45b1de633d..6587c702540 100755
--- a/.ddev/commands/web/phpunit-coverage
+++ b/.ddev/commands/web/phpunit-coverage
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-## Description: run PHPUnit
-## Usage: phpunit
-## Example: ddev phpunit
+## Description: run PHPUnit with coverage
+## Usage: phpunit-coverage
+## Example: ddev phpunit-coverage
 
 XDEBUG_MODE=coverage php vendor/bin/phpunit "$@"

From bf03ca82b1ad0b865438ffb95b435409e47e0660 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 5 Aug 2024 01:39:03 +0200
Subject: [PATCH 29/79] Enable xdebug

---
 .ddev/commands/web/phpunit-coverage | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.ddev/commands/web/phpunit-coverage b/.ddev/commands/web/phpunit-coverage
index 6587c702540..1fd16c8753f 100755
--- a/.ddev/commands/web/phpunit-coverage
+++ b/.ddev/commands/web/phpunit-coverage
@@ -4,4 +4,6 @@
 ## Usage: phpunit-coverage
 ## Example: ddev phpunit-coverage
 
+enable_xdebug
 XDEBUG_MODE=coverage php vendor/bin/phpunit "$@"
+disable_xdebug
\ No newline at end of file

From 154229edacc9b4bf6bad1e7a699488d8a9b390df Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 5 Aug 2024 02:21:30 +0200
Subject: [PATCH 30/79] Added test, ref #4123

---
 .../Model/Security/HtmlEscapedStringTest.php  | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php

diff --git a/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php b/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
new file mode 100644
index 00000000000..3415cd43f3f
--- /dev/null
+++ b/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Model\Security;
+
+use Mage_Core_Model_Security_HtmlEscapedString;
+use PHPUnit\Framework\TestCase;
+
+class HtmlEscapedStringTest extends TestCase
+{
+    public const TEST_STRING = 'This is a bold <b>string></b>';
+
+    /**
+     * @var Mage_Core_Model_Security_HtmlEscapedString
+     */
+    public Mage_Core_Model_Security_HtmlEscapedString $subject;
+
+    /**
+     * @dataProvider provideHtmlEscapedStringAsStringData
+     * @param string $expectedResult
+     * @param string $string
+     * @param string|array<int, string> $allowedTags
+     * @return void
+     */
+    public function test__toSting(string $expectedResult, string $string, ?array $allowedTags): void
+    {
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Core_Model_Security_HtmlEscapedString($string, $allowedTags);
+        $this->assertSame($expectedResult, (string) $this->subject);
+    }
+
+    /**
+     * @dataProvider provideHtmlEscapedStringGetUnescapedValueData
+     * @param string $expectedResult
+     * @param string $string
+     * @param string|array<int, string> $allowedTags
+     * @return void
+     */
+    public function testGetUnescapedValue(string $expectedResult, string $string, ?array $allowedTags): void
+    {
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Core_Model_Security_HtmlEscapedString($string, $allowedTags);
+        $this->assertSame($expectedResult, $this->subject->getUnescapedValue());
+    }
+
+    /**
+     * @return array<string, array<int, int|string>>
+     */
+    public function provideHtmlEscapedStringAsStringData(): array
+    {
+        return [
+            'tags_null' => [
+                'This is a bold &lt;b&gt;string&gt;&lt;/b&gt;',
+                'This is a bold <b>string></b>',
+                null
+            ],
+//            'tags_array' => [
+//                'This is a bold <b>string></b>',
+//                'This is a bold <b>string></b>',
+//                ['b']
+//            ],
+        ];
+    }
+
+    /**
+     * @return array<string, array<int, int|string>>
+     */
+    public function provideHtmlEscapedStringGetUnescapedValueData(): array
+    {
+        return [
+            'tags_null' => [
+                self::TEST_STRING,
+                self::TEST_STRING,
+                null
+            ],
+            'tags_array' => [
+                self::TEST_STRING,
+                self::TEST_STRING,
+                ['some-invalid-value']
+            ],
+        ];
+    }
+}

From 67a20fafefe6910661ead8366fafc9684035dd9b Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 5 Aug 2024 23:29:57 +0200
Subject: [PATCH 31/79] Revert "Some cleanup"

This reverts commit 6d45ed6a13f8bd694c5b160b1b880b174c9a3faf.
---
 phpstan.dist.neon | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index 27fc22eefba..c11e42caa7c 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -51,6 +51,9 @@ parameters:
         - app/code/core/Mage/Paypal/Model/Report/Settlement.php
         - lib/Varien/Io/Sftp.php
 
+        # Class backup/db was not found while trying to analyse it
+        - app/code/core/Mage/Adminhtml/controllers/System/BackupController.php
+
         # Dataflow/Model/Convert/Iterator.php
         - app/code/core/Mage/Dataflow/Model/Convert/Iterator.php
 

From a0e5f9db39a5764979a26c6e7043ee5bf78ddfa9 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 5 Aug 2024 23:30:47 +0200
Subject: [PATCH 32/79] Revert "PhpUnit fix"

This reverts commit f4935f1d33a839de1ab0bd8fe2554a9a4d1c9b46.
---
 lib/Varien/Object.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Varien/Object.php b/lib/Varien/Object.php
index 0ddf7a65caa..bfd0f11bcff 100644
--- a/lib/Varien/Object.php
+++ b/lib/Varien/Object.php
@@ -591,7 +591,7 @@ public function toString($format = '')
         } else {
             preg_match_all('/\{\{([a-z0-9_]+)\}\}/is', $format, $matches);
             foreach ($matches[1] as $var) {
-                $format = str_replace('{{' . $var . '}}', (string) $this->getData($var), $format);
+                $format = str_replace('{{' . $var . '}}', $this->getData($var), $format);
             }
             $str = $format;
         }

From 85bb579688e479687a1950c6e49c8f80bca0e0f7 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 5 Aug 2024 23:33:20 +0200
Subject: [PATCH 33/79] Updated test

---
 .../Model/Security/HtmlEscapedStringTest.php   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php b/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
index 3415cd43f3f..8906bc9c80c 100644
--- a/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
+++ b/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
@@ -9,7 +9,7 @@
 
 class HtmlEscapedStringTest extends TestCase
 {
-    public const TEST_STRING = 'This is a bold <b>string></b>';
+    public const TEST_STRING = 'This is a bold <b>string</b>';
 
     /**
      * @var Mage_Core_Model_Security_HtmlEscapedString
@@ -27,7 +27,7 @@ public function test__toSting(string $expectedResult, string $string, ?array $al
     {
         // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $this->subject = new Mage_Core_Model_Security_HtmlEscapedString($string, $allowedTags);
-        $this->assertSame($expectedResult, (string) $this->subject);
+        $this->assertSame($expectedResult, $this->subject->__toString());
     }
 
     /**
@@ -51,15 +51,15 @@ public function provideHtmlEscapedStringAsStringData(): array
     {
         return [
             'tags_null' => [
-                'This is a bold &lt;b&gt;string&gt;&lt;/b&gt;',
-                'This is a bold <b>string></b>',
+                'This is a bold &lt;b&gt;string&lt;/b&gt;',
+                self::TEST_STRING,
                 null
             ],
-//            'tags_array' => [
-//                'This is a bold <b>string></b>',
-//                'This is a bold <b>string></b>',
-//                ['b']
-//            ],
+            'tags_array' => [
+                self::TEST_STRING,
+                self::TEST_STRING,
+                ['b']
+            ],
         ];
     }
 

From 3e59b0930f71eaa7a5fa2250d25fe94d73e01589 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 5 Aug 2024 23:42:55 +0200
Subject: [PATCH 34/79] Updated docblocks

---
 .../Mage/Core/Model/Security/HtmlEscapedStringTest.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php b/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
index 8906bc9c80c..5fd103e787e 100644
--- a/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
+++ b/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
@@ -20,7 +20,7 @@ class HtmlEscapedStringTest extends TestCase
      * @dataProvider provideHtmlEscapedStringAsStringData
      * @param string $expectedResult
      * @param string $string
-     * @param string|array<int, string> $allowedTags
+     * @param array<int, string> $allowedTags
      * @return void
      */
     public function test__toSting(string $expectedResult, string $string, ?array $allowedTags): void
@@ -34,7 +34,7 @@ public function test__toSting(string $expectedResult, string $string, ?array $al
      * @dataProvider provideHtmlEscapedStringGetUnescapedValueData
      * @param string $expectedResult
      * @param string $string
-     * @param string|array<int, string> $allowedTags
+     * @param array<int, string> $allowedTags
      * @return void
      */
     public function testGetUnescapedValue(string $expectedResult, string $string, ?array $allowedTags): void
@@ -45,7 +45,7 @@ public function testGetUnescapedValue(string $expectedResult, string $string, ?a
     }
 
     /**
-     * @return array<string, array<int, int|string>>
+     * @return array<string, array<int, array<int, string>|string|null>>
      */
     public function provideHtmlEscapedStringAsStringData(): array
     {
@@ -64,7 +64,7 @@ public function provideHtmlEscapedStringAsStringData(): array
     }
 
     /**
-     * @return array<string, array<int, int|string>>
+     * @return array<string, array<int, array<int, string>|string|null>>
      */
     public function provideHtmlEscapedStringGetUnescapedValueData(): array
     {

From 623884782c9681206ccb24ffa6347316d87677d0 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 6 Aug 2024 23:29:39 +0200
Subject: [PATCH 35/79] Revert "Fix linefeed (?)"

This reverts commit dee042205ef90a51e6be98fd8b62d6e0a0ee0c7f.
---
 .ddev/commands/web/magerun        | 0
 .ddev/commands/web/openmage-admin | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 .ddev/commands/web/magerun
 mode change 100755 => 100644 .ddev/commands/web/openmage-admin

diff --git a/.ddev/commands/web/magerun b/.ddev/commands/web/magerun
old mode 100755
new mode 100644
diff --git a/.ddev/commands/web/openmage-admin b/.ddev/commands/web/openmage-admin
old mode 100755
new mode 100644

From 0965de1aabbf1fbfb2a2ba2566ef0d2a85772cf4 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 20 Aug 2024 12:08:26 +0200
Subject: [PATCH 36/79] Added tests

---
 app/code/core/Mage/Core/Model/Website.php     |  13 +-
 .../unit/Mage/Core/Model/WebsiteTest.php      | 160 ++++++++++++++++++
 2 files changed, 171 insertions(+), 2 deletions(-)
 create mode 100644 dev/tests/unit/Mage/Core/Model/WebsiteTest.php

diff --git a/app/code/core/Mage/Core/Model/Website.php b/app/code/core/Mage/Core/Model/Website.php
index 9cb4c2dea47..a4f63c30ed0 100644
--- a/app/code/core/Mage/Core/Model/Website.php
+++ b/app/code/core/Mage/Core/Model/Website.php
@@ -200,7 +200,6 @@ public function getConfig($path)
             $config = Mage::getConfig()->getNode('websites/' . $this->getCode() . '/' . $path);
             if (!$config) {
                 return false;
-                #throw Mage::exception('Mage_Core', Mage::helper('core')->__('Invalid website\'s configuration path: %s', $path));
             }
             if ($config->hasChildren()) {
                 $value = [];
@@ -260,6 +259,7 @@ public function setGroups($groups)
      * Retrieve new (not loaded) Group collection object with website filter
      *
      * @return Mage_Core_Model_Resource_Store_Group_Collection
+     * @throws Mage_Core_Exception
      */
     public function getGroupCollection()
     {
@@ -326,6 +326,7 @@ public function getDefaultGroup()
     /**
      * Load store collection and set internal data
      *
+     * @throws Mage_Core_Exception
      */
     protected function _loadStores()
     {
@@ -368,6 +369,7 @@ public function setStores($stores)
      * Retrieve new (not loaded) Store collection object with website filter
      *
      * @return Mage_Core_Model_Resource_Store_Collection
+     * @throws Mage_Core_Exception
      */
     public function getStoreCollection()
     {
@@ -377,9 +379,10 @@ public function getStoreCollection()
     }
 
     /**
-     * Retrieve wersite store objects
+     * Retrieve website store objects
      *
      * @return Mage_Core_Model_Store[]
+     * @throws Mage_Core_Exception
      */
     public function getStores()
     {
@@ -393,6 +396,7 @@ public function getStores()
      * Retrieve website store ids
      *
      * @return array
+     * @throws Mage_Core_Exception
      */
     public function getStoreIds()
     {
@@ -406,6 +410,7 @@ public function getStoreIds()
      * Retrieve website store codes
      *
      * @return array
+     * @throws Mage_Core_Exception
      */
     public function getStoreCodes()
     {
@@ -419,6 +424,7 @@ public function getStoreCodes()
      * Retrieve number stores in a website
      *
      * @return int
+     * @throws Mage_Core_Exception
      */
     public function getStoresCount()
     {
@@ -432,6 +438,7 @@ public function getStoresCount()
      * is can delete website
      *
      * @return bool
+     * @throws Mage_Core_Exception
      */
     public function isCanDelete()
     {
@@ -473,6 +480,7 @@ public function getCode()
 
     /**
      * @inheritDoc
+     * @throws Mage_Core_Exception
      */
     protected function _beforeDelete()
     {
@@ -529,6 +537,7 @@ public function getBaseCurrency()
      * Retrieve Default Website Store or null
      *
      * @return Mage_Core_Model_Store
+     * @throws Mage_Core_Exception
      */
     public function getDefaultStore()
     {
diff --git a/dev/tests/unit/Mage/Core/Model/WebsiteTest.php b/dev/tests/unit/Mage/Core/Model/WebsiteTest.php
new file mode 100644
index 00000000000..e6760018ece
--- /dev/null
+++ b/dev/tests/unit/Mage/Core/Model/WebsiteTest.php
@@ -0,0 +1,160 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Model;
+
+use Mage_Core_Exception;
+use Mage_Core_Model_Resource_Store_Collection;
+use Mage_Core_Model_Resource_Store_Group_Collection;
+use Mage_Core_Model_Store;
+use Mage_Core_Model_Website;
+use Mage_Directory_Model_Currency;
+use PHPUnit\Framework\TestCase;
+use Varien_Db_Select;
+
+class WebsiteTest extends TestCase
+{
+    /**
+     * @var Mage_Core_Model_Website
+     */
+    public Mage_Core_Model_Website $subject;
+
+    public function setUp(): void
+    {
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Core_Model_Website();
+    }
+
+    /**
+     * @return void
+     */
+    public function testLoad(): void
+    {
+        $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->load(1));
+        $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->load('default'));
+    }
+
+    /**
+     * @return void
+     */
+    public function testLoadConfig(): void
+    {
+        $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->loadConfig(1));
+        $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->loadConfig('default'));
+    }
+
+    /**
+     * @return void
+     * @throws Mage_Core_Exception
+     */
+    public function testGetStoreCollection(): void
+    {
+        $this->assertInstanceOf(Mage_Core_Model_Resource_Store_Collection::class, $this->subject->getStoreCollection());
+    }
+
+    /**
+     * @return void
+     * @throws Mage_Core_Exception
+     */
+    public function testGetGroupCollection(): void
+    {
+        $this->assertInstanceOf(Mage_Core_Model_Resource_Store_Group_Collection::class, $this->subject->getGroupCollection());
+    }
+
+    /**
+     * @return void
+     * @throws Mage_Core_Exception
+     */
+    public function testGetStores(): void
+    {
+        $this->assertIsArray($this->subject->getStores());
+    }
+
+    /**
+     * @return void
+     * @throws Mage_Core_Exception
+     */
+    public function testGetStoreIds(): void
+    {
+        $this->assertIsArray($this->subject->getStoreIds());
+    }
+
+    /**
+     * @return void
+     * @throws Mage_Core_Exception
+     */
+    public function testGetStoreCodes(): void
+    {
+        $this->assertIsArray($this->subject->getStoreCodes());
+    }
+
+    /**
+     * @return void
+     * @throws Mage_Core_Exception
+     */
+    public function testGetStoresCount(): void
+    {
+        $this->assertIsInt($this->subject->getStoresCount());
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetGroups(): void
+    {
+        $this->assertIsArray($this->subject->getGroups());
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetGroupIds(): void
+    {
+        $this->assertIsArray($this->subject->getGroupIds());
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetGroupsCount(): void
+    {
+        $this->assertIsInt($this->subject->getGroupsCount());
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetBaseCurrency(): void
+    {
+        $this->assertIsObject($this->subject->getBaseCurrency());
+        $this->assertInstanceOf(Mage_Directory_Model_Currency::class, $this->subject->getBaseCurrency());
+    }
+
+//    /**
+//     * @return void
+//     */
+//    public function testGetDefaultStore(): void
+//    {
+//        $this->assertIsObject($this->subject->getDefaultStore());
+//        $this->assertInstanceOf(Mage_Core_Model_Store::class, $this->subject->getDefaultStore());
+//    }
+
+    /**
+     * @return void
+     */
+    public function testGetDefaultStoresSelect(): void
+    {
+        $this->assertIsObject($this->subject->getDefaultStoresSelect());
+        $this->assertInstanceOf(Varien_Db_Select::class, $this->subject->getDefaultStoresSelect('true'));
+    }
+
+    /**
+     * @return void
+     */
+    public function testIsReadOnly(): void
+    {
+        $this->assertFalse($this->subject->isReadOnly());
+        $this->assertTrue($this->subject->isReadOnly('true'));
+    }
+}

From 98366f55c8ccb8ca208f2ef6c42dc3b0944e2a13 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 21 Aug 2024 02:58:55 +0200
Subject: [PATCH 37/79] Added tests

---
 dev/tests/unit/Mage/Core/Model/LocaleTest.php | 62 +++++++++++++++++++
 .../unit/Mage/Uploader/Helper/DataTest.php    | 31 ++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 dev/tests/unit/Mage/Core/Model/LocaleTest.php
 create mode 100644 dev/tests/unit/Mage/Uploader/Helper/DataTest.php

diff --git a/dev/tests/unit/Mage/Core/Model/LocaleTest.php b/dev/tests/unit/Mage/Core/Model/LocaleTest.php
new file mode 100644
index 00000000000..7c32f43450b
--- /dev/null
+++ b/dev/tests/unit/Mage/Core/Model/LocaleTest.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Model;
+
+use Mage_Core_Model_Locale;
+use PHPUnit\Framework\TestCase;
+
+class LocaleTest extends TestCase
+{
+    /**
+     * @var Mage_Core_Model_Locale
+     */
+    public Mage_Core_Model_Locale $subject;
+
+    /**
+     * @dataProvider provideGetNumberData
+     * @param float|null $expectedResult
+     * @param string|float|int $value
+     * @return void
+     */
+    public function testGetNumber(?float $expectedResult, $value): void
+    {
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Core_Model_Locale();
+        $this->assertSame($expectedResult, $this->subject->getNumber($value));
+    }
+
+    /**
+     * @return array<string, array<int, array<int, int>|float|int|string|null>>
+     */
+    public function provideGetNumberData(): array
+    {
+        return [
+            'array' => [
+                1.0,
+                [1]
+            ],
+            'int' => [
+                1.0,
+                1
+            ],
+            'string' => [
+                1.0,
+                '1'
+            ],
+            'string_comma' => [
+                1.0,
+                '1,0'
+            ],
+            'string_dot' => [
+                1.0,
+                '1.0'
+            ],
+            'null' => [
+                null,
+                null
+            ],
+        ];
+    }
+}
diff --git a/dev/tests/unit/Mage/Uploader/Helper/DataTest.php b/dev/tests/unit/Mage/Uploader/Helper/DataTest.php
new file mode 100644
index 00000000000..140b34e0c56
--- /dev/null
+++ b/dev/tests/unit/Mage/Uploader/Helper/DataTest.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Uploader\Helper;
+
+use Mage;
+use Mage_Uploader_Helper_Data;
+use PHPUnit\Framework\TestCase;
+
+class DataTest extends TestCase
+{
+    /**
+     * @var Mage_Uploader_Helper_Data
+     */
+    public Mage_Uploader_Helper_Data $subject;
+
+    public function setUp(): void
+    {
+        $this->subject = Mage::helper('uploader/data');
+    }
+
+    /**
+     * @coversDefaultClass Mage_Uploader_Helper_Data
+     * @return void
+     */
+    public function testIsModuleEnabled(): void
+    {
+        $this->assertIsBool($this->subject->isModuleEnabled());
+    }
+}

From 0100b36aa81cc870a0d6fb36d66ee28ef201f4d4 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 21 Aug 2024 02:59:40 +0200
Subject: [PATCH 38/79] Added tests [skip ci]

---
 dev/tests/unit/Mage/Uploader/Helper/DataTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/unit/Mage/Uploader/Helper/DataTest.php b/dev/tests/unit/Mage/Uploader/Helper/DataTest.php
index 140b34e0c56..ead44d271c7 100644
--- a/dev/tests/unit/Mage/Uploader/Helper/DataTest.php
+++ b/dev/tests/unit/Mage/Uploader/Helper/DataTest.php
@@ -21,7 +21,6 @@ public function setUp(): void
     }
 
     /**
-     * @coversDefaultClass Mage_Uploader_Helper_Data
      * @return void
      */
     public function testIsModuleEnabled(): void

From e55c6f341d48426eca5256ab0b9ce0aa92b2f024 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Sat, 24 Aug 2024 12:05:21 +0200
Subject: [PATCH 39/79] Reverted changes to Mage_Core_Model_Website

---
 app/code/core/Mage/Core/Model/Website.php | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/app/code/core/Mage/Core/Model/Website.php b/app/code/core/Mage/Core/Model/Website.php
index a4f63c30ed0..9cb4c2dea47 100644
--- a/app/code/core/Mage/Core/Model/Website.php
+++ b/app/code/core/Mage/Core/Model/Website.php
@@ -200,6 +200,7 @@ public function getConfig($path)
             $config = Mage::getConfig()->getNode('websites/' . $this->getCode() . '/' . $path);
             if (!$config) {
                 return false;
+                #throw Mage::exception('Mage_Core', Mage::helper('core')->__('Invalid website\'s configuration path: %s', $path));
             }
             if ($config->hasChildren()) {
                 $value = [];
@@ -259,7 +260,6 @@ public function setGroups($groups)
      * Retrieve new (not loaded) Group collection object with website filter
      *
      * @return Mage_Core_Model_Resource_Store_Group_Collection
-     * @throws Mage_Core_Exception
      */
     public function getGroupCollection()
     {
@@ -326,7 +326,6 @@ public function getDefaultGroup()
     /**
      * Load store collection and set internal data
      *
-     * @throws Mage_Core_Exception
      */
     protected function _loadStores()
     {
@@ -369,7 +368,6 @@ public function setStores($stores)
      * Retrieve new (not loaded) Store collection object with website filter
      *
      * @return Mage_Core_Model_Resource_Store_Collection
-     * @throws Mage_Core_Exception
      */
     public function getStoreCollection()
     {
@@ -379,10 +377,9 @@ public function getStoreCollection()
     }
 
     /**
-     * Retrieve website store objects
+     * Retrieve wersite store objects
      *
      * @return Mage_Core_Model_Store[]
-     * @throws Mage_Core_Exception
      */
     public function getStores()
     {
@@ -396,7 +393,6 @@ public function getStores()
      * Retrieve website store ids
      *
      * @return array
-     * @throws Mage_Core_Exception
      */
     public function getStoreIds()
     {
@@ -410,7 +406,6 @@ public function getStoreIds()
      * Retrieve website store codes
      *
      * @return array
-     * @throws Mage_Core_Exception
      */
     public function getStoreCodes()
     {
@@ -424,7 +419,6 @@ public function getStoreCodes()
      * Retrieve number stores in a website
      *
      * @return int
-     * @throws Mage_Core_Exception
      */
     public function getStoresCount()
     {
@@ -438,7 +432,6 @@ public function getStoresCount()
      * is can delete website
      *
      * @return bool
-     * @throws Mage_Core_Exception
      */
     public function isCanDelete()
     {
@@ -480,7 +473,6 @@ public function getCode()
 
     /**
      * @inheritDoc
-     * @throws Mage_Core_Exception
      */
     protected function _beforeDelete()
     {
@@ -537,7 +529,6 @@ public function getBaseCurrency()
      * Retrieve Default Website Store or null
      *
      * @return Mage_Core_Model_Store
-     * @throws Mage_Core_Exception
      */
     public function getDefaultStore()
     {

From 4cd3c64a2cd7f97ad2577784782599c88866824a Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 28 Aug 2024 03:46:24 +0200
Subject: [PATCH 40/79] Updated config

---
 .gitignore       | 2 ++
 phpunit.xml.dist | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index f3397195e3b..183ad95a5c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,8 @@
 phpstan*.neon
 !phpstan.dist.*.neon
 
+tests/unit/*.xml
+tests/unit/output/*.xml
 .phpunit.result.cache
 phpunit.xml
 !phpunit.xml.dist
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 1256ee17a6d..1bebd816746 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,7 +15,7 @@
 >
     <testsuites>
         <testsuite name="Unit">
-            <directory>./dev/tests/unit</directory>
+            <directory>dev/tests/unit</directory>
         </testsuite>
     </testsuites>
 
@@ -38,6 +38,6 @@
         </report>
     </coverage>
     <logging>
-        <junit outputFile="./dev/tests/junit.xml"/>
+        <junit outputFile="dev/tests/output/junit.xml"/>
     </logging>
 </phpunit>

From cc5b55a7165d4816fbe282181b09a1547232b072 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 28 Aug 2024 03:47:26 +0200
Subject: [PATCH 41/79] Updated .gitignore

---
 .gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 183ad95a5c7..01217124706 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,8 +75,8 @@
 phpstan*.neon
 !phpstan.dist.*.neon
 
-tests/unit/*.xml
-tests/unit/output/*.xml
+tests/*.xml
+tests/output/*.xml
 .phpunit.result.cache
 phpunit.xml
 !phpunit.xml.dist

From 47dda7a25af3341f2a927590ba40b370a94c693a Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 28 Aug 2024 04:01:33 +0200
Subject: [PATCH 42/79] Updated workflow

---
 .github/workflows/phpunit.yml | 13 +++++--------
 .gitignore                    |  4 ++--
 phpunit.xml.dist              |  6 +++---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 2ed2cf7e63f..cc6c8c51dab 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -92,23 +92,20 @@ jobs:
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
         if: always()
-        continue-on-error: true
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          files: output/*.xml
+          files: dev/tests/logging/*.xml
 
       - name: prepare SonarCloud Scan Data
-        continue-on-error: true
         if: ${{ matrix.php-versions == '7.4' }} && {{ matrix.mysql-version == '5.7' }}
         run: |
-          head dev/tests/clover.xml
-          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/junit.xml
-          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/clover.xml
-          head ./dev/tests/clover.xml
+          head dev/tests/coverage/clover.xml
+          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/coverage/junit.xml
+          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/coverage/clover.xml
+          head ./dev/tests/coverage/clover.xml
 
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
-        continue-on-error: true
         if: ${{ matrix.php-versions == '7.4' }} && {{ matrix.mysql-version == '5.7' }} && SONAR_TOKEN
         with:
           args: >
diff --git a/.gitignore b/.gitignore
index 01217124706..745ecdd204c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,8 +75,8 @@
 phpstan*.neon
 !phpstan.dist.*.neon
 
-tests/*.xml
-tests/output/*.xml
+dev/tests/coverage
+dev/tests/logging
 .phpunit.result.cache
 phpunit.xml
 !phpunit.xml.dist
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 1bebd816746..87dbc08d63b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -33,11 +33,11 @@
             <file>app/code/core/Mage/Admin/Model/Acl/Assert/Time.php</file>
         </exclude>
         <report>
-            <clover outputFile="dev/tests/clover.xml"/>
-            <crap4j outputFile="dev/tests/crap4j.xml"/>
+            <clover outputFile="dev/tests/coverage/clover.xml"/>
+            <crap4j outputFile="dev/tests/coverage/crap4j.xml"/>
         </report>
     </coverage>
     <logging>
-        <junit outputFile="dev/tests/output/junit.xml"/>
+        <junit outputFile="dev/tests/logging/junit.xml"/>
     </logging>
 </phpunit>

From 77a14b916013d3eed5943672926147b02d0aaa44 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 28 Aug 2024 04:20:03 +0200
Subject: [PATCH 43/79] Updated workflow typo

---
 .github/workflows/phpunit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index cc6c8c51dab..aac22c61bab 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -100,7 +100,7 @@ jobs:
         if: ${{ matrix.php-versions == '7.4' }} && {{ matrix.mysql-version == '5.7' }}
         run: |
           head dev/tests/coverage/clover.xml
-          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/coverage/junit.xml
+          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/logging/junit.xml
           sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/coverage/clover.xml
           head ./dev/tests/coverage/clover.xml
 

From a52e67fd5a654b056cf23b37ce548f359ce3ae4f Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 28 Aug 2024 04:35:07 +0200
Subject: [PATCH 44/79] Updated workflow continue on error

---
 .github/workflows/phpunit.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index aac22c61bab..212a9dfc119 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -106,6 +106,7 @@ jobs:
 
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
+        continue-on-error: true
         if: ${{ matrix.php-versions == '7.4' }} && {{ matrix.mysql-version == '5.7' }} && SONAR_TOKEN
         with:
           args: >

From 2f6592b427e230ed186215eecef33d2a8a245a5c Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 28 Aug 2024 05:08:23 +0200
Subject: [PATCH 45/79] Updated workflow if condition

---
 .github/workflows/phpunit.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 212a9dfc119..8b09a58028b 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -97,7 +97,7 @@ jobs:
           files: dev/tests/logging/*.xml
 
       - name: prepare SonarCloud Scan Data
-        if: ${{ matrix.php-versions == '7.4' }} && {{ matrix.mysql-version == '5.7' }}
+        if: ${{ (matrix.php-versions == '7.4') && (matrix.mysql-version == '5.7') }}
         run: |
           head dev/tests/coverage/clover.xml
           sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/logging/junit.xml
@@ -107,7 +107,7 @@ jobs:
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
         continue-on-error: true
-        if: ${{ matrix.php-versions == '7.4' }} && {{ matrix.mysql-version == '5.7' }} && SONAR_TOKEN
+        if: ${{ (matrix.php-versions == '7.4') && (matrix.mysql-version == '5.7') }} && SONAR_TOKEN
         with:
           args: >
             -Dproject.settings=dev/sonar-project.properties

From 9d9c582ec06b6d1c741c739ed7fa64278eef1584 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 28 Aug 2024 05:15:15 +0200
Subject: [PATCH 46/79] Updated workflow [skip ci]

---
 .github/workflows/phpunit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 8b09a58028b..08366e10161 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -15,7 +15,7 @@ jobs:
       matrix:
         operating-system: [ubuntu-latest]
         php-versions: ['7.4', '8.3']
-        mysql-version: ["8.0", "5.7"]
+        mysql-version: ['5.7', '8.0']
 
     services:
       mysql:

From 7c7f93052262f655cf57f3320845a35e261e50d4 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 28 Aug 2024 06:13:49 +0200
Subject: [PATCH 47/79] Moved tests to root (as common)

---
 .github/workflows/phpunit.yml                        | 12 ++++++------
 .gitignore                                           |  4 ++--
 composer.json                                        |  2 +-
 dev/tests/bootstrap.php                              |  6 ------
 phpunit.xml.dist                                     | 10 +++++-----
 tests/.htaccess                                      |  2 ++
 tests/bootstrap.php                                  |  6 ++++++
 {dev => tests}/sonar-project.properties              |  6 +++---
 {dev/tests => tests}/unit/Base/ClassLoadingTest.php  |  0
 .../tests => tests}/unit/Base/XmlFileLoadingTest.php |  0
 .../Mage/Core/Helper/EnvironmentConfigLoaderTest.php |  0
 .../Helper/EnvironmentConfigLoaderTestHelper.php     |  0
 .../unit/Mage/Core/Helper/SecurityTest.php           |  0
 .../unit/Mage/Core/Helper/StringTest.php             |  0
 .../unit/Mage/Core/Model/LocaleTest.php              |  0
 .../Core/Model/Security/HtmlEscapedStringTest.php    |  0
 .../unit/Mage/Core/Model/WebsiteTest.php             |  0
 .../unit/Mage/Downloadable/Helper/FileTest.php       |  0
 .../unit/Mage/Uploader/Helper/DataTest.php           |  0
 .../unit/Mage/Uploader/Helper/FileTest.php           |  0
 .../unit/Varien/Db/Adapter/Pdo/MysqlTest.php         |  0
 {dev/tests => tests}/unit/Varien/ObjectTest.php      |  0
 22 files changed, 25 insertions(+), 23 deletions(-)
 delete mode 100644 dev/tests/bootstrap.php
 create mode 100644 tests/.htaccess
 create mode 100644 tests/bootstrap.php
 rename {dev => tests}/sonar-project.properties (75%)
 rename {dev/tests => tests}/unit/Base/ClassLoadingTest.php (100%)
 rename {dev/tests => tests}/unit/Base/XmlFileLoadingTest.php (100%)
 rename {dev/tests => tests}/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php (100%)
 rename {dev/tests => tests}/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php (100%)
 rename {dev/tests => tests}/unit/Mage/Core/Helper/SecurityTest.php (100%)
 rename {dev/tests => tests}/unit/Mage/Core/Helper/StringTest.php (100%)
 rename {dev/tests => tests}/unit/Mage/Core/Model/LocaleTest.php (100%)
 rename {dev/tests => tests}/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php (100%)
 rename {dev/tests => tests}/unit/Mage/Core/Model/WebsiteTest.php (100%)
 rename {dev/tests => tests}/unit/Mage/Downloadable/Helper/FileTest.php (100%)
 rename {dev/tests => tests}/unit/Mage/Uploader/Helper/DataTest.php (100%)
 rename {dev/tests => tests}/unit/Mage/Uploader/Helper/FileTest.php (100%)
 rename {dev/tests => tests}/unit/Varien/Db/Adapter/Pdo/MysqlTest.php (100%)
 rename {dev/tests => tests}/unit/Varien/ObjectTest.php (100%)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 08366e10161..d9142354e3b 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -94,15 +94,15 @@ jobs:
         if: always()
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          files: dev/tests/logging/*.xml
+          files: tests/logging/*.xml
 
       - name: prepare SonarCloud Scan Data
         if: ${{ (matrix.php-versions == '7.4') && (matrix.mysql-version == '5.7') }}
         run: |
-          head dev/tests/coverage/clover.xml
-          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/logging/junit.xml
-          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' dev/tests/coverage/clover.xml
-          head ./dev/tests/coverage/clover.xml
+          head tests/coverage/clover.xml
+          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' tests/logging/junit.xml
+          sed -i 's@'$GITHUB_WORKSPACE'/@/github/workspace/@g' tests/coverage/clover.xml
+          head ./tests/coverage/clover.xml
 
       - name: SonarCloud Scan
         uses: SonarSource/sonarcloud-github-action@master
@@ -110,7 +110,7 @@ jobs:
         if: ${{ (matrix.php-versions == '7.4') && (matrix.mysql-version == '5.7') }} && SONAR_TOKEN
         with:
           args: >
-            -Dproject.settings=dev/sonar-project.properties
+            -Dproject.settings=tests/sonar-project.properties
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 2d60f7edd6e..a2393f3e06b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,8 +73,8 @@
 phpstan*.neon
 !phpstan.dist.*.neon
 
-dev/tests/coverage
-dev/tests/logging
+tests/coverage
+tests/logging
 .phpunit.result.cache
 phpunit.xml
 !phpunit.xml.dist
diff --git a/composer.json b/composer.json
index fc34d826c3f..048a91b6757 100644
--- a/composer.json
+++ b/composer.json
@@ -89,7 +89,7 @@
     ],
     "autoload-dev": {
         "psr-4": {
-            "OpenMage\\Tests\\Unit\\": "dev/tests/unit"
+            "OpenMage\\Tests\\Unit\\": "tests/unit"
         }
     },
     "extra": {
diff --git a/dev/tests/bootstrap.php b/dev/tests/bootstrap.php
deleted file mode 100644
index 83a24baba35..00000000000
--- a/dev/tests/bootstrap.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-// Set up autoloading
-require_once __DIR__ . '/../../vendor/autoload.php';
-
-require_once __DIR__ . '/../../app/Mage.php';
-ini_set('error_reporting', -1);
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 87dbc08d63b..96c21abe915 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,11 +11,11 @@
         convertWarningsToExceptions="true"
         processIsolation="false"
         stopOnFailure="false"
-        bootstrap="dev/tests/bootstrap.php"
+        bootstrap="tests/bootstrap.php"
 >
     <testsuites>
         <testsuite name="Unit">
-            <directory>dev/tests/unit</directory>
+            <directory>tests/unit</directory>
         </testsuite>
     </testsuites>
 
@@ -33,11 +33,11 @@
             <file>app/code/core/Mage/Admin/Model/Acl/Assert/Time.php</file>
         </exclude>
         <report>
-            <clover outputFile="dev/tests/coverage/clover.xml"/>
-            <crap4j outputFile="dev/tests/coverage/crap4j.xml"/>
+            <clover outputFile="tests/coverage/clover.xml"/>
+            <crap4j outputFile="tests/coverage/crap4j.xml"/>
         </report>
     </coverage>
     <logging>
-        <junit outputFile="dev/tests/logging/junit.xml"/>
+        <junit outputFile="tests/logging/junit.xml"/>
     </logging>
 </phpunit>
diff --git a/tests/.htaccess b/tests/.htaccess
new file mode 100644
index 00000000000..93169e4eb44
--- /dev/null
+++ b/tests/.htaccess
@@ -0,0 +1,2 @@
+Order deny,allow
+Deny from all
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 00000000000..2d096b78be5
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,6 @@
+<?php
+// Set up autoloading
+require_once __DIR__ . '/../vendor/autoload.php';
+
+require_once __DIR__ . '/../app/Mage.php';
+ini_set('error_reporting', -1);
diff --git a/dev/sonar-project.properties b/tests/sonar-project.properties
similarity index 75%
rename from dev/sonar-project.properties
rename to tests/sonar-project.properties
index ec81b51968b..f03650c53e6 100644
--- a/dev/sonar-project.properties
+++ b/tests/sonar-project.properties
@@ -7,11 +7,11 @@ sonar.organization=openmage
 
 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
 sonar.sources=./app/code
-sonar.tests=./dev/tests/
+sonar.tests=./tests/
 
 # Encoding of the source code. Default is default system encoding
 sonar.sourceEncoding=UTF-8
 
 sonar.language=php
-sonar.php.tests.reportPath=./dev/tests/junit.xml
-sonar.php.coverage.reportPaths=./dev/tests/clover.xml
+sonar.php.tests.reportPath=./tests/logging/junit.xml
+sonar.php.coverage.reportPaths=./tests/coverage/clover.xml
diff --git a/dev/tests/unit/Base/ClassLoadingTest.php b/tests/unit/Base/ClassLoadingTest.php
similarity index 100%
rename from dev/tests/unit/Base/ClassLoadingTest.php
rename to tests/unit/Base/ClassLoadingTest.php
diff --git a/dev/tests/unit/Base/XmlFileLoadingTest.php b/tests/unit/Base/XmlFileLoadingTest.php
similarity index 100%
rename from dev/tests/unit/Base/XmlFileLoadingTest.php
rename to tests/unit/Base/XmlFileLoadingTest.php
diff --git a/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
similarity index 100%
rename from dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
rename to tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
diff --git a/dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php
similarity index 100%
rename from dev/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php
rename to tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php
diff --git a/dev/tests/unit/Mage/Core/Helper/SecurityTest.php b/tests/unit/Mage/Core/Helper/SecurityTest.php
similarity index 100%
rename from dev/tests/unit/Mage/Core/Helper/SecurityTest.php
rename to tests/unit/Mage/Core/Helper/SecurityTest.php
diff --git a/dev/tests/unit/Mage/Core/Helper/StringTest.php b/tests/unit/Mage/Core/Helper/StringTest.php
similarity index 100%
rename from dev/tests/unit/Mage/Core/Helper/StringTest.php
rename to tests/unit/Mage/Core/Helper/StringTest.php
diff --git a/dev/tests/unit/Mage/Core/Model/LocaleTest.php b/tests/unit/Mage/Core/Model/LocaleTest.php
similarity index 100%
rename from dev/tests/unit/Mage/Core/Model/LocaleTest.php
rename to tests/unit/Mage/Core/Model/LocaleTest.php
diff --git a/dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
similarity index 100%
rename from dev/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
rename to tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
diff --git a/dev/tests/unit/Mage/Core/Model/WebsiteTest.php b/tests/unit/Mage/Core/Model/WebsiteTest.php
similarity index 100%
rename from dev/tests/unit/Mage/Core/Model/WebsiteTest.php
rename to tests/unit/Mage/Core/Model/WebsiteTest.php
diff --git a/dev/tests/unit/Mage/Downloadable/Helper/FileTest.php b/tests/unit/Mage/Downloadable/Helper/FileTest.php
similarity index 100%
rename from dev/tests/unit/Mage/Downloadable/Helper/FileTest.php
rename to tests/unit/Mage/Downloadable/Helper/FileTest.php
diff --git a/dev/tests/unit/Mage/Uploader/Helper/DataTest.php b/tests/unit/Mage/Uploader/Helper/DataTest.php
similarity index 100%
rename from dev/tests/unit/Mage/Uploader/Helper/DataTest.php
rename to tests/unit/Mage/Uploader/Helper/DataTest.php
diff --git a/dev/tests/unit/Mage/Uploader/Helper/FileTest.php b/tests/unit/Mage/Uploader/Helper/FileTest.php
similarity index 100%
rename from dev/tests/unit/Mage/Uploader/Helper/FileTest.php
rename to tests/unit/Mage/Uploader/Helper/FileTest.php
diff --git a/dev/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php b/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
similarity index 100%
rename from dev/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
rename to tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
diff --git a/dev/tests/unit/Varien/ObjectTest.php b/tests/unit/Varien/ObjectTest.php
similarity index 100%
rename from dev/tests/unit/Varien/ObjectTest.php
rename to tests/unit/Varien/ObjectTest.php

From e439e283b33d3ad06cf83ea3685562150bd1fcd6 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 28 Aug 2024 06:20:34 +0200
Subject: [PATCH 48/79] Fixed paths

---
 .php-cs-fixer.dist.php | 2 +-
 phpstan.dist.neon      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 609ea06dad2..16b349f656b 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -98,11 +98,11 @@
         PhpCsFixer\Finder::create()
             ->in([
                 'app/code/core/Mage/',
-                'dev/tests/unit/',
                 'lib/Mage/',
                 'lib/Magento/',
                 'lib/Varien/',
                 'shell/',
+                'tests/unit/',
             ])
             ->name('*.php')
             ->ignoreDotFiles(true)
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index c11e42caa7c..2352a2b5c00 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -12,11 +12,11 @@ parameters:
         - install.php
         - app/Mage.php
         - app/code/core/Mage
-        - dev/tests/unit
         - lib/Mage
         - lib/Magento
         - lib/Varien
         - shell
+        - tests/unit
     excludePaths:
         #incompatible interfaces
         - app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php

From 7f467131679a16f24c358604754427f5602af1d8 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 28 Aug 2024 06:29:05 +0200
Subject: [PATCH 49/79] Fixed paths

---
 tests/unit/Base/XmlFileLoadingTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/Base/XmlFileLoadingTest.php b/tests/unit/Base/XmlFileLoadingTest.php
index 679932a6e67..13f42cd4e24 100644
--- a/tests/unit/Base/XmlFileLoadingTest.php
+++ b/tests/unit/Base/XmlFileLoadingTest.php
@@ -47,7 +47,7 @@ public function testXmlReaderIsValid(string $filepath): void
     public function provideXmlFiles(): array
     {
         // phpcs:ignore Ecg.Security.ForbiddenFunction.Found
-        $root = realpath(__DIR__ . '/../../../../') . '/';
+        $root = realpath(__DIR__ . '/../../../') . '/';
 
         return [
             'file from vendor directory' => [

From 78b2a0d57bd4b24ff17508ed0f7e50fdfc4f87d8 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 28 Aug 2024 07:45:35 +0200
Subject: [PATCH 50/79] Fixed paths

---
 .phpcs.php.xml.dist | 2 +-
 .phpcs.xml.dist     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.phpcs.php.xml.dist b/.phpcs.php.xml.dist
index 0b75064d8c2..e23e3a1210d 100644
--- a/.phpcs.php.xml.dist
+++ b/.phpcs.php.xml.dist
@@ -7,11 +7,11 @@
     <file>install.php</file>
     <file>app/Mage.php</file>
     <file>app/code/core/Mage/</file>
-    <file>dev/tests/unit/</file>
     <file>lib/Mage/</file>
     <file>lib/Magento/</file>
     <file>lib/Varien/</file>
     <file>shell/</file>
+    <file>tests/unit/</file>
     <rule ref="PHPCompatibility" />
     <rule ref="PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.MethodDoubleUnderscore">
         <exclude-pattern>*/Varien/Object.php*</exclude-pattern>
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
index a4a9c1ce8fe..b8122f97b08 100644
--- a/.phpcs.xml.dist
+++ b/.phpcs.xml.dist
@@ -11,6 +11,7 @@
     <file>lib/Magento/</file>
     <file>lib/Varien/</file>
     <file>shell/</file>
+    <file>tests/unit/</file>
     <!-- file contains include/include_once/... -->
     <rule ref="PSR1.Files.SideEffects.FoundWithSymbols">
         <!-- controllers -->

From f80be8e116698f05767a3626a202f75237c93af9 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Thu, 29 Aug 2024 14:54:46 +0200
Subject: [PATCH 51/79] CS fix

---
 tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
index 5fd103e787e..9aac34a90ae 100644
--- a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
+++ b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
@@ -23,7 +23,7 @@ class HtmlEscapedStringTest extends TestCase
      * @param array<int, string> $allowedTags
      * @return void
      */
-    public function test__toSting(string $expectedResult, string $string, ?array $allowedTags): void
+    public function testToSting(string $expectedResult, string $string, ?array $allowedTags): void
     {
         // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $this->subject = new Mage_Core_Model_Security_HtmlEscapedString($string, $allowedTags);

From 2dc091a8843ef09ff6df4a51664e03505299cd4e Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Thu, 29 Aug 2024 17:07:54 +0200
Subject: [PATCH 52/79] Added test

---
 tests/unit/Mage/Admin/Model/VariableTest.php | 75 ++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 tests/unit/Mage/Admin/Model/VariableTest.php

diff --git a/tests/unit/Mage/Admin/Model/VariableTest.php b/tests/unit/Mage/Admin/Model/VariableTest.php
new file mode 100644
index 00000000000..f3bc8137123
--- /dev/null
+++ b/tests/unit/Mage/Admin/Model/VariableTest.php
@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Admin\Model;
+
+use Mage;
+use Mage_Admin_Model_Variable;
+use PHPUnit\Framework\TestCase;
+
+class VariableTest extends TestCase
+{
+    /**
+     * @var Mage_Admin_Model_Variable
+     */
+    public Mage_Admin_Model_Variable $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::getModel('admin/variable');
+    }
+
+    /**
+     * @dataProvider provideValidateData
+     * @param array|true $expectedResult
+     * @param string $variableName
+     * @param string $isallowed
+     * @return void
+     */
+    public function testValidate($expectedResult, string $variableName, string $isallowed): void
+    {
+        $mock = $this->getMockBuilder(Mage_Admin_Model_Variable::class)
+            ->setMethods(['getVariableName', 'getIsAllowed'])
+            ->getMock();
+
+        $mock->expects($this->any())->method('getVariableName')->willReturn($variableName);
+        $mock->expects($this->any())->method('getIsAllowed')->willReturn($isallowed);
+        $this->assertSame($expectedResult, $mock->validate());
+    }
+
+    /**
+     * @return array<string, array<int, bool|array|string>>
+     */
+    public function provideValidateData(): array
+    {
+        return [
+            'test_passes' => [
+                true,
+                'test',
+                '1'
+            ],
+            'test_error_empty' => [
+                [0 => 'Variable Name is required field.'],
+                '',
+                '1'
+            ],
+            'test_error_regex' => [
+                [0 => 'Variable Name is incorrect.'],
+                '#invalid-name#',
+                '1'
+            ],
+            'test_error_allowed' => [
+                [0 => 'Is Allowed is required field.'],
+                'test',
+                'invalid'
+            ],
+        ];
+    }
+
+    public function testIsPathAllowed(): void
+    {
+        $this->assertIsBool($this->subject->isPathAllowed('invalid-path'));
+    }
+}

From 433b53774d8a602e59be8afa33444069e367e072 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Thu, 29 Aug 2024 19:24:42 +0200
Subject: [PATCH 53/79] Added test

---
 tests/unit/Mage/Admin/Model/VariableTest.php  |  6 ++--
 tests/unit/Mage/Sitemap/Model/SitemapTest.php | 33 +++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 tests/unit/Mage/Sitemap/Model/SitemapTest.php

diff --git a/tests/unit/Mage/Admin/Model/VariableTest.php b/tests/unit/Mage/Admin/Model/VariableTest.php
index f3bc8137123..d0638db216e 100644
--- a/tests/unit/Mage/Admin/Model/VariableTest.php
+++ b/tests/unit/Mage/Admin/Model/VariableTest.php
@@ -25,17 +25,17 @@ public function setUp(): void
      * @dataProvider provideValidateData
      * @param array|true $expectedResult
      * @param string $variableName
-     * @param string $isallowed
+     * @param string $isAllowed
      * @return void
      */
-    public function testValidate($expectedResult, string $variableName, string $isallowed): void
+    public function testValidate($expectedResult, string $variableName, string $isAllowed): void
     {
         $mock = $this->getMockBuilder(Mage_Admin_Model_Variable::class)
             ->setMethods(['getVariableName', 'getIsAllowed'])
             ->getMock();
 
         $mock->expects($this->any())->method('getVariableName')->willReturn($variableName);
-        $mock->expects($this->any())->method('getIsAllowed')->willReturn($isallowed);
+        $mock->expects($this->any())->method('getIsAllowed')->willReturn($isAllowed);
         $this->assertSame($expectedResult, $mock->validate());
     }
 
diff --git a/tests/unit/Mage/Sitemap/Model/SitemapTest.php b/tests/unit/Mage/Sitemap/Model/SitemapTest.php
new file mode 100644
index 00000000000..5f1a2102fc4
--- /dev/null
+++ b/tests/unit/Mage/Sitemap/Model/SitemapTest.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Sitemap\Model;
+
+use Mage;
+use Mage_Sitemap_Model_Sitemap;
+use PHPUnit\Framework\TestCase;
+
+class SitemapTest extends TestCase
+{
+    /**
+     * @var Mage_Sitemap_Model_Sitemap
+     */
+    public Mage_Sitemap_Model_Sitemap $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::getModel('sitemap/sitemap');
+    }
+
+    public function testGenerateXml(): void
+    {
+        $mock = $this->getMockBuilder(Mage_Sitemap_Model_Sitemap::class)
+            ->setMethods(['getSitemapFilename'])
+            ->getMock();
+
+        $mock->expects($this->any())->method('getSitemapFilename')->willReturn('text.xml');
+        $this->assertInstanceOf(Mage_Sitemap_Model_Sitemap::class, $mock->generateXml());
+    }
+}

From 9448e582f011b598a4199ed09fbd50583cb72dcf Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 2 Sep 2024 06:53:38 +0200
Subject: [PATCH 54/79] Added groups/suites

---
 phpunit.xml.dist                              | 10 ++-
 tests/unit/Base/ClassLoadingTest.php          | 13 ++++
 tests/unit/Base/XmlFileLoadingTest.php        | 13 ++++
 tests/unit/Mage/Admin/Model/VariableTest.php  | 15 +++++
 .../Helper/EnvironmentConfigLoaderTest.php    | 28 ++++++++-
 .../EnvironmentConfigLoaderTestHelper.php     | 13 ++++
 tests/unit/Mage/Core/Helper/SecurityTest.php  | 17 +++++
 tests/unit/Mage/Core/Helper/StringTest.php    | 22 +++++++
 tests/unit/Mage/Core/Model/LocaleTest.php     | 15 +++++
 .../Model/Security/HtmlEscapedStringTest.php  | 17 +++++
 tests/unit/Mage/Core/Model/WebsiteTest.php    | 62 ++++++++++---------
 .../Mage/Downloadable/Helper/FileTest.php     | 15 +++++
 tests/unit/Mage/Sitemap/Model/SitemapTest.php | 16 +++++
 tests/unit/Mage/Uploader/Helper/DataTest.php  | 15 ++++-
 tests/unit/Mage/Uploader/Helper/FileTest.php  | 26 ++++++++
 .../unit/Varien/Db/Adapter/Pdo/MysqlTest.php  | 40 ++++++++++++
 tests/unit/Varien/ObjectTest.php              | 24 +++++++
 17 files changed, 329 insertions(+), 32 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 96c21abe915..002b87dfcb4 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,8 +14,14 @@
         bootstrap="tests/bootstrap.php"
 >
     <testsuites>
-        <testsuite name="Unit">
-            <directory>tests/unit</directory>
+        <testsuite name="Base">
+            <directory>tests/unit/Base</directory>
+        </testsuite>
+        <testsuite name="Mage">
+            <directory>tests/unit/Mage</directory>
+        </testsuite>
+        <testsuite name="Varien">
+            <directory>tests/unit/Varien</directory>
         </testsuite>
     </testsuites>
 
diff --git a/tests/unit/Base/ClassLoadingTest.php b/tests/unit/Base/ClassLoadingTest.php
index 0ece8a5a31d..9924660bd95 100644
--- a/tests/unit/Base/ClassLoadingTest.php
+++ b/tests/unit/Base/ClassLoadingTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Base;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/Base/XmlFileLoadingTest.php b/tests/unit/Base/XmlFileLoadingTest.php
index 13f42cd4e24..ab76531253b 100644
--- a/tests/unit/Base/XmlFileLoadingTest.php
+++ b/tests/unit/Base/XmlFileLoadingTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Base;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/Mage/Admin/Model/VariableTest.php b/tests/unit/Mage/Admin/Model/VariableTest.php
index d0638db216e..c4f81117acd 100644
--- a/tests/unit/Mage/Admin/Model/VariableTest.php
+++ b/tests/unit/Mage/Admin/Model/VariableTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Admin\Model;
 
 use Mage;
@@ -27,6 +40,8 @@ public function setUp(): void
      * @param string $variableName
      * @param string $isAllowed
      * @return void
+     *
+     * @group Mage_Admin
      */
     public function testValidate($expectedResult, string $variableName, string $isAllowed): void
     {
diff --git a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
index 5eb4a865a60..2691f397582 100644
--- a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
+++ b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Core\Helper;
 
 use Mage;
@@ -28,6 +41,9 @@ public function setup(): void
         Mage::setRoot();
     }
 
+    /**
+     * @group Mage_Core
+     */
     public function testBuildPath(): void
     {
         $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper();
@@ -35,6 +51,9 @@ public function testBuildPath(): void
         $this->assertEquals(self::XML_PATH_GENERAL, $path);
     }
 
+    /**
+     * @group Mage_Core
+     */
     public function testBuildNodePath(): void
     {
         $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper();
@@ -42,6 +61,9 @@ public function testBuildNodePath(): void
         $this->assertEquals(self::XML_PATH_DEFAULT, $nodePath);
     }
 
+    /**
+     * @group Mage_Core
+     */
     public function testXmlHasTestStrings(): void
     {
         $xmlStruct = $this->getTestXml();
@@ -54,7 +76,9 @@ public function testXmlHasTestStrings(): void
 
     /**
      * @dataProvider envOverridesCorrectConfigKeysDataProvider
-     * @param array<string, string> $config
+     * @param array $config
+     *
+     * @group Mage_Core
      */
     public function testEnvOverridesForValidConfigKeys(array $config): void
     {
@@ -176,6 +200,8 @@ public function envOverridesCorrectConfigKeysDataProvider(): array
     /**
      * @dataProvider envDoesNotOverrideOnWrongConfigKeysDataProvider
      * @param array<string, string> $config
+     *
+     * @group Mage_Core
      */
     public function testEnvDoesNotOverrideForInvalidConfigKeys(array $config): void
     {
diff --git a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php
index f6afd3b7558..e50b3032fa3 100644
--- a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php
+++ b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Core\Helper;
 
 use Mage_Core_Helper_EnvironmentConfigLoader;
diff --git a/tests/unit/Mage/Core/Helper/SecurityTest.php b/tests/unit/Mage/Core/Helper/SecurityTest.php
index 091484a46e2..9530f2e9552 100644
--- a/tests/unit/Mage/Core/Helper/SecurityTest.php
+++ b/tests/unit/Mage/Core/Helper/SecurityTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Core\Helper;
 
 use Mage;
@@ -58,6 +71,8 @@ public function validateAgainstBlockMethodBlacklistDataProvider(): array
      * @param string[] $args
      * @return void
      * @throws Mage_Core_Exception
+     *
+     * @group Mage_Core
      */
     public function testValidateAgainstBlockMethodBlacklist(
         Mage_Core_Block_Abstract $block,
@@ -123,6 +138,8 @@ public function forbiddenBlockMethodsDataProvider(): array
      * @param string[] $args
      * @return void
      * @throws Mage_Core_Exception
+     *
+     * @group Mage_Core
      */
     public function testValidateAgainstBlockMethodBlacklistThrowsException(
         Mage_Core_Block_Abstract $block,
diff --git a/tests/unit/Mage/Core/Helper/StringTest.php b/tests/unit/Mage/Core/Helper/StringTest.php
index b52395e9cac..70225ec1475 100644
--- a/tests/unit/Mage/Core/Helper/StringTest.php
+++ b/tests/unit/Mage/Core/Helper/StringTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Core\Helper;
 
 use Mage;
@@ -23,18 +36,27 @@ public function setUp(): void
         $this->subject = Mage::helper('core/string');
     }
 
+    /**
+     * @group Mage_Core
+     */
     public function testSubstr(): void
     {
         $resultString = $this->subject->substr(self::TEST_STRING, 2, 2);
         $this->assertEquals('34', $resultString);
     }
 
+    /**
+     * @group Mage_Core
+     */
     public function testTruncate(): void
     {
         $resultString = $this->subject->truncate(self::TEST_STRING, 5, '...');
         $this->assertEquals('12...', $resultString);
     }
 
+    /**
+     * @group Mage_Core
+     */
     public function testStrlen(): void
     {
         $this->assertEquals(10, $this->subject->strlen(self::TEST_STRING));
diff --git a/tests/unit/Mage/Core/Model/LocaleTest.php b/tests/unit/Mage/Core/Model/LocaleTest.php
index 7c32f43450b..8b8e654d08e 100644
--- a/tests/unit/Mage/Core/Model/LocaleTest.php
+++ b/tests/unit/Mage/Core/Model/LocaleTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Core\Model;
 
 use Mage_Core_Model_Locale;
@@ -19,6 +32,8 @@ class LocaleTest extends TestCase
      * @param float|null $expectedResult
      * @param string|float|int $value
      * @return void
+     *
+     * @group Mage_Core
      */
     public function testGetNumber(?float $expectedResult, $value): void
     {
diff --git a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
index 9aac34a90ae..a9fab8d7393 100644
--- a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
+++ b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Core\Model\Security;
 
 use Mage_Core_Model_Security_HtmlEscapedString;
@@ -22,6 +35,8 @@ class HtmlEscapedStringTest extends TestCase
      * @param string $string
      * @param array<int, string> $allowedTags
      * @return void
+     *
+     * @group Mage_Core
      */
     public function testToSting(string $expectedResult, string $string, ?array $allowedTags): void
     {
@@ -36,6 +51,8 @@ public function testToSting(string $expectedResult, string $string, ?array $allo
      * @param string $string
      * @param array<int, string> $allowedTags
      * @return void
+     *
+     * @group Mage_Core
      */
     public function testGetUnescapedValue(string $expectedResult, string $string, ?array $allowedTags): void
     {
diff --git a/tests/unit/Mage/Core/Model/WebsiteTest.php b/tests/unit/Mage/Core/Model/WebsiteTest.php
index e6760018ece..20d5ebfe510 100644
--- a/tests/unit/Mage/Core/Model/WebsiteTest.php
+++ b/tests/unit/Mage/Core/Model/WebsiteTest.php
@@ -2,12 +2,24 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Core\Model;
 
-use Mage_Core_Exception;
+use Mage;
 use Mage_Core_Model_Resource_Store_Collection;
 use Mage_Core_Model_Resource_Store_Group_Collection;
-use Mage_Core_Model_Store;
 use Mage_Core_Model_Website;
 use Mage_Directory_Model_Currency;
 use PHPUnit\Framework\TestCase;
@@ -22,12 +34,12 @@ class WebsiteTest extends TestCase
 
     public function setUp(): void
     {
-        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
-        $this->subject = new Mage_Core_Model_Website();
+        Mage::app();
+        $this->subject = Mage::getModel('core/website');
     }
 
     /**
-     * @return void
+     * @group Mage_Core
      */
     public function testLoad(): void
     {
@@ -36,17 +48,16 @@ public function testLoad(): void
     }
 
     /**
-     * @return void
+     * @group Mage_Core
      */
     public function testLoadConfig(): void
     {
-        $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->loadConfig(1));
+        $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->loadConfig('1'));
         $this->assertInstanceOf(Mage_Core_Model_Website::class, $this->subject->loadConfig('default'));
     }
 
     /**
-     * @return void
-     * @throws Mage_Core_Exception
+     * @group Mage_Core
      */
     public function testGetStoreCollection(): void
     {
@@ -54,8 +65,7 @@ public function testGetStoreCollection(): void
     }
 
     /**
-     * @return void
-     * @throws Mage_Core_Exception
+     * @group Mage_Core
      */
     public function testGetGroupCollection(): void
     {
@@ -63,8 +73,7 @@ public function testGetGroupCollection(): void
     }
 
     /**
-     * @return void
-     * @throws Mage_Core_Exception
+     * @group Mage_Core
      */
     public function testGetStores(): void
     {
@@ -72,8 +81,7 @@ public function testGetStores(): void
     }
 
     /**
-     * @return void
-     * @throws Mage_Core_Exception
+     * @group Mage_Core
      */
     public function testGetStoreIds(): void
     {
@@ -81,8 +89,7 @@ public function testGetStoreIds(): void
     }
 
     /**
-     * @return void
-     * @throws Mage_Core_Exception
+     * @group Mage_Core
      */
     public function testGetStoreCodes(): void
     {
@@ -90,8 +97,7 @@ public function testGetStoreCodes(): void
     }
 
     /**
-     * @return void
-     * @throws Mage_Core_Exception
+     * @group Mage_Core
      */
     public function testGetStoresCount(): void
     {
@@ -99,7 +105,7 @@ public function testGetStoresCount(): void
     }
 
     /**
-     * @return void
+     * @group Mage_Core
      */
     public function testGetGroups(): void
     {
@@ -107,7 +113,7 @@ public function testGetGroups(): void
     }
 
     /**
-     * @return void
+     * @group Mage_Core
      */
     public function testGetGroupIds(): void
     {
@@ -115,7 +121,7 @@ public function testGetGroupIds(): void
     }
 
     /**
-     * @return void
+     * @group Mage_Core
      */
     public function testGetGroupsCount(): void
     {
@@ -123,7 +129,7 @@ public function testGetGroupsCount(): void
     }
 
     /**
-     * @return void
+     * @group Mage_Core
      */
     public function testGetBaseCurrency(): void
     {
@@ -132,7 +138,7 @@ public function testGetBaseCurrency(): void
     }
 
 //    /**
-//     * @return void
+//     * @group Mage_Core
 //     */
 //    public function testGetDefaultStore(): void
 //    {
@@ -141,20 +147,20 @@ public function testGetBaseCurrency(): void
 //    }
 
     /**
-     * @return void
+     * @group Mage_Core
      */
     public function testGetDefaultStoresSelect(): void
     {
         $this->assertIsObject($this->subject->getDefaultStoresSelect());
-        $this->assertInstanceOf(Varien_Db_Select::class, $this->subject->getDefaultStoresSelect('true'));
+        $this->assertInstanceOf(Varien_Db_Select::class, $this->subject->getDefaultStoresSelect(true));
     }
 
     /**
-     * @return void
+     * @group Mage_Core
      */
     public function testIsReadOnly(): void
     {
         $this->assertFalse($this->subject->isReadOnly());
-        $this->assertTrue($this->subject->isReadOnly('true'));
+        $this->assertTrue($this->subject->isReadOnly(true));
     }
 }
diff --git a/tests/unit/Mage/Downloadable/Helper/FileTest.php b/tests/unit/Mage/Downloadable/Helper/FileTest.php
index 7b744965797..ea672ba4dec 100644
--- a/tests/unit/Mage/Downloadable/Helper/FileTest.php
+++ b/tests/unit/Mage/Downloadable/Helper/FileTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Downloadable\Helper;
 
 use Mage;
@@ -27,6 +40,8 @@ public function setUp(): void
      * @param string $path
      * @param string|null $file
      * @return void
+     *
+     * @group Mage_Downloadable
      */
     public function testGetFilePath(string $expectedResult, string $path, ?string $file): void
     {
diff --git a/tests/unit/Mage/Sitemap/Model/SitemapTest.php b/tests/unit/Mage/Sitemap/Model/SitemapTest.php
index 5f1a2102fc4..03623eca1e8 100644
--- a/tests/unit/Mage/Sitemap/Model/SitemapTest.php
+++ b/tests/unit/Mage/Sitemap/Model/SitemapTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Sitemap\Model;
 
 use Mage;
@@ -21,6 +34,9 @@ public function setUp(): void
         $this->subject = Mage::getModel('sitemap/sitemap');
     }
 
+    /**
+     * @group Mage_Sitemap
+     */
     public function testGenerateXml(): void
     {
         $mock = $this->getMockBuilder(Mage_Sitemap_Model_Sitemap::class)
diff --git a/tests/unit/Mage/Uploader/Helper/DataTest.php b/tests/unit/Mage/Uploader/Helper/DataTest.php
index ead44d271c7..5ca75bf677d 100644
--- a/tests/unit/Mage/Uploader/Helper/DataTest.php
+++ b/tests/unit/Mage/Uploader/Helper/DataTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Uploader\Helper;
 
 use Mage;
@@ -21,7 +34,7 @@ public function setUp(): void
     }
 
     /**
-     * @return void
+     * @group Mage_Uploader
      */
     public function testIsModuleEnabled(): void
     {
diff --git a/tests/unit/Mage/Uploader/Helper/FileTest.php b/tests/unit/Mage/Uploader/Helper/FileTest.php
index 215fd5746be..9fd9894169f 100644
--- a/tests/unit/Mage/Uploader/Helper/FileTest.php
+++ b/tests/unit/Mage/Uploader/Helper/FileTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Mage\Uploader\Helper;
 
 use Mage;
@@ -31,6 +44,8 @@ public function setUp(): void
      * @param array<int, string> $expectedResult
      * @param string|array<int, string> $extensionsList
      * @return void
+     *
+     * @group Mage_Uploader
      */
     public function testGetMimeTypeFromExtensionList(array $expectedResult, $extensionsList): void
     {
@@ -70,16 +85,25 @@ public function provideGetMimeTypeFromExtensionListData(): array
         ];
     }
 
+    /**
+     * @group Mage_Uploader
+     */
     public function testGetPostMaxSize(): void
     {
         $this->assertIsString($this->subject->getPostMaxSize());
     }
 
+    /**
+     * @group Mage_Uploader
+     */
     public function testGetUploadMaxSize(): void
     {
         $this->assertIsString($this->subject->getUploadMaxSize());
     }
 
+    /**
+     * @group Mage_Uploader
+     */
     public function testGetDataMaxSize(): void
     {
         $mock = $this->getMockBuilder(Mage_Uploader_Helper_File::class)
@@ -96,6 +120,8 @@ public function testGetDataMaxSize(): void
      * @param int $expectedResult
      * @param string $maxSize
      * @return void
+     *
+     * @group Mage_Uploader
      */
     public function testGetDataMaxSizeInBytes(int $expectedResult, string $maxSize): void
     {
diff --git a/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php b/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
index 9966f66574c..8647a74b9c6 100644
--- a/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
+++ b/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Varien\Db\Adapter\Pdo;
 
 use PHPUnit\Framework\TestCase;
@@ -36,6 +49,9 @@ protected function setUp(): void
         $constructor->invoke($this->adapter, $config);
     }
 
+    /**
+     * @group Varien_Db
+     */
     public function testGetHostInfoWithUnixSocket(): void
     {
         $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
@@ -52,6 +68,9 @@ public function testGetHostInfoWithUnixSocket(): void
         $this->assertNull($hostInfo->getPort());
     }
 
+    /**
+     * @group Varien_Db
+     */
     public function testGetHostInfoWithIpv4Address(): void
     {
         $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
@@ -66,6 +85,9 @@ public function testGetHostInfoWithIpv4Address(): void
         $this->assertNull($hostInfo->getUnixSocket());
     }
 
+    /**
+     * @group Varien_Db
+     */
     public function testGetHostInfoWithIpv4AddressWithoutPort(): void
     {
         $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
@@ -80,6 +102,9 @@ public function testGetHostInfoWithIpv4AddressWithoutPort(): void
         $this->assertNull($hostInfo->getUnixSocket());
     }
 
+    /**
+     * @group Varien_Db
+     */
     public function testGetHostInfoWithHostname(): void
     {
         $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
@@ -94,6 +119,9 @@ public function testGetHostInfoWithHostname(): void
         $this->assertNull($hostInfo->getUnixSocket());
     }
 
+    /**
+     * @group Varien_Db
+     */
     public function testGetHostInfoWithHostnameWithoutPort(): void
     {
         $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
@@ -108,6 +136,9 @@ public function testGetHostInfoWithHostnameWithoutPort(): void
         $this->assertNull($hostInfo->getUnixSocket());
     }
 
+    /**
+     * @group Varien_Db
+     */
     public function testGetHostInfoWithIpv6Address(): void
     {
         $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
@@ -122,6 +153,9 @@ public function testGetHostInfoWithIpv6Address(): void
         $this->assertNull($hostInfo->getUnixSocket());
     }
 
+    /**
+     * @group Varien_Db
+     */
     public function testGetHostInfoWithIpv6AddressWithoutPort(): void
     {
         $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
@@ -136,6 +170,9 @@ public function testGetHostInfoWithIpv6AddressWithoutPort(): void
         $this->assertNull($hostInfo->getUnixSocket());
     }
 
+    /**
+     * @group Varien_Db
+     */
     public function testGetHostInfoWithIpv6AddressWithZoneId(): void
     {
         $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
@@ -150,6 +187,9 @@ public function testGetHostInfoWithIpv6AddressWithZoneId(): void
         $this->assertNull($hostInfo->getUnixSocket());
     }
 
+    /**
+     * @group Varien_Db
+     */
     public function testGetHostInfoWithIpv6AddressWithZoneIdWithoutPort(): void
     {
         $method = new ReflectionMethod(Varien_Db_Adapter_Pdo_Mysql::class, '_getHostInfo');
diff --git a/tests/unit/Varien/ObjectTest.php b/tests/unit/Varien/ObjectTest.php
index 5ab56c22816..37414c406f8 100644
--- a/tests/unit/Varien/ObjectTest.php
+++ b/tests/unit/Varien/ObjectTest.php
@@ -2,6 +2,19 @@
 
 declare(strict_types=1);
 
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
 namespace OpenMage\Tests\Unit\Varien;
 
 use PHPUnit\Framework\TestCase;
@@ -29,6 +42,8 @@ public function setUp(): void
      * @param string $key
      * @param string|int|null $index
      * @return void
+     *
+     * @group Varien_Object
      */
     public function testGetData($expectedResult, $setKey, $setValue, string $key, $index = null): void
     {
@@ -159,6 +174,9 @@ public function provideGetDataData(): array
         ];
     }
 
+    /**
+     * @group Varien_Object
+     */
     public function testToString(): void
     {
         $this->subject->setString1('open');
@@ -168,6 +186,9 @@ public function testToString(): void
         $this->assertSame('open', $this->subject->toString('{{string1}}{{string_not_exists}}'));
     }
 
+    /**
+     * @group Varien_Object
+     */
     public function testGetSetUnsData(): void
     {
         $this->assertTrue($this->subject->isEmpty());
@@ -222,6 +243,9 @@ public function testGetSetUnsData(): void
         }
     }
 
+    /**
+     * @group Varien_Object
+     */
     public function testOffset(): void
     {
         $this->assertFalse($this->subject->offsetExists('off'));

From 0c362c673e7a93c6e96d51e5f0b4e6f9408e9608 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 2 Sep 2024 07:28:17 +0200
Subject: [PATCH 55/79] Updated test

---
 tests/unit/Mage/Core/Model/LocaleTest.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/unit/Mage/Core/Model/LocaleTest.php b/tests/unit/Mage/Core/Model/LocaleTest.php
index 8b8e654d08e..b8362fbcac9 100644
--- a/tests/unit/Mage/Core/Model/LocaleTest.php
+++ b/tests/unit/Mage/Core/Model/LocaleTest.php
@@ -17,6 +17,7 @@
 
 namespace OpenMage\Tests\Unit\Mage\Core\Model;
 
+use Mage;
 use Mage_Core_Model_Locale;
 use PHPUnit\Framework\TestCase;
 
@@ -27,6 +28,12 @@ class LocaleTest extends TestCase
      */
     public Mage_Core_Model_Locale $subject;
 
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::getModel('core/locale');
+    }
+
     /**
      * @dataProvider provideGetNumberData
      * @param float|null $expectedResult
@@ -37,8 +44,6 @@ class LocaleTest extends TestCase
      */
     public function testGetNumber(?float $expectedResult, $value): void
     {
-        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
-        $this->subject = new Mage_Core_Model_Locale();
         $this->assertSame($expectedResult, $this->subject->getNumber($value));
     }
 

From a6ffaca5f5de6998ec03140f462665fd576bac19 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 2 Sep 2024 07:36:34 +0200
Subject: [PATCH 56/79] CS fix

---
 tests/unit/Base/ClassLoadingTest.php                          | 4 ++--
 tests/unit/Base/XmlFileLoadingTest.php                        | 4 ++--
 tests/unit/Mage/Admin/Model/VariableTest.php                  | 4 ++--
 tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php   | 4 ++--
 .../Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php    | 4 ++--
 tests/unit/Mage/Core/Helper/SecurityTest.php                  | 4 ++--
 tests/unit/Mage/Core/Helper/StringTest.php                    | 4 ++--
 tests/unit/Mage/Core/Model/LocaleTest.php                     | 4 ++--
 tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php | 4 ++--
 tests/unit/Mage/Core/Model/WebsiteTest.php                    | 4 ++--
 tests/unit/Mage/Downloadable/Helper/FileTest.php              | 4 ++--
 tests/unit/Mage/Sitemap/Model/SitemapTest.php                 | 4 ++--
 tests/unit/Mage/Uploader/Helper/DataTest.php                  | 4 ++--
 tests/unit/Mage/Uploader/Helper/FileTest.php                  | 4 ++--
 tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php                | 4 ++--
 tests/unit/Varien/ObjectTest.php                              | 4 ++--
 16 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/tests/unit/Base/ClassLoadingTest.php b/tests/unit/Base/ClassLoadingTest.php
index 9924660bd95..45b1d350f63 100644
--- a/tests/unit/Base/ClassLoadingTest.php
+++ b/tests/unit/Base/ClassLoadingTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Base;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/Base/XmlFileLoadingTest.php b/tests/unit/Base/XmlFileLoadingTest.php
index ab76531253b..8cca409ddc2 100644
--- a/tests/unit/Base/XmlFileLoadingTest.php
+++ b/tests/unit/Base/XmlFileLoadingTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Base;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/Mage/Admin/Model/VariableTest.php b/tests/unit/Mage/Admin/Model/VariableTest.php
index c4f81117acd..0ffa40b8e41 100644
--- a/tests/unit/Mage/Admin/Model/VariableTest.php
+++ b/tests/unit/Mage/Admin/Model/VariableTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Admin\Model;
 
 use Mage;
diff --git a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
index 2691f397582..ae0be16c89a 100644
--- a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
+++ b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Core\Helper;
 
 use Mage;
diff --git a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php
index e50b3032fa3..3739d3d7c79 100644
--- a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php
+++ b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTestHelper.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Core\Helper;
 
 use Mage_Core_Helper_EnvironmentConfigLoader;
diff --git a/tests/unit/Mage/Core/Helper/SecurityTest.php b/tests/unit/Mage/Core/Helper/SecurityTest.php
index 9530f2e9552..aea7c56b6ab 100644
--- a/tests/unit/Mage/Core/Helper/SecurityTest.php
+++ b/tests/unit/Mage/Core/Helper/SecurityTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Core\Helper;
 
 use Mage;
diff --git a/tests/unit/Mage/Core/Helper/StringTest.php b/tests/unit/Mage/Core/Helper/StringTest.php
index 70225ec1475..a3b234fa32b 100644
--- a/tests/unit/Mage/Core/Helper/StringTest.php
+++ b/tests/unit/Mage/Core/Helper/StringTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Core\Helper;
 
 use Mage;
diff --git a/tests/unit/Mage/Core/Model/LocaleTest.php b/tests/unit/Mage/Core/Model/LocaleTest.php
index b8362fbcac9..3bcacfb0565 100644
--- a/tests/unit/Mage/Core/Model/LocaleTest.php
+++ b/tests/unit/Mage/Core/Model/LocaleTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Core\Model;
 
 use Mage;
diff --git a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
index a9fab8d7393..5a558d6fc0a 100644
--- a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
+++ b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Core\Model\Security;
 
 use Mage_Core_Model_Security_HtmlEscapedString;
diff --git a/tests/unit/Mage/Core/Model/WebsiteTest.php b/tests/unit/Mage/Core/Model/WebsiteTest.php
index 20d5ebfe510..a25cda689b3 100644
--- a/tests/unit/Mage/Core/Model/WebsiteTest.php
+++ b/tests/unit/Mage/Core/Model/WebsiteTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Core\Model;
 
 use Mage;
diff --git a/tests/unit/Mage/Downloadable/Helper/FileTest.php b/tests/unit/Mage/Downloadable/Helper/FileTest.php
index ea672ba4dec..f4dcd0b0447 100644
--- a/tests/unit/Mage/Downloadable/Helper/FileTest.php
+++ b/tests/unit/Mage/Downloadable/Helper/FileTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Downloadable\Helper;
 
 use Mage;
diff --git a/tests/unit/Mage/Sitemap/Model/SitemapTest.php b/tests/unit/Mage/Sitemap/Model/SitemapTest.php
index 03623eca1e8..ef5c6ec880a 100644
--- a/tests/unit/Mage/Sitemap/Model/SitemapTest.php
+++ b/tests/unit/Mage/Sitemap/Model/SitemapTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Sitemap\Model;
 
 use Mage;
diff --git a/tests/unit/Mage/Uploader/Helper/DataTest.php b/tests/unit/Mage/Uploader/Helper/DataTest.php
index 5ca75bf677d..735f8d95fad 100644
--- a/tests/unit/Mage/Uploader/Helper/DataTest.php
+++ b/tests/unit/Mage/Uploader/Helper/DataTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Uploader\Helper;
 
 use Mage;
diff --git a/tests/unit/Mage/Uploader/Helper/FileTest.php b/tests/unit/Mage/Uploader/Helper/FileTest.php
index 9fd9894169f..f56ddf6e319 100644
--- a/tests/unit/Mage/Uploader/Helper/FileTest.php
+++ b/tests/unit/Mage/Uploader/Helper/FileTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Mage\Uploader\Helper;
 
 use Mage;
diff --git a/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php b/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
index 8647a74b9c6..c1d3b341aef 100644
--- a/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
+++ b/tests/unit/Varien/Db/Adapter/Pdo/MysqlTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Varien\Db\Adapter\Pdo;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/unit/Varien/ObjectTest.php b/tests/unit/Varien/ObjectTest.php
index 37414c406f8..d7c2e785e63 100644
--- a/tests/unit/Varien/ObjectTest.php
+++ b/tests/unit/Varien/ObjectTest.php
@@ -1,7 +1,5 @@
 <?php
 
-declare(strict_types=1);
-
 /**
  * OpenMage
  *
@@ -15,6 +13,8 @@
  * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
+declare(strict_types=1);
+
 namespace OpenMage\Tests\Unit\Varien;
 
 use PHPUnit\Framework\TestCase;

From 6f05fc99243841301cc315bd849e5f7eeb280318 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 20:22:45 +0200
Subject: [PATCH 57/79] Updated .gitignore

---
 .ddev/commands/web/phpunit          |  2 +-
 .ddev/commands/web/phpunit-coverage |  2 +-
 .gitignore                          | 11 ++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.ddev/commands/web/phpunit b/.ddev/commands/web/phpunit
index b7449dabc0d..40352e7b153 100755
--- a/.ddev/commands/web/phpunit
+++ b/.ddev/commands/web/phpunit
@@ -4,4 +4,4 @@
 ## Usage: phpunit
 ## Example: ddev phpunit
 
-php vendor/bin/phpunit --no-coverage "$@"
+php vendor/bin/phpunit --no-coverage "$@" --testdox
diff --git a/.ddev/commands/web/phpunit-coverage b/.ddev/commands/web/phpunit-coverage
index 1fd16c8753f..7a877d6cb6d 100755
--- a/.ddev/commands/web/phpunit-coverage
+++ b/.ddev/commands/web/phpunit-coverage
@@ -5,5 +5,5 @@
 ## Example: ddev phpunit-coverage
 
 enable_xdebug
-XDEBUG_MODE=coverage php vendor/bin/phpunit "$@"
+XDEBUG_MODE=coverage php vendor/bin/phpunit "$@" --testdox
 disable_xdebug
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a2393f3e06b..07cb262d871 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,13 +23,6 @@
 /app/etc/modules/Cm_RedisSession.xml
 /lib/Credis
 
-# Add a base setup for running unit Tests with code coverage and send them to SonarCloud
-# https://github.com/OpenMage/magento-lts/pull/1836
-/dev/testfield
-/dev/tests/clover.xml
-/dev/tests/crap4j.xml
-/dev/tests/junit.xml
-
 # Add Gitpod online IDE config
 # https://github.com/OpenMage/magento-lts/pull/1836
 /dev/gitpod/docker-magento
@@ -73,12 +66,16 @@
 phpstan*.neon
 !phpstan.dist.*.neon
 
+# PhpUnit
 tests/coverage
 tests/logging
 .phpunit.result.cache
 phpunit.xml
 !phpunit.xml.dist
 
+# build
+/build
+
 # dev scripts loaded via composer
 /shell/update-copyright.php
 /shell/translations.php

From e229c1648838a075830ea7f6c2f38e2c2b6ee883 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 20:23:08 +0200
Subject: [PATCH 58/79] Updated phpunit.xml.dist

---
 phpunit.xml.dist | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 002b87dfcb4..306b6bcc934 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,7 +2,7 @@
 
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
         backupGlobals="false"
         backupStaticAttributes="false"
         colors="true"
@@ -37,6 +37,11 @@
             <file>app/bootstrap.php</file>
             <file>app/code/core/Mage/Admin/Model/Acl/Assert/Ip.php</file>
             <file>app/code/core/Mage/Admin/Model/Acl/Assert/Time.php</file>
+            <directory>app/code/community</directory>
+            <directory>app/code/local/</directory>
+            <directory>app/code/core/Mage/*/data</directory>
+            <directory>app/code/core/Mage/*/sql</directory>
+            <directory>vendor</directory>
         </exclude>
         <report>
             <clover outputFile="tests/coverage/clover.xml"/>

From 3eb7b19377033723a307a482d8162d7c318a8572 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 20:25:54 +0200
Subject: [PATCH 59/79] Added test

---
 tests/unit/Mage/Cms/Helper/DataTest.php | 75 +++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 tests/unit/Mage/Cms/Helper/DataTest.php

diff --git a/tests/unit/Mage/Cms/Helper/DataTest.php b/tests/unit/Mage/Cms/Helper/DataTest.php
new file mode 100644
index 00000000000..c1141f3ca67
--- /dev/null
+++ b/tests/unit/Mage/Cms/Helper/DataTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Cms\Helper;
+
+use Mage;
+use Mage_Cms_Helper_Data;
+use PHPUnit\Framework\TestCase;
+use Varien_Filter_Template;
+
+class DataTest extends TestCase
+{
+    public const TEST_STRING = '1234567890';
+
+    /**
+     * @var Mage_Cms_Helper_Data
+     */
+    public Mage_Cms_Helper_Data $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('cms/data');
+    }
+
+    /**
+     * @group Mage_Cms
+     * @group Mage_Cms_Helper
+     */
+    public function testGetAllowedStreamWrappers(): void
+    {
+        $this->assertIsArray($this->subject->getAllowedStreamWrappers());
+    }
+
+    /**
+     * @group Mage_Cms
+     * @group Mage_Cms_Helper
+     */
+    public function testGetBlockTemplateProcessor(): void
+    {
+        $this->assertInstanceOf(Varien_Filter_Template::class, $this->subject->getBlockTemplateProcessor());
+    }
+
+    /**
+     * @group Mage_Cms
+     * @group Mage_Cms_Helper
+     */
+    public function testGetPageTemplateProcessor(): void
+    {
+        $this->assertInstanceOf(Varien_Filter_Template::class, $this->subject->getPageTemplateProcessor());
+    }
+
+    /**
+     * @group Mage_Cms
+     * @group Mage_Cms_Helper
+     */
+    public function testIsSwfDisabled(): void
+    {
+        $this->assertTrue($this->subject->isSwfDisabled());
+    }
+ }

From e0e3cbaa481bc69b476fbccbeefd7d9cf481afea Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 20:26:48 +0200
Subject: [PATCH 60/79] Added tests

---
 tests/unit/Mage/Log/Helper/DataTest.php | 75 +++++++++++++++++++++++++
 tests/unit/Mage/Log/Model/CronTest.php  | 47 ++++++++++++++++
 tests/unit/Mage/Log/Model/LogTest.php   | 47 ++++++++++++++++
 3 files changed, 169 insertions(+)
 create mode 100644 tests/unit/Mage/Log/Helper/DataTest.php
 create mode 100644 tests/unit/Mage/Log/Model/CronTest.php
 create mode 100644 tests/unit/Mage/Log/Model/LogTest.php

diff --git a/tests/unit/Mage/Log/Helper/DataTest.php b/tests/unit/Mage/Log/Helper/DataTest.php
new file mode 100644
index 00000000000..0fc68b1f06b
--- /dev/null
+++ b/tests/unit/Mage/Log/Helper/DataTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Log\Helper;
+
+use Mage;
+use Mage_Log_Helper_Data;
+use PHPUnit\Framework\TestCase;
+
+class DataTest extends TestCase
+{
+    public const TEST_STRING = '1234567890';
+
+    /**
+     * @var Mage_Log_Helper_Data
+     */
+    public Mage_Log_Helper_Data $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('log/data');
+    }
+
+    /**
+     * @group Mage_Log
+     * @group Mage_Log_Helper
+     */
+    public function testIsVisitorLogEnabled(): void
+    {
+        $this->assertIsBool($this->subject->isVisitorLogEnabled());
+    }
+
+    /**
+     * @group Mage_Log
+     * @group Mage_Log_Helper
+     */
+    public function testIsLogEnabled(): void
+    {
+        $this->assertIsBool($this->subject->isLogEnabled());
+    }
+
+    /**
+     * @group Mage_Log
+     * @group Mage_Log_Helper
+     */
+    public function testIsLogDisabled(): void
+    {
+        $this->assertIsBool($this->subject->isLogDisabled());
+    }
+
+    /**
+     * @group Mage_Log
+     * @group Mage_Log_Helper
+     */
+    public function testIsLogFileExtensionValid(): void
+    {
+        $this->assertIsBool($this->subject->isLogFileExtensionValid('invalid.file'));
+        $this->assertIsBool($this->subject->isLogFileExtensionValid('valid.log'));
+    }
+ }
diff --git a/tests/unit/Mage/Log/Model/CronTest.php b/tests/unit/Mage/Log/Model/CronTest.php
new file mode 100644
index 00000000000..68e29ed42a8
--- /dev/null
+++ b/tests/unit/Mage/Log/Model/CronTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Log\Model;
+
+use Mage;
+use Mage_Log_Model_Cron;
+use PHPUnit\Framework\TestCase;
+
+class CronTest extends TestCase
+{
+    /**
+     * @var Mage_Log_Model_Cron
+     */
+    public Mage_Log_Model_Cron $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::getModel('log/cron');
+    }
+
+    /**
+     * @return void
+     *
+     * @group Mage_Log
+     * @group Mage_Log_Model
+     */
+    public function testLogClean(): void
+    {
+        $this->assertInstanceOf(Mage_Log_Model_Cron::class, $this->subject->logClean());
+    }
+}
diff --git a/tests/unit/Mage/Log/Model/LogTest.php b/tests/unit/Mage/Log/Model/LogTest.php
new file mode 100644
index 00000000000..571d18b40de
--- /dev/null
+++ b/tests/unit/Mage/Log/Model/LogTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Log\Model;
+
+use Mage;
+use Mage_Log_Model_Log;
+use PHPUnit\Framework\TestCase;
+
+class LogTest extends TestCase
+{
+    /**
+     * @var Mage_Log_Model_Log
+     */
+    public Mage_Log_Model_Log $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::getModel('log/log');
+    }
+
+    /**
+     * @return void
+     *
+     * @group Mage_Log
+     * @group Mage_Log_Model
+     */
+    public function testClean(): void
+    {
+        $this->assertInstanceOf(Mage_Log_Model_Log::class, $this->subject->clean());
+    }
+}

From a44184cf6f83463796537fe6ed2931a038a20146 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 20:32:35 +0200
Subject: [PATCH 61/79] Added tests

---
 tests/unit/Mage/Admin/Helper/BlockTest.php |  54 ++++++++
 tests/unit/Mage/Admin/Helper/DataTest.php  |  54 ++++++++
 tests/unit/Mage/Admin/Model/UserTest.php   | 151 +++++++++++++++++++++
 3 files changed, 259 insertions(+)
 create mode 100644 tests/unit/Mage/Admin/Helper/BlockTest.php
 create mode 100644 tests/unit/Mage/Admin/Helper/DataTest.php
 create mode 100644 tests/unit/Mage/Admin/Model/UserTest.php

diff --git a/tests/unit/Mage/Admin/Helper/BlockTest.php b/tests/unit/Mage/Admin/Helper/BlockTest.php
new file mode 100644
index 00000000000..84e2acef6b7
--- /dev/null
+++ b/tests/unit/Mage/Admin/Helper/BlockTest.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Admin\Helper;
+
+use Mage;
+use Mage_Admin_Helper_Block;
+use PHPUnit\Framework\TestCase;
+
+class BlockTest extends TestCase
+{
+    /**
+     * @var Mage_Admin_Helper_Block
+     */
+    public Mage_Admin_Helper_Block $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('admin/block');
+    }
+
+    /**
+     * @group Mage_Admin
+     * @group Mage_Admin_Helper
+     */
+    public function testIsTypeAllowed(): void
+    {
+        $this->assertIsBool($this->subject->isTypeAllowed('some-type'));
+    }
+
+    /**
+     * @group Mage_Admin
+     * @group Mage_Admin_Helper
+     */
+    public function testGetDisallowedBlockNames(): void
+    {
+        $this->assertIsArray($this->subject->getDisallowedBlockNames());
+    }
+}
diff --git a/tests/unit/Mage/Admin/Helper/DataTest.php b/tests/unit/Mage/Admin/Helper/DataTest.php
new file mode 100644
index 00000000000..62941ebe628
--- /dev/null
+++ b/tests/unit/Mage/Admin/Helper/DataTest.php
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Admin\Helper;
+
+use Mage;
+use Mage_Admin_Helper_Data;
+use PHPUnit\Framework\TestCase;
+
+class DataTest extends TestCase
+{
+    /**
+     * @var Mage_Admin_Helper_Data
+     */
+    public Mage_Admin_Helper_Data $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('admin/data');
+    }
+
+    /**
+     * @group Mage_Admin
+     * @group Mage_Admin_Helper
+     */
+    public function testGenerateResetPasswordLinkToken(): void
+    {
+        $this->assertIsString($this->subject->generateResetPasswordLinkToken());
+    }
+
+    /**
+     * @group Mage_Admin
+     * @group Mage_Admin_Helper
+     */
+    public function testGetResetPasswordLinkExpirationPeriod(): void
+    {
+        $this->assertIsInt($this->subject->getResetPasswordLinkExpirationPeriod());
+    }
+}
diff --git a/tests/unit/Mage/Admin/Model/UserTest.php b/tests/unit/Mage/Admin/Model/UserTest.php
new file mode 100644
index 00000000000..d62da38751c
--- /dev/null
+++ b/tests/unit/Mage/Admin/Model/UserTest.php
@@ -0,0 +1,151 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Admin\Model;
+
+use Mage;
+use Mage_Admin_Model_User;
+use PHPUnit\Framework\TestCase;
+
+class UserTest extends TestCase
+{
+    /**
+     * @var Mage_Admin_Model_User
+     */
+    public Mage_Admin_Model_User $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::getModel('admin/user');
+    }
+
+    /**
+     * @dataProvider provideValidateData
+     * @param array|true $expectedResult
+     * @param array $methods
+     * @return void
+     *
+     * @group Mage_Admin
+     * @group Mage_Admin_Model
+     */
+    public function testValidate($expectedResult, array $methods): void
+    {
+        $mock = $this->getMockBuilder(Mage_Admin_Model_User::class)
+            ->setMethods([
+                'hasNewPassword',
+                'getNewPassword',
+                'hasPassword',
+                'getPassword',
+            ])
+            ->getMock();
+
+        $mock->expects($this->any())->method('hasNewPassword')->willReturn($methods['hasNewPassword']);
+        $mock->expects($this->any())->method('getNewPassword')->willReturn($methods['getNewPassword']);
+        $mock->expects($this->any())->method('hasPassword')->willReturn($methods['hasPassword']);
+        $mock->expects($this->any())->method('getPassword')->willReturn($methods['getPassword']);
+        // phpcs:ignore Ecg.Security.ForbiddenFunction.Found
+        $this->assertSame($expectedResult, $mock->validate());
+    }
+
+    /**
+     * @return array<string, array<int, bool|array|string>>
+     */
+    public function provideValidateData(): array
+    {
+        return [
+            'test_fails_1' => [
+                [
+                    0 => 'User Name is required field.',
+                    1 => 'First Name is required field.',
+                    2 => 'Last Name is required field.',
+                    3 => 'Please enter a valid email.',
+                    4 => 'Password must be at least of 14 characters.',
+                    5 => 'Password must include both numeric and alphabetic characters.',
+                ],
+                [
+                    'hasNewPassword' => true,
+                    'getNewPassword' => '123',
+                    'hasPassword' => false,
+                    'getPassword' => '456',
+                ]
+            ],
+            'test_fails_2' => [
+                [
+                    0 => 'User Name is required field.',
+                    1 => 'First Name is required field.',
+                    2 => 'Last Name is required field.',
+                    3 => 'Please enter a valid email.',
+                    4 => 'Password must be at least of 14 characters.',
+                    5 => 'Password must include both numeric and alphabetic characters.',
+                ],
+                [
+                    'hasNewPassword' => false,
+                    'getNewPassword' => '123',
+                    'hasPassword' => true,
+                    'getPassword' => '456',
+                ]
+            ],
+        ];
+    }
+
+    /**
+     * @group Mage_Admin
+     * @group Mage_Admin_Model
+     */
+    public function testValidateCurrentPassword(): void
+    {
+        $this->assertIsArray($this->subject->validateCurrentPassword(''));
+        $this->assertIsArray($this->subject->validateCurrentPassword('123'));
+    }
+
+    /**
+     * @group Mage_Admin
+     * @group Mage_Admin_Model
+     */
+    public function testLoadByUsername(): void
+    {
+        $this->assertInstanceOf(Mage_Admin_Model_User::class, $this->subject->loadByUsername('invalid-user'));
+    }
+
+    /**
+     * @group Mage_Admin
+     * @group Mage_Admin_Model
+     */
+    public function testChangeResetPasswordLinkToken(): void
+    {
+        $this->assertInstanceOf(Mage_Admin_Model_User::class, $this->subject->changeResetPasswordLinkToken('123'));
+    }
+
+    /**
+     * @group Mage_Admin
+     * @group Mage_Admin_Model
+     */
+    public function testIsResetPasswordLinkTokenExpired(): void
+    {
+        $this->assertIsBool($this->subject->isResetPasswordLinkTokenExpired());
+    }
+
+    /**
+     * @group Mage_Admin
+     * @group Mage_Admin_Model
+     */
+    public function testSendPasswordResetConfirmationEmail(): void
+    {
+        $this->assertInstanceOf(Mage_Admin_Model_User::class, $this->subject->sendPasswordResetConfirmationEmail());
+    }
+}

From 2b00b850038862f9655d3fe1fa12ee35a7ebee17 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 20:34:19 +0200
Subject: [PATCH 62/79] Added tests

---
 tests/unit/Mage/Core/Helper/CookieTest.php    |  72 ++++++++++++
 .../Helper/EnvironmentConfigLoaderTest.php    |  20 ++--
 tests/unit/Mage/Core/Helper/HintTest.php      |  47 ++++++++
 tests/unit/Mage/Core/Helper/PurifierTest.php  |  48 ++++++++
 tests/unit/Mage/Core/Helper/SecurityTest.php  |   5 +
 tests/unit/Mage/Core/Helper/UrlTest.php       | 111 ++++++++++++++++++
 6 files changed, 295 insertions(+), 8 deletions(-)
 create mode 100644 tests/unit/Mage/Core/Helper/CookieTest.php
 create mode 100644 tests/unit/Mage/Core/Helper/HintTest.php
 create mode 100644 tests/unit/Mage/Core/Helper/PurifierTest.php
 create mode 100644 tests/unit/Mage/Core/Helper/UrlTest.php

diff --git a/tests/unit/Mage/Core/Helper/CookieTest.php b/tests/unit/Mage/Core/Helper/CookieTest.php
new file mode 100644
index 00000000000..c54173cce3b
--- /dev/null
+++ b/tests/unit/Mage/Core/Helper/CookieTest.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Helper;
+
+use Mage;
+use Mage_Core_Helper_Cookie;
+use PHPUnit\Framework\TestCase;
+
+class CookieTest extends TestCase
+{
+    /**
+     * @var Mage_Core_Helper_Cookie
+     */
+    public Mage_Core_Helper_Cookie $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('core/cookie');
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testIsUserNotAllowSaveCookie(): void
+    {
+        $this->assertIsBool($this->subject->isUserNotAllowSaveCookie());
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetAcceptedSaveCookiesWebsiteIds(): void
+    {
+        $this->assertIsString($this->subject->getAcceptedSaveCookiesWebsiteIds());
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetCookieRestrictionLifetime(): void
+    {
+        $this->assertIsInt($this->subject->getCookieRestrictionLifetime());
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetCookieRestrictionNoticeCmsBlockIdentifier(): void
+    {
+        $this->assertIsString($this->subject->getCookieRestrictionNoticeCmsBlockIdentifier());
+    }
+}
diff --git a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
index ae0be16c89a..82a9f33834f 100644
--- a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
+++ b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
@@ -43,35 +43,38 @@ public function setup(): void
 
     /**
      * @group Mage_Core
+     * @group Mage_Core_Helper
      */
     public function testBuildPath(): void
     {
         $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper();
         $path = $environmentConfigLoaderHelper->exposedBuildPath('GENERAL', 'STORE_INFORMATION', 'NAME');
-        $this->assertEquals(self::XML_PATH_GENERAL, $path);
+        $this->assertSame(self::XML_PATH_GENERAL, $path);
     }
 
     /**
      * @group Mage_Core
+     * @group Mage_Core_Helper
      */
     public function testBuildNodePath(): void
     {
         $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper();
         $nodePath = $environmentConfigLoaderHelper->exposedBuildNodePath('DEFAULT', self::XML_PATH_GENERAL);
-        $this->assertEquals(self::XML_PATH_DEFAULT, $nodePath);
+        $this->assertSame(self::XML_PATH_DEFAULT, $nodePath);
     }
 
     /**
      * @group Mage_Core
+     * @group Mage_Core_Helper
      */
     public function testXmlHasTestStrings(): void
     {
         $xmlStruct = $this->getTestXml();
         $xml = new Varien_Simplexml_Config();
         $xml->loadString($xmlStruct);
-        $this->assertEquals('test_default', (string)$xml->getNode(self::XML_PATH_DEFAULT));
-        $this->assertEquals('test_website', (string)$xml->getNode(self::XML_PATH_WEBSITE));
-        $this->assertEquals('test_store', (string)$xml->getNode(self::XML_PATH_STORE));
+        $this->assertSame('test_default', (string)$xml->getNode(self::XML_PATH_DEFAULT));
+        $this->assertSame('test_website', (string)$xml->getNode(self::XML_PATH_WEBSITE));
+        $this->assertSame('test_store', (string)$xml->getNode(self::XML_PATH_STORE));
     }
 
     /**
@@ -79,6 +82,7 @@ public function testXmlHasTestStrings(): void
      * @param array $config
      *
      * @group Mage_Core
+     * @group Mage_Core_Helper
      */
     public function testEnvOverridesForValidConfigKeys(array $config): void
     {
@@ -213,11 +217,11 @@ public function testEnvDoesNotOverrideForInvalidConfigKeys(array $config): void
         $xml->loadString($xmlStruct);
 
         $defaultValue = 'test_default';
-        $this->assertEquals($defaultValue, (string)$xml->getNode(self::XML_PATH_DEFAULT));
+        $this->assertSame($defaultValue, (string)$xml->getNode(self::XML_PATH_DEFAULT));
         $defaultWebsiteValue = 'test_website';
-        $this->assertEquals($defaultWebsiteValue, (string)$xml->getNode(self::XML_PATH_WEBSITE));
+        $this->assertSame($defaultWebsiteValue, (string)$xml->getNode(self::XML_PATH_WEBSITE));
         $defaultStoreValue = 'test_store';
-        $this->assertEquals($defaultStoreValue, (string)$xml->getNode(self::XML_PATH_STORE));
+        $this->assertSame($defaultStoreValue, (string)$xml->getNode(self::XML_PATH_STORE));
 
         // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $loader = new Mage_Core_Helper_EnvironmentConfigLoader();
diff --git a/tests/unit/Mage/Core/Helper/HintTest.php b/tests/unit/Mage/Core/Helper/HintTest.php
new file mode 100644
index 00000000000..c9f3df4cbcf
--- /dev/null
+++ b/tests/unit/Mage/Core/Helper/HintTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Helper;
+
+use Mage;
+use Mage_Core_Helper_Hint;
+use PHPUnit\Framework\TestCase;
+
+class HintTest extends TestCase
+{
+    public const TEST_STRING = '1234567890';
+
+    /**
+     * @var Mage_Core_Helper_Hint
+     */
+    public Mage_Core_Helper_Hint $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('core/hint');
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetHintByCode(): void
+    {
+        $this->assertNull($this->subject->getHintByCode('test'));
+    }
+}
diff --git a/tests/unit/Mage/Core/Helper/PurifierTest.php b/tests/unit/Mage/Core/Helper/PurifierTest.php
new file mode 100644
index 00000000000..3667b9eb011
--- /dev/null
+++ b/tests/unit/Mage/Core/Helper/PurifierTest.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Helper;
+
+use Mage;
+use Mage_Core_Helper_Purifier;
+use PHPUnit\Framework\TestCase;
+
+class PurifierTest extends TestCase
+{
+    public const TEST_STRING = '1234567890';
+
+    /**
+     * @var Mage_Core_Helper_Purifier
+     */
+    public Mage_Core_Helper_Purifier $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('core/purifier');
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testPurify(): void
+    {
+        $this->assertIsArray($this->subject->purify([]));
+        $this->assertIsString($this->subject->purify(''));
+    }
+}
diff --git a/tests/unit/Mage/Core/Helper/SecurityTest.php b/tests/unit/Mage/Core/Helper/SecurityTest.php
index aea7c56b6ab..0b470d4d24d 100644
--- a/tests/unit/Mage/Core/Helper/SecurityTest.php
+++ b/tests/unit/Mage/Core/Helper/SecurityTest.php
@@ -41,6 +41,9 @@ public function setUp(): void
 
     /**
      * @return array<int|string, array<int, array<empty, empty>|Mage_Page_Block_Html_Topmenu_Renderer|Mage_Core_Block_Template|string>>
+     *
+     * @group Mage_Core
+     * @group Mage_Core_Helper
      */
     public function validateAgainstBlockMethodBlacklistDataProvider(): array
     {
@@ -73,6 +76,7 @@ public function validateAgainstBlockMethodBlacklistDataProvider(): array
      * @throws Mage_Core_Exception
      *
      * @group Mage_Core
+     * @group Mage_Core_Helper
      */
     public function testValidateAgainstBlockMethodBlacklist(
         Mage_Core_Block_Abstract $block,
@@ -140,6 +144,7 @@ public function forbiddenBlockMethodsDataProvider(): array
      * @throws Mage_Core_Exception
      *
      * @group Mage_Core
+     * @group Mage_Core_Helper
      */
     public function testValidateAgainstBlockMethodBlacklistThrowsException(
         Mage_Core_Block_Abstract $block,
diff --git a/tests/unit/Mage/Core/Helper/UrlTest.php b/tests/unit/Mage/Core/Helper/UrlTest.php
new file mode 100644
index 00000000000..c48530b8d14
--- /dev/null
+++ b/tests/unit/Mage/Core/Helper/UrlTest.php
@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Helper;
+
+use Mage;
+use Mage_Core_Helper_Url;
+use PHPUnit\Framework\TestCase;
+
+class UrlTest extends TestCase
+{
+    public const TEST_URL_1 = 'http://example.com?foo=ba';
+
+    public const TEST_URL_2 = 'http://example.com?foo=bar&boo=baz';
+
+    public const TEST_URL_PUNY = 'http://XN--example.com?foo=bar&boo=baz';
+
+    /**
+     * @var Mage_Core_Helper_Url
+     */
+    public Mage_Core_Helper_Url $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('core/url');
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetCurrentBase64Url(): void
+    {
+        $this->assertIsString($this->subject->getCurrentBase64Url());
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetEncodedUrl(): void
+    {
+        $this->assertIsString($this->subject->getEncodedUrl());
+        $this->assertIsString($this->subject->getEncodedUrl(self::TEST_URL_1));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetHomeUrl(): void
+    {
+        $this->assertIsString($this->subject->getHomeUrl());
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testAddRequestParam(): void
+    {
+        $this->assertIsString($this->subject->addRequestParam(self::TEST_URL_1, [0 => 'int']));
+        $this->assertIsString($this->subject->addRequestParam(self::TEST_URL_1, ['null' => null]));
+        $this->assertIsString($this->subject->addRequestParam(self::TEST_URL_1, ['key' => 'value']));
+        $this->assertIsString($this->subject->addRequestParam(self::TEST_URL_1, ['key' => ['subKey' => 'subValue']]));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testRemoveRequestParam(): void
+    {
+        $this->assertIsString($this->subject->removeRequestParam(self::TEST_URL_1, 'foo'));
+        $this->assertIsString($this->subject->removeRequestParam(self::TEST_URL_2, 'foo'));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testEncodePunycode(): void
+    {
+        $this->assertIsString($this->subject->encodePunycode(self::TEST_URL_1));
+        $this->assertIsString($this->subject->encodePunycode(self::TEST_URL_PUNY));
+    }
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testDecodePunycode(): void
+    {
+        $this->assertIsString($this->subject->decodePunycode(self::TEST_URL_1));
+        $this->assertIsString($this->subject->decodePunycode(self::TEST_URL_PUNY));
+    }
+}

From dbd6ff8ade2f6e60be5cd4564b01b09529b396f7 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 20:35:34 +0200
Subject: [PATCH 63/79] Added tests

---
 .../Block/System/Cache/Form/FormTest.php      | 47 +++++++++++++++++++
 .../Block/System/Config/Form/FormTest.php     | 47 +++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php

diff --git a/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php
new file mode 100644
index 00000000000..3f7fd007991
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Cache/Form/FormTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Cache\Form;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Cache_Form;
+use PHPUnit\Framework\TestCase;
+
+class FormTest extends TestCase
+{
+    /**
+     * @var Mage_Adminhtml_Block_System_Cache_Form
+     */
+    public Mage_Adminhtml_Block_System_Cache_Form $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Adminhtml_Block_System_Cache_Form();
+    }
+
+    /**
+     * @return void
+     *
+     * @group Mage_Adminhtml
+     */
+    public function testInitForm(): void
+    {
+        $this->assertInstanceOf(Mage_Adminhtml_Block_System_Cache_Form::class, $this->subject->initForm());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php
new file mode 100644
index 00000000000..dc6d49b52e5
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Config/Form/FormTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Config\Form;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Config_Form;
+use PHPUnit\Framework\TestCase;
+
+class FormTest extends TestCase
+{
+    /**
+     * @var Mage_Adminhtml_Block_System_Config_Form
+     */
+    public Mage_Adminhtml_Block_System_Config_Form $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Adminhtml_Block_System_Config_Form();
+    }
+
+    /**
+     * @return void
+     *
+     * @group Mage_Adminhtml
+     */
+    public function testInitForm(): void
+    {
+        $this->assertInstanceOf(Mage_Adminhtml_Block_System_Config_Form::class, $this->subject->initForm());
+    }
+}

From 0744d25fe9c029ace86c51d98c0eddc529d57f41 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 20:45:38 +0200
Subject: [PATCH 64/79] CS fix

---
 tests/unit/Mage/Cms/Helper/DataTest.php | 2 +-
 tests/unit/Mage/Log/Helper/DataTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/Mage/Cms/Helper/DataTest.php b/tests/unit/Mage/Cms/Helper/DataTest.php
index c1141f3ca67..7b5f09ab4b6 100644
--- a/tests/unit/Mage/Cms/Helper/DataTest.php
+++ b/tests/unit/Mage/Cms/Helper/DataTest.php
@@ -72,4 +72,4 @@ public function testIsSwfDisabled(): void
     {
         $this->assertTrue($this->subject->isSwfDisabled());
     }
- }
+}
diff --git a/tests/unit/Mage/Log/Helper/DataTest.php b/tests/unit/Mage/Log/Helper/DataTest.php
index 0fc68b1f06b..698a8a6493c 100644
--- a/tests/unit/Mage/Log/Helper/DataTest.php
+++ b/tests/unit/Mage/Log/Helper/DataTest.php
@@ -72,4 +72,4 @@ public function testIsLogFileExtensionValid(): void
         $this->assertIsBool($this->subject->isLogFileExtensionValid('invalid.file'));
         $this->assertIsBool($this->subject->isLogFileExtensionValid('valid.log'));
     }
- }
+}

From dbe197b53db4161cea38d5cae012b242e74c648d Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 20:47:40 +0200
Subject: [PATCH 65/79] CS fix

---
 .ddev/commands/web/magerun             | 0
 .ddev/commands/web/openmage-admin      | 0
 tests/unit/Mage/Log/Model/CronTest.php | 2 --
 tests/unit/Mage/Log/Model/LogTest.php  | 2 --
 4 files changed, 4 deletions(-)
 mode change 100644 => 100755 .ddev/commands/web/magerun
 mode change 100644 => 100755 .ddev/commands/web/openmage-admin

diff --git a/.ddev/commands/web/magerun b/.ddev/commands/web/magerun
old mode 100644
new mode 100755
diff --git a/.ddev/commands/web/openmage-admin b/.ddev/commands/web/openmage-admin
old mode 100644
new mode 100755
diff --git a/tests/unit/Mage/Log/Model/CronTest.php b/tests/unit/Mage/Log/Model/CronTest.php
index 68e29ed42a8..0d754ab0795 100644
--- a/tests/unit/Mage/Log/Model/CronTest.php
+++ b/tests/unit/Mage/Log/Model/CronTest.php
@@ -35,8 +35,6 @@ public function setUp(): void
     }
 
     /**
-     * @return void
-     *
      * @group Mage_Log
      * @group Mage_Log_Model
      */
diff --git a/tests/unit/Mage/Log/Model/LogTest.php b/tests/unit/Mage/Log/Model/LogTest.php
index 571d18b40de..d6c3031da1f 100644
--- a/tests/unit/Mage/Log/Model/LogTest.php
+++ b/tests/unit/Mage/Log/Model/LogTest.php
@@ -35,8 +35,6 @@ public function setUp(): void
     }
 
     /**
-     * @return void
-     *
      * @group Mage_Log
      * @group Mage_Log_Model
      */

From 32eeee81abbb8023a1d24d624a67c2961451ae6a Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 21:38:34 +0200
Subject: [PATCH 66/79] Added tests

---
 tests/unit/Mage/Page/Block/Html/HeadTest.php  |  82 ++++++++++++
 .../unit/Mage/Page/Block/Html/HeaderTest.php  |  84 +++++++++++++
 tests/unit/Mage/Page/Block/HtmlTest.php       |  73 +++++++++++
 tests/unit/Mage/Page/Block/RedirectTest.php   | 109 ++++++++++++++++
 tests/unit/Mage/Page/Block/SwitchTest.php     | 118 ++++++++++++++++++
 5 files changed, 466 insertions(+)
 create mode 100644 tests/unit/Mage/Page/Block/Html/HeadTest.php
 create mode 100644 tests/unit/Mage/Page/Block/Html/HeaderTest.php
 create mode 100644 tests/unit/Mage/Page/Block/HtmlTest.php
 create mode 100644 tests/unit/Mage/Page/Block/RedirectTest.php
 create mode 100644 tests/unit/Mage/Page/Block/SwitchTest.php

diff --git a/tests/unit/Mage/Page/Block/Html/HeadTest.php b/tests/unit/Mage/Page/Block/Html/HeadTest.php
new file mode 100644
index 00000000000..a7a5366f6c7
--- /dev/null
+++ b/tests/unit/Mage/Page/Block/Html/HeadTest.php
@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Page\Block\Html;
+
+use Mage;
+use Mage_Page_Block_Html_Head;
+use PHPUnit\Framework\TestCase;
+
+class HeadTest extends TestCase
+{
+    /**
+     * @var Mage_Page_Block_Html_Head
+     */
+    public Mage_Page_Block_Html_Head $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Page_Block_Html_Head();
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testAddCss(): void
+    {
+        $this->assertInstanceOf(Mage_Page_Block_Html_Head::class, $this->subject->addCss('test'));
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testAddJs(): void
+    {
+        $this->assertInstanceOf(Mage_Page_Block_Html_Head::class, $this->subject->addJs('test'));
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testAddCssIe(): void
+    {
+        $this->assertInstanceOf(Mage_Page_Block_Html_Head::class, $this->subject->addCssIe('test'));
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testAddJsIe(): void
+    {
+        $this->assertInstanceOf(Mage_Page_Block_Html_Head::class, $this->subject->addJsIe('test'));
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testAddLinkRel(): void
+    {
+        $this->assertInstanceOf(Mage_Page_Block_Html_Head::class, $this->subject->addLinkRel('test', 'ref'));
+    }
+}
diff --git a/tests/unit/Mage/Page/Block/Html/HeaderTest.php b/tests/unit/Mage/Page/Block/Html/HeaderTest.php
new file mode 100644
index 00000000000..f9b54ca1de8
--- /dev/null
+++ b/tests/unit/Mage/Page/Block/Html/HeaderTest.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Page\Block\Html;
+
+use Mage;
+use Mage_Core_Model_Security_HtmlEscapedString;
+use Mage_Page_Block_Html_Header;
+use PHPUnit\Framework\TestCase;
+
+class HeaderTest extends TestCase
+{
+    /**
+     * @var Mage_Page_Block_Html_Header
+     */
+    public Mage_Page_Block_Html_Header $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Page_Block_Html_Header();
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+//    public function testGetIsHomePage(): void
+//    {
+//        $this->assertIsBool($this->subject->getIsHomePage());
+//    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testSetLogo(): void
+    {
+        $this->assertInstanceOf(Mage_Page_Block_Html_Header::class, $this->subject->setLogo('src', 'alt'));
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testGetLogoSrc(): void
+    {
+        $this->assertIsString($this->subject->getLogoSrc());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testGetLogoSrcSmall(): void
+    {
+        $this->assertIsString($this->subject->getLogoSrcSmall());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testGetLogoAlt(): void
+    {
+        $this->assertInstanceOf(Mage_Core_Model_Security_HtmlEscapedString::class, $this->subject->getLogoAlt());
+        $this->assertIsString((string)$this->subject->getLogoAlt());
+    }
+}
diff --git a/tests/unit/Mage/Page/Block/HtmlTest.php b/tests/unit/Mage/Page/Block/HtmlTest.php
new file mode 100644
index 00000000000..2701dd9ac69
--- /dev/null
+++ b/tests/unit/Mage/Page/Block/HtmlTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Page\Block;
+
+use Mage;
+use Mage_Page_Block_Html;
+use PHPUnit\Framework\TestCase;
+
+class HtmlTest extends TestCase
+{
+    /**
+     * @var Mage_Page_Block_Html
+     */
+    public Mage_Page_Block_Html $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Page_Block_Html();
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testGetBaseUrl(): void
+    {
+        $this->assertIsString($this->subject->getBaseUrl());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testGetBaseSecureUrl(): void
+    {
+        $this->assertIsString($this->subject->getBaseSecureUrl());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+//    public function testGetCurrentUrl(): void
+//    {
+//        $this->assertIsString($this->subject->getCurrentUrl());
+//    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testGetPrintLogoUrl(): void
+    {
+        $this->assertIsString($this->subject->getPrintLogoUrl());
+    }
+}
diff --git a/tests/unit/Mage/Page/Block/RedirectTest.php b/tests/unit/Mage/Page/Block/RedirectTest.php
new file mode 100644
index 00000000000..4e278f39600
--- /dev/null
+++ b/tests/unit/Mage/Page/Block/RedirectTest.php
@@ -0,0 +1,109 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Page\Block;
+
+use Mage;
+use Mage_Page_Block_Redirect;
+use PHPUnit\Framework\TestCase;
+
+class RedirectTest extends TestCase
+{
+    /**
+     * @var Mage_Page_Block_Redirect
+     */
+    public Mage_Page_Block_Redirect $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Page_Block_Redirect();
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Model
+     */
+    public function testGetTargetUrl(): void
+    {
+        $this->assertEquals('', $this->subject->getTargetUrl());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testGetMessage(): void
+    {
+        $this->assertEquals('', $this->subject->getMessage());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testGetRedirectOutput(): void
+    {
+        $this->assertIsString($this->subject->getRedirectOutput());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testGetJsRedirect(): void
+    {
+        $this->assertIsString($this->subject->getJsRedirect());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testGetHtmlFormRedirect(): void
+    {
+        $this->assertIsString($this->subject->getHtmlFormRedirect());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testIsHtmlFormRedirect(): void
+    {
+        $this->assertIsBool($this->subject->isHtmlFormRedirect());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testGetFormId(): void
+    {
+        $this->assertEquals('', $this->subject->getFormId());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testGetFormMethod(): void
+    {
+        $this->assertEquals('POST', $this->subject->getFormMethod());
+    }
+}
diff --git a/tests/unit/Mage/Page/Block/SwitchTest.php b/tests/unit/Mage/Page/Block/SwitchTest.php
new file mode 100644
index 00000000000..b0b7049c04b
--- /dev/null
+++ b/tests/unit/Mage/Page/Block/SwitchTest.php
@@ -0,0 +1,118 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Page\Block;
+
+use Mage;
+use Mage_Page_Block_Switch;
+use PHPUnit\Framework\TestCase;
+
+class SwitchTest extends TestCase
+{
+    /**
+     * @var Mage_Page_Block_Switch
+     */
+    public Mage_Page_Block_Switch $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Page_Block_Switch();
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testGetCurrentWebsiteId(): void
+    {
+        $this->assertIsString($this->subject->getCurrentWebsiteId());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testGetCurrentGroupId(): void
+    {
+        $this->assertIsString($this->subject->getCurrentGroupId());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testGetCurrentStoreId(): void
+    {
+        $this->assertIsString($this->subject->getCurrentStoreId());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testGetCurrentStoreCode(): void
+    {
+        $this->assertIsString($this->subject->getCurrentStoreCode());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testGetRawGroups(): void
+    {
+        $this->assertIsArray($this->subject->getRawGroups());
+    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+//    public function testGetRawStores(): void
+//    {
+//        $this->assertIsArray($this->subject->getRawStores());
+//    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+//    public function testGetGroups(): void
+//    {
+//        $this->assertIsArray($this->subject->getGroups());
+//    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+//    public function testGetStores(): void
+//    {
+//        $this->assertIsArray($this->subject->getStores());
+//    }
+
+    /**
+     * @group Mage_Page
+     * @group Mage_Page_Block
+     */
+    public function testIsStoreInUrl(): void
+    {
+        $this->assertIsBool($this->subject->isStoreInUrl());
+    }
+}

From 63951f82dbc74744d8a2487a4be1a34ba3fe5826 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 21:39:49 +0200
Subject: [PATCH 67/79] Added tests

---
 tests/unit/Mage/Core/Helper/DataTest.php   | 140 +++++++++++++++++++++
 tests/unit/Mage/Core/Helper/JsTest.php     | 110 ++++++++++++++++
 tests/unit/Mage/Core/Helper/StringTest.php |  99 ++++++++++++++-
 3 files changed, 343 insertions(+), 6 deletions(-)
 create mode 100644 tests/unit/Mage/Core/Helper/DataTest.php
 create mode 100644 tests/unit/Mage/Core/Helper/JsTest.php

diff --git a/tests/unit/Mage/Core/Helper/DataTest.php b/tests/unit/Mage/Core/Helper/DataTest.php
new file mode 100644
index 00000000000..9ea6eaac755
--- /dev/null
+++ b/tests/unit/Mage/Core/Helper/DataTest.php
@@ -0,0 +1,140 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Helper;
+
+use Mage;
+use Mage_Core_Helper_Data;
+use Mage_Core_Model_Encryption;
+use PHPUnit\Framework\TestCase;
+use Varien_Crypt_Mcrypt;
+
+class DataTest extends TestCase
+{
+    public const TEST_STRING = '1234567890';
+
+    /**
+     * @var Mage_Core_Helper_Data
+     */
+    public Mage_Core_Helper_Data $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('core/data');
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetEncryptor(): void
+    {
+        $this->assertInstanceOf(Mage_Core_Model_Encryption::class, $this->subject->getEncryptor());
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testEncrypt(): void
+    {
+        $this->assertIsString($this->subject->encrypt('test'));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testDecrypt(): void
+    {
+        $this->assertIsString($this->subject->decrypt('test'));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testValidateKey(): void
+    {
+        $this->assertInstanceOf(Varien_Crypt_Mcrypt::class, $this->subject->validateKey('test'));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetRandomString(): void
+    {
+        $this->assertIsString($this->subject->getRandomString(5));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetHash(): void
+    {
+        $this->assertIsString($this->subject->getHash('test'));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetHashPassword(): void
+    {
+        $this->assertIsString($this->subject->getHashPassword('test', 1));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testValidateHash(): void
+    {
+        $this->assertIsBool($this->subject->validateHash('test', '1'));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetStoreId(): void
+    {
+        $this->assertIsString($this->subject->getStoreId());
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testRemoveAccents(): void
+    {
+        $str = 'Ae-Ä Oe-Ö Ue-Ü ae-ä oe-ö ue-ü';
+        $this->assertSame('Ae-Ae Oe-Oe Ue-Ue ae-ae oe-oe ue-ue', $this->subject->removeAccents($str, true));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testIsDevAllowed(): void
+    {
+        $this->assertIsBool($this->subject->isDevAllowed());
+    }
+}
diff --git a/tests/unit/Mage/Core/Helper/JsTest.php b/tests/unit/Mage/Core/Helper/JsTest.php
new file mode 100644
index 00000000000..3039f3b8da0
--- /dev/null
+++ b/tests/unit/Mage/Core/Helper/JsTest.php
@@ -0,0 +1,110 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Core\Helper;
+
+use Mage;
+use Mage_Core_Helper_Js;
+use PHPUnit\Framework\TestCase;
+
+class JsTest extends TestCase
+{
+    /**
+     * @var Mage_Core_Helper_Js
+     */
+    public Mage_Core_Helper_Js $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::helper('core/js');
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetTranslateJson(): void
+    {
+        $this->assertIsString($this->subject->getTranslateJson());
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetTranslatorScript(): void
+    {
+        $this->assertIsString($this->subject->getTranslatorScript());
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testIncludeScript(): void
+    {
+        $this->assertIsString($this->subject->includeScript('test'));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testIncludeSkinScript(): void
+    {
+        $this->assertIsString($this->subject->includeSkinScript('test'));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetDeleteConfirmJs(): void
+    {
+        $this->assertIsString($this->subject->getDeleteConfirmJs('foo'));
+        $this->assertIsString($this->subject->getDeleteConfirmJs('foo', 'bar'));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetConfirmSetLocationJs(): void
+    {
+        $this->assertIsString($this->subject->getConfirmSetLocationJs('foo'));
+        $this->assertIsString($this->subject->getConfirmSetLocationJs('foo', 'bar'));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetSetLocationJs(): void
+    {
+        $this->assertIsString($this->subject->getSetLocationJs('foo'));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetSaveAndContinueEditJs(): void
+    {
+        $this->assertIsString($this->subject->getSaveAndContinueEditJs('foo'));
+    }
+}
diff --git a/tests/unit/Mage/Core/Helper/StringTest.php b/tests/unit/Mage/Core/Helper/StringTest.php
index a3b234fa32b..82e3a4a1417 100644
--- a/tests/unit/Mage/Core/Helper/StringTest.php
+++ b/tests/unit/Mage/Core/Helper/StringTest.php
@@ -18,12 +18,15 @@
 namespace OpenMage\Tests\Unit\Mage\Core\Helper;
 
 use Mage;
+use Mage_Core_Helper_Array;
 use Mage_Core_Helper_String;
 use PHPUnit\Framework\TestCase;
 
 class StringTest extends TestCase
 {
-    public const TEST_STRING = '1234567890';
+    public const TEST_STRING        = '1234567890';
+
+    public const TEST_STRING_JSON   = '{"name":"John", "age":30, "car":null}';
 
     /**
      * @var Mage_Core_Helper_String
@@ -38,27 +41,111 @@ public function setUp(): void
 
     /**
      * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testTruncate(): void
+    {
+        $this->assertSame('', $this->subject->truncate(null));
+        $this->assertSame('', $this->subject->truncate(self::TEST_STRING, 0));
+
+        $this->assertSame('', $this->subject->truncate(self::TEST_STRING, 3,));
+
+        $remainder = '';
+        $this->assertSame('12...', $this->subject->truncate(self::TEST_STRING, 5, '...', $remainder, false));
+
+        $resultString = $this->subject->truncate(self::TEST_STRING, 5, '...');
+        $this->assertSame('12...', $resultString);
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
      */
     public function testSubstr(): void
     {
         $resultString = $this->subject->substr(self::TEST_STRING, 2, 2);
-        $this->assertEquals('34', $resultString);
+        $this->assertSame('34', $resultString);
     }
 
     /**
      * @group Mage_Core
+     * @group Mage_Core_Helper
      */
-    public function testTruncate(): void
+    public function testSplitInjection(): void
     {
-        $resultString = $this->subject->truncate(self::TEST_STRING, 5, '...');
-        $this->assertEquals('12...', $resultString);
+        $resultString = $this->subject->splitInjection(self::TEST_STRING, 1, '-', ' ');
+        #$this->assertSame('1-2-3-4-5-6-7-8-9-0-', $resultString);
+        $this->assertIsString($resultString);
     }
 
     /**
      * @group Mage_Core
+     * @group Mage_Core_Helper
      */
     public function testStrlen(): void
     {
-        $this->assertEquals(10, $this->subject->strlen(self::TEST_STRING));
+        $this->assertSame(10, $this->subject->strlen(self::TEST_STRING));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testStrSplit(): void
+    {
+        $this->assertIsArray($this->subject->str_split(''));
+        $this->assertIsArray($this->subject->str_split(self::TEST_STRING));
+        $this->assertIsArray($this->subject->str_split(self::TEST_STRING, 3));
+        $this->assertIsArray($this->subject->str_split(self::TEST_STRING, 3, true, true));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testSplitWords(): void
+    {
+        $this->assertIsArray($this->subject->splitWords(null));
+        $this->assertIsArray($this->subject->splitWords(''));
+        $this->assertIsArray($this->subject->splitWords(self::TEST_STRING));
+        $this->assertIsArray($this->subject->splitWords(self::TEST_STRING, true));
+        $this->assertIsArray($this->subject->splitWords(self::TEST_STRING, true, 1));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testParseQueryStr(): void
+    {
+        $this->assertIsArray($this->subject->parseQueryStr(self::TEST_STRING));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testGetArrayHelper(): void
+    {
+        $this->assertInstanceOf(Mage_Core_Helper_Array::class, $this->subject->getArrayHelper());
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testUnserialize(): void
+    {
+        $this->assertNull($this->subject->unserialize(null));
+    }
+
+    /**
+     * @group Mage_Core
+     * @group Mage_Core_Helper
+     */
+    public function testValidateSerializedObject(): void
+    {
+        $this->assertIsBool($this->subject->validateSerializedObject(self::TEST_STRING));
+        $this->assertIsBool($this->subject->validateSerializedObject(self::TEST_STRING_JSON));
     }
 }

From 7f8208b2f1ada4091c20e6b6eb3ec85528e5ce0c Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 21:39:57 +0200
Subject: [PATCH 68/79] Added tests

---
 .../Model/Convert/Adapter/CustomerTest.php    | 154 ++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php

diff --git a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php
new file mode 100644
index 00000000000..cd41052403a
--- /dev/null
+++ b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Customer\Model\Convert\Adapter;
+
+use Mage;
+use Mage_Customer_Model_Convert_Adapter_Customer;
+use PHPUnit\Framework\TestCase;
+use Throwable;
+
+class CustomerTest extends TestCase
+{
+    /**
+     * @var Mage_Customer_Model_Convert_Adapter_Customer
+     */
+    public Mage_Customer_Model_Convert_Adapter_Customer $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::getModel('customer/convert_adapter_customer');
+    }
+
+//    /**
+//     * @return void
+//     * @throws Throwable
+//     *
+//     * @group Mage_Customer
+//     */
+//    public function testSaveRowNoWebsite(): void
+//    {
+//        $data = [];
+//        try {
+//            $this->subject->saveRow($data);
+//            $this->fail();
+//        } catch (Mage_Core_Exception $e) {
+//            $this->assertSame('Skipping import row, required field "website" is not defined.', $e->getMessage());
+//        }
+//    }
+//
+//    /**
+//     * @return void
+//     * @throws Throwable
+//     *
+//     * @group Mage_Customer
+//     */
+//    public function testSaveRowNoEmail(): void
+//    {
+//        $data = [
+//            'website'   => 'base',
+//        ];
+//        try {
+//            $this->subject->saveRow($data);
+//            $this->fail();
+//        } catch (Mage_Core_Exception $e) {
+//            $this->assertSame('Skipping import row, required field "email" is not defined.', $e->getMessage());
+//        }
+//    }
+//
+//    /**
+//     * @return void
+//     * @throws Throwable
+//     *
+//     * @group Mage_Customer
+//     */
+//    public function testSaveRowNoGroup(): void
+//    {
+//        $data = [
+//            'website'   => 'base',
+//            'email'     => 'test@example.com',
+//        ];
+//        try {
+//            $this->subject->saveRow($data);
+//            $this->fail();
+//        } catch (Mage_Core_Exception $e) {
+//            $this->assertSame('Skipping import row, the value "" is not valid for the "group" field.', $e->getMessage());
+//        }
+//    }
+//
+//    /**
+//     * @return void
+//     * @throws Throwable
+//     *
+//     * @group Mage_Customer
+//     */
+//    public function testSaveRowNoFirstname(): void
+//    {
+//        $data = [
+//            'website'   => 'base',
+//            'email'     => 'test@example.com',
+//            'group'     => 'General',
+//        ];
+//        try {
+//            $this->subject->saveRow($data);
+//            $this->fail();
+//        } catch (Mage_Core_Exception $e) {
+//            $this->expectExceptionMessage('Skip import row, required field "firstname" for the new customer is not defined.');
+//        }
+//    }
+//
+//    /**
+//     * @return void
+//     * @throws Throwable
+//     *
+//     * @group Mage_Customer
+//     */
+//    public function testSaveRowNoLastname(): void
+//    {
+//        $data = [
+//            'website'   => 'base',
+//            'email'     => 'test@example.com',
+//            'group'     => 'General',
+//            'firstname' => 'John',
+//        ];
+//        try {
+//            $this->subject->saveRow($data);
+//            $this->fail();
+//        } catch (Mage_Core_Exception $e) {
+//            $this->assertSame('Skip import row, required field "lastname" for the new customer is not defined.', $e->getMessage());
+//        }
+//    }
+
+    /**
+     * @return void
+     * @throws Throwable
+     *
+     * @group Mage_Customer
+     */
+    public function testSaveRow(): void
+    {
+        $data = [
+            'website'   => 'base',
+            'email'     => 'test@example.com',
+            'group'     => 'General',
+            'firstname' => 'John',
+            'lastname'  => 'Doe',
+        ];
+        $this->assertInstanceOf(Mage_Customer_Model_Convert_Adapter_Customer::class, $this->subject->saveRow($data));
+    }
+}

From 75e548a54c92aca854af0d593fc8124ce2148c87 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 21:40:15 +0200
Subject: [PATCH 69/79] Added tests

---
 .../Mage/Adminhtml/Block/Cms/PageTest.php.tmp | 48 +++++++++++++++
 .../Block/Customer/Edit/Tab/AccountTest.php   | 60 +++++++++++++++++++
 .../Block/Customer/Edit/Tab/AddressesTest.php | 57 ++++++++++++++++++
 .../Customer/Edit/Tab/NewsletterTest.php      | 57 ++++++++++++++++++
 .../System/Convert/Gui/Edit/Tab/ViewTest.php  | 47 +++++++++++++++
 .../Convert/Profile/Edit/Tab/EditTest.php     | 47 +++++++++++++++
 6 files changed, 316 insertions(+)
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Cms/PageTest.php.tmp
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AccountTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php
 create mode 100644 tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php

diff --git a/tests/unit/Mage/Adminhtml/Block/Cms/PageTest.php.tmp b/tests/unit/Mage/Adminhtml/Block/Cms/PageTest.php.tmp
new file mode 100644
index 00000000000..1922944509f
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Cms/PageTest.php.tmp
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Cms;
+
+use Mage;
+use Mage_Adminhtml_Block_Cms_Page;
+use PHPUnit\Framework\TestCase;
+
+class PageTest extends TestCase
+{
+    /**
+     * @var Mage_Adminhtml_Block_Cms_Page
+     */
+    public Mage_Adminhtml_Block_Cms_Page $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Adminhtml_Block_Cms_Page();
+    }
+
+    /**
+     * @return void
+     *
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     */
+    public function testGetHeaderCssClass(): void
+    {
+        #$this->assertSame(Mage_Adminhtml_Block_Cms_Page::class, $this->subject->getHeaderCssClass());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AccountTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AccountTest.php
new file mode 100644
index 00000000000..f2e6d98b7da
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AccountTest.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Customer\Edit\Tab;
+
+use Mage;
+use Mage_Adminhtml_Block_Customer_Edit_Tab_Account;
+use Mage_Core_Exception;
+use Mage_Customer_Model_Customer;
+use PHPUnit\Framework\TestCase;
+
+class AccountTest extends TestCase
+{
+    /**
+     * @var Mage_Adminhtml_Block_Customer_Edit_Tab_Account
+     */
+    public Mage_Adminhtml_Block_Customer_Edit_Tab_Account $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Adminhtml_Block_Customer_Edit_Tab_Account();
+    }
+
+    /**
+     * @return void
+     * @throws Mage_Core_Exception
+     *
+     * @group Mage_Adminhtml
+     * @group Mage_Adminhtml_Block
+     */
+//    public function testInitForm(): void
+//    {
+//        $mock = $this->getMockBuilder(Mage_Adminhtml_Block_Customer_Edit_Tab_Account::class)
+//            ->setMethods(['getRegistryCurrentCustomer'])
+//            ->getMock();
+//
+//        $mock->expects($this->any())
+//            ->method('getRegistryCurrentCustomer')
+//            // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+//            ->willReturn(new Mage_Customer_Model_Customer);
+//
+//        $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Account::class, $mock->initForm());
+//    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
new file mode 100644
index 00000000000..9c3385577dd
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Customer\Edit\Tab;
+
+use Mage;
+use Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses;
+use Mage_Customer_Model_Customer;
+use PHPUnit\Framework\TestCase;
+
+class AddressesTest extends TestCase
+{
+    /**
+     * @var Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses
+     */
+    public Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses();
+    }
+
+    /**
+     * @return void
+     *
+     * @group Mage_Adminhtml
+     */
+    public function testInitForm(): void
+    {
+        $mock = $this->getMockBuilder(Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::class)
+            ->setMethods(['getRegistryCurrentCustomer'])
+            ->getMock();
+
+        $mock->expects($this->any())
+            ->method('getRegistryCurrentCustomer')
+            // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+            ->willReturn(new Mage_Customer_Model_Customer);
+
+        $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::class, $mock->initForm());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php
new file mode 100644
index 00000000000..536d2e5a2d4
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\Customer\Edit\Tab;
+
+use Mage;
+use Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter;
+use Mage_Customer_Model_Customer;
+use PHPUnit\Framework\TestCase;
+
+class NewsletterTest extends TestCase
+{
+    /**
+     * @var Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter
+     */
+    public Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter();
+    }
+
+    /**
+     * @return void
+     *
+     * @group Mage_Adminhtml
+     */
+    public function testInitForm(): void
+    {
+        $mock = $this->getMockBuilder(Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter::class)
+            ->setMethods(['getRegistryCurrentCustomer'])
+            ->getMock();
+
+        $mock->expects($this->any())
+            ->method('getRegistryCurrentCustomer')
+            // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+            ->willReturn(new Mage_Customer_Model_Customer);
+
+        $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter::class, $mock->initForm());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php
new file mode 100644
index 00000000000..7b8c9097105
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Convert\Gui\Edit\Tab;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View;
+use PHPUnit\Framework\TestCase;
+
+class ViewTest extends TestCase
+{
+    /**
+     * @var Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View
+     */
+    public Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View();
+    }
+
+    /**
+     * @return void
+     *
+     * @group Mage_Adminhtml
+     */
+    public function testInitForm(): void
+    {
+        $this->assertInstanceOf(Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View::class, $this->subject->initForm());
+    }
+}
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php
new file mode 100644
index 00000000000..9f13f2b77fa
--- /dev/null
+++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Adminhtml\Block\System\Convert\Profile\Edit\Tab;
+
+use Mage;
+use Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Edit;
+use PHPUnit\Framework\TestCase;
+
+class EditTest extends TestCase
+{
+    /**
+     * @var Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Edit
+     */
+    public Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Edit $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+        $this->subject = new Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Edit();
+    }
+
+    /**
+     * @return void
+     *
+     * @group Mage_Adminhtml
+     */
+    public function testInitForm(): void
+    {
+        $this->assertInstanceOf(Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Edit::class, $this->subject->initForm());
+    }
+}

From ba8108a6191601f8824aaabfe8e790f80a30e718 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 22:02:47 +0200
Subject: [PATCH 70/79] CS/PhpStan fixes

---
 .../Block/Customer/Edit/Tab/AddressesTest.php        |  2 +-
 .../Block/Customer/Edit/Tab/NewsletterTest.php       |  2 +-
 tests/unit/Mage/Core/Helper/JsTest.php               | 12 ++++++------
 tests/unit/Mage/Core/Helper/StringTest.php           |  2 +-
 tests/unit/Mage/Page/Block/Html/HeaderTest.php       |  1 -
 tests/unit/Mage/Page/Block/RedirectTest.php          |  2 +-
 6 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
index 9c3385577dd..383cfb5c378 100644
--- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
@@ -50,7 +50,7 @@ public function testInitForm(): void
         $mock->expects($this->any())
             ->method('getRegistryCurrentCustomer')
             // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
-            ->willReturn(new Mage_Customer_Model_Customer);
+            ->willReturn(new Mage_Customer_Model_Customer());
 
         $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::class, $mock->initForm());
     }
diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php
index 536d2e5a2d4..5355e694ac2 100644
--- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php
@@ -50,7 +50,7 @@ public function testInitForm(): void
         $mock->expects($this->any())
             ->method('getRegistryCurrentCustomer')
             // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
-            ->willReturn(new Mage_Customer_Model_Customer);
+            ->willReturn(new Mage_Customer_Model_Customer());
 
         $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter::class, $mock->initForm());
     }
diff --git a/tests/unit/Mage/Core/Helper/JsTest.php b/tests/unit/Mage/Core/Helper/JsTest.php
index 3039f3b8da0..e125a21b533 100644
--- a/tests/unit/Mage/Core/Helper/JsTest.php
+++ b/tests/unit/Mage/Core/Helper/JsTest.php
@@ -76,8 +76,8 @@ public function testIncludeSkinScript(): void
      */
     public function testGetDeleteConfirmJs(): void
     {
-        $this->assertIsString($this->subject->getDeleteConfirmJs('foo'));
-        $this->assertIsString($this->subject->getDeleteConfirmJs('foo', 'bar'));
+        $this->assertStringStartsWith('deleteConfirm', $this->subject->getDeleteConfirmJs('foo'));
+        $this->assertStringStartsWith('deleteConfirm', $this->subject->getDeleteConfirmJs('foo', 'bar'));
     }
 
     /**
@@ -86,8 +86,8 @@ public function testGetDeleteConfirmJs(): void
      */
     public function testGetConfirmSetLocationJs(): void
     {
-        $this->assertIsString($this->subject->getConfirmSetLocationJs('foo'));
-        $this->assertIsString($this->subject->getConfirmSetLocationJs('foo', 'bar'));
+        $this->assertStringStartsWith('confirmSetLocation', $this->subject->getConfirmSetLocationJs('foo'));
+        $this->assertStringStartsWith('confirmSetLocation', $this->subject->getConfirmSetLocationJs('foo', 'bar'));
     }
 
     /**
@@ -96,7 +96,7 @@ public function testGetConfirmSetLocationJs(): void
      */
     public function testGetSetLocationJs(): void
     {
-        $this->assertIsString($this->subject->getSetLocationJs('foo'));
+        $this->assertStringStartsWith('setLocation', $this->subject->getSetLocationJs('foo'));
     }
 
     /**
@@ -105,6 +105,6 @@ public function testGetSetLocationJs(): void
      */
     public function testGetSaveAndContinueEditJs(): void
     {
-        $this->assertIsString($this->subject->getSaveAndContinueEditJs('foo'));
+        $this->assertStringStartsWith('saveAndContinueEdit', $this->subject->getSaveAndContinueEditJs('foo'));
     }
 }
diff --git a/tests/unit/Mage/Core/Helper/StringTest.php b/tests/unit/Mage/Core/Helper/StringTest.php
index 82e3a4a1417..620732bc2f0 100644
--- a/tests/unit/Mage/Core/Helper/StringTest.php
+++ b/tests/unit/Mage/Core/Helper/StringTest.php
@@ -48,7 +48,7 @@ public function testTruncate(): void
         $this->assertSame('', $this->subject->truncate(null));
         $this->assertSame('', $this->subject->truncate(self::TEST_STRING, 0));
 
-        $this->assertSame('', $this->subject->truncate(self::TEST_STRING, 3,));
+        $this->assertSame('', $this->subject->truncate(self::TEST_STRING, 3));
 
         $remainder = '';
         $this->assertSame('12...', $this->subject->truncate(self::TEST_STRING, 5, '...', $remainder, false));
diff --git a/tests/unit/Mage/Page/Block/Html/HeaderTest.php b/tests/unit/Mage/Page/Block/Html/HeaderTest.php
index f9b54ca1de8..8651f82c8bf 100644
--- a/tests/unit/Mage/Page/Block/Html/HeaderTest.php
+++ b/tests/unit/Mage/Page/Block/Html/HeaderTest.php
@@ -79,6 +79,5 @@ public function testGetLogoSrcSmall(): void
     public function testGetLogoAlt(): void
     {
         $this->assertInstanceOf(Mage_Core_Model_Security_HtmlEscapedString::class, $this->subject->getLogoAlt());
-        $this->assertIsString((string)$this->subject->getLogoAlt());
     }
 }
diff --git a/tests/unit/Mage/Page/Block/RedirectTest.php b/tests/unit/Mage/Page/Block/RedirectTest.php
index 4e278f39600..333a2a67cd0 100644
--- a/tests/unit/Mage/Page/Block/RedirectTest.php
+++ b/tests/unit/Mage/Page/Block/RedirectTest.php
@@ -41,7 +41,7 @@ public function setUp(): void
      */
     public function testGetTargetUrl(): void
     {
-        $this->assertEquals('', $this->subject->getTargetUrl());
+        $this->assertEquals('', $this->subject->getTargetURL());
     }
 
     /**

From b0819e5df61b19b9ffc5142f0d70976cf77c7936 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 22:10:28 +0200
Subject: [PATCH 71/79] Update

- some tests commented - need files changes
---
 tests/unit/Base/ClassLoadingTest.php          |  2 +-
 tests/unit/Mage/Admin/Model/UserTest.php      |  2 +-
 tests/unit/Mage/Admin/Model/VariableTest.php  |  2 +-
 .../Block/Customer/Edit/Tab/AddressesTest.php | 26 ++++++-------
 .../Customer/Edit/Tab/NewsletterTest.php      | 26 ++++++-------
 .../System/Convert/Gui/Edit/Tab/ViewTest.php  |  8 ++--
 .../Convert/Profile/Edit/Tab/EditTest.php     |  8 ++--
 tests/unit/Mage/Core/Helper/DataTest.php      |  2 +-
 .../Helper/EnvironmentConfigLoaderTest.php    | 16 ++++----
 tests/unit/Mage/Core/Helper/StringTest.php    | 16 ++++----
 tests/unit/Mage/Core/Model/LocaleTest.php     |  2 +-
 .../Model/Security/HtmlEscapedStringTest.php  |  4 +-
 .../Model/Convert/Adapter/CustomerTest.php    |  8 ++--
 .../Mage/Downloadable/Helper/FileTest.php     |  2 +-
 tests/unit/Mage/Uploader/Helper/FileTest.php  |  6 +--
 tests/unit/Varien/ObjectTest.php              | 38 +++++++++----------
 16 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/tests/unit/Base/ClassLoadingTest.php b/tests/unit/Base/ClassLoadingTest.php
index 45b1d350f63..888807397f2 100644
--- a/tests/unit/Base/ClassLoadingTest.php
+++ b/tests/unit/Base/ClassLoadingTest.php
@@ -29,7 +29,7 @@ class ClassLoadingTest extends TestCase
      */
     public function testClassExists(bool $expectedResult, string $class): void
     {
-        $this->assertSame($expectedResult, class_exists($class));
+        $this->assertEquals($expectedResult, class_exists($class));
     }
 
     /**
diff --git a/tests/unit/Mage/Admin/Model/UserTest.php b/tests/unit/Mage/Admin/Model/UserTest.php
index d62da38751c..fb891d31869 100644
--- a/tests/unit/Mage/Admin/Model/UserTest.php
+++ b/tests/unit/Mage/Admin/Model/UserTest.php
@@ -59,7 +59,7 @@ public function testValidate($expectedResult, array $methods): void
         $mock->expects($this->any())->method('hasPassword')->willReturn($methods['hasPassword']);
         $mock->expects($this->any())->method('getPassword')->willReturn($methods['getPassword']);
         // phpcs:ignore Ecg.Security.ForbiddenFunction.Found
-        $this->assertSame($expectedResult, $mock->validate());
+        $this->assertEquals($expectedResult, $mock->validate());
     }
 
     /**
diff --git a/tests/unit/Mage/Admin/Model/VariableTest.php b/tests/unit/Mage/Admin/Model/VariableTest.php
index 0ffa40b8e41..a9e30854137 100644
--- a/tests/unit/Mage/Admin/Model/VariableTest.php
+++ b/tests/unit/Mage/Admin/Model/VariableTest.php
@@ -51,7 +51,7 @@ public function testValidate($expectedResult, string $variableName, string $isAl
 
         $mock->expects($this->any())->method('getVariableName')->willReturn($variableName);
         $mock->expects($this->any())->method('getIsAllowed')->willReturn($isAllowed);
-        $this->assertSame($expectedResult, $mock->validate());
+        $this->assertEquals($expectedResult, $mock->validate());
     }
 
     /**
diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
index 383cfb5c378..b3d49beae6e 100644
--- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/AddressesTest.php
@@ -41,17 +41,17 @@ public function setUp(): void
      *
      * @group Mage_Adminhtml
      */
-    public function testInitForm(): void
-    {
-        $mock = $this->getMockBuilder(Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::class)
-            ->setMethods(['getRegistryCurrentCustomer'])
-            ->getMock();
-
-        $mock->expects($this->any())
-            ->method('getRegistryCurrentCustomer')
-            // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
-            ->willReturn(new Mage_Customer_Model_Customer());
-
-        $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::class, $mock->initForm());
-    }
+//    public function testInitForm(): void
+//    {
+//        $mock = $this->getMockBuilder(Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::class)
+//            ->setMethods(['getRegistryCurrentCustomer'])
+//            ->getMock();
+//
+//        $mock->expects($this->any())
+//            ->method('getRegistryCurrentCustomer')
+//            // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+//            ->willReturn(new Mage_Customer_Model_Customer());
+//
+//        $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Addresses::class, $mock->initForm());
+//    }
 }
diff --git a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php
index 5355e694ac2..39c500f99c4 100644
--- a/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/Customer/Edit/Tab/NewsletterTest.php
@@ -41,17 +41,17 @@ public function setUp(): void
      *
      * @group Mage_Adminhtml
      */
-    public function testInitForm(): void
-    {
-        $mock = $this->getMockBuilder(Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter::class)
-            ->setMethods(['getRegistryCurrentCustomer'])
-            ->getMock();
-
-        $mock->expects($this->any())
-            ->method('getRegistryCurrentCustomer')
-            // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
-            ->willReturn(new Mage_Customer_Model_Customer());
-
-        $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter::class, $mock->initForm());
-    }
+//    public function testInitForm(): void
+//    {
+//        $mock = $this->getMockBuilder(Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter::class)
+//            ->setMethods(['getRegistryCurrentCustomer'])
+//            ->getMock();
+//
+//        $mock->expects($this->any())
+//            ->method('getRegistryCurrentCustomer')
+//            // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
+//            ->willReturn(new Mage_Customer_Model_Customer());
+//
+//        $this->assertInstanceOf(Mage_Adminhtml_Block_Customer_Edit_Tab_Newsletter::class, $mock->initForm());
+//    }
 }
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php
index 7b8c9097105..2311d15cec8 100644
--- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Gui/Edit/Tab/ViewTest.php
@@ -40,8 +40,8 @@ public function setUp(): void
      *
      * @group Mage_Adminhtml
      */
-    public function testInitForm(): void
-    {
-        $this->assertInstanceOf(Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View::class, $this->subject->initForm());
-    }
+//    public function testInitForm(): void
+//    {
+//        $this->assertInstanceOf(Mage_Adminhtml_Block_System_Convert_Gui_Edit_Tab_View::class, $this->subject->initForm());
+//    }
 }
diff --git a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php
index 9f13f2b77fa..1d925f86dce 100644
--- a/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php
+++ b/tests/unit/Mage/Adminhtml/Block/System/Convert/Profile/Edit/Tab/EditTest.php
@@ -40,8 +40,8 @@ public function setUp(): void
      *
      * @group Mage_Adminhtml
      */
-    public function testInitForm(): void
-    {
-        $this->assertInstanceOf(Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Edit::class, $this->subject->initForm());
-    }
+//    public function testInitForm(): void
+//    {
+//        $this->assertInstanceOf(Mage_Adminhtml_Block_System_Convert_Profile_Edit_Tab_Edit::class, $this->subject->initForm());
+//    }
 }
diff --git a/tests/unit/Mage/Core/Helper/DataTest.php b/tests/unit/Mage/Core/Helper/DataTest.php
index 9ea6eaac755..0f628c9451c 100644
--- a/tests/unit/Mage/Core/Helper/DataTest.php
+++ b/tests/unit/Mage/Core/Helper/DataTest.php
@@ -126,7 +126,7 @@ public function testGetStoreId(): void
     public function testRemoveAccents(): void
     {
         $str = 'Ae-Ä Oe-Ö Ue-Ü ae-ä oe-ö ue-ü';
-        $this->assertSame('Ae-Ae Oe-Oe Ue-Ue ae-ae oe-oe ue-ue', $this->subject->removeAccents($str, true));
+        $this->assertEquals('Ae-Ae Oe-Oe Ue-Ue ae-ae oe-oe ue-ue', $this->subject->removeAccents($str, true));
     }
 
     /**
diff --git a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
index 82a9f33834f..0df3a194aff 100644
--- a/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
+++ b/tests/unit/Mage/Core/Helper/EnvironmentConfigLoaderTest.php
@@ -49,7 +49,7 @@ public function testBuildPath(): void
     {
         $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper();
         $path = $environmentConfigLoaderHelper->exposedBuildPath('GENERAL', 'STORE_INFORMATION', 'NAME');
-        $this->assertSame(self::XML_PATH_GENERAL, $path);
+        $this->assertEquals(self::XML_PATH_GENERAL, $path);
     }
 
     /**
@@ -60,7 +60,7 @@ public function testBuildNodePath(): void
     {
         $environmentConfigLoaderHelper = new EnvironmentConfigLoaderTestHelper();
         $nodePath = $environmentConfigLoaderHelper->exposedBuildNodePath('DEFAULT', self::XML_PATH_GENERAL);
-        $this->assertSame(self::XML_PATH_DEFAULT, $nodePath);
+        $this->assertEquals(self::XML_PATH_DEFAULT, $nodePath);
     }
 
     /**
@@ -72,9 +72,9 @@ public function testXmlHasTestStrings(): void
         $xmlStruct = $this->getTestXml();
         $xml = new Varien_Simplexml_Config();
         $xml->loadString($xmlStruct);
-        $this->assertSame('test_default', (string)$xml->getNode(self::XML_PATH_DEFAULT));
-        $this->assertSame('test_website', (string)$xml->getNode(self::XML_PATH_WEBSITE));
-        $this->assertSame('test_store', (string)$xml->getNode(self::XML_PATH_STORE));
+        $this->assertEquals('test_default', (string)$xml->getNode(self::XML_PATH_DEFAULT));
+        $this->assertEquals('test_website', (string)$xml->getNode(self::XML_PATH_WEBSITE));
+        $this->assertEquals('test_store', (string)$xml->getNode(self::XML_PATH_STORE));
     }
 
     /**
@@ -217,11 +217,11 @@ public function testEnvDoesNotOverrideForInvalidConfigKeys(array $config): void
         $xml->loadString($xmlStruct);
 
         $defaultValue = 'test_default';
-        $this->assertSame($defaultValue, (string)$xml->getNode(self::XML_PATH_DEFAULT));
+        $this->assertEquals($defaultValue, (string)$xml->getNode(self::XML_PATH_DEFAULT));
         $defaultWebsiteValue = 'test_website';
-        $this->assertSame($defaultWebsiteValue, (string)$xml->getNode(self::XML_PATH_WEBSITE));
+        $this->assertEquals($defaultWebsiteValue, (string)$xml->getNode(self::XML_PATH_WEBSITE));
         $defaultStoreValue = 'test_store';
-        $this->assertSame($defaultStoreValue, (string)$xml->getNode(self::XML_PATH_STORE));
+        $this->assertEquals($defaultStoreValue, (string)$xml->getNode(self::XML_PATH_STORE));
 
         // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $loader = new Mage_Core_Helper_EnvironmentConfigLoader();
diff --git a/tests/unit/Mage/Core/Helper/StringTest.php b/tests/unit/Mage/Core/Helper/StringTest.php
index 620732bc2f0..734c64edf8c 100644
--- a/tests/unit/Mage/Core/Helper/StringTest.php
+++ b/tests/unit/Mage/Core/Helper/StringTest.php
@@ -45,16 +45,16 @@ public function setUp(): void
      */
     public function testTruncate(): void
     {
-        $this->assertSame('', $this->subject->truncate(null));
-        $this->assertSame('', $this->subject->truncate(self::TEST_STRING, 0));
+        $this->assertEquals('', $this->subject->truncate(null));
+        $this->assertEquals('', $this->subject->truncate(self::TEST_STRING, 0));
 
-        $this->assertSame('', $this->subject->truncate(self::TEST_STRING, 3));
+        $this->assertEquals('', $this->subject->truncate(self::TEST_STRING, 3));
 
         $remainder = '';
-        $this->assertSame('12...', $this->subject->truncate(self::TEST_STRING, 5, '...', $remainder, false));
+        $this->assertEquals('12...', $this->subject->truncate(self::TEST_STRING, 5, '...', $remainder, false));
 
         $resultString = $this->subject->truncate(self::TEST_STRING, 5, '...');
-        $this->assertSame('12...', $resultString);
+        $this->assertEquals('12...', $resultString);
     }
 
     /**
@@ -64,7 +64,7 @@ public function testTruncate(): void
     public function testSubstr(): void
     {
         $resultString = $this->subject->substr(self::TEST_STRING, 2, 2);
-        $this->assertSame('34', $resultString);
+        $this->assertEquals('34', $resultString);
     }
 
     /**
@@ -74,7 +74,7 @@ public function testSubstr(): void
     public function testSplitInjection(): void
     {
         $resultString = $this->subject->splitInjection(self::TEST_STRING, 1, '-', ' ');
-        #$this->assertSame('1-2-3-4-5-6-7-8-9-0-', $resultString);
+        #$this->assertEquals('1-2-3-4-5-6-7-8-9-0-', $resultString);
         $this->assertIsString($resultString);
     }
 
@@ -84,7 +84,7 @@ public function testSplitInjection(): void
      */
     public function testStrlen(): void
     {
-        $this->assertSame(10, $this->subject->strlen(self::TEST_STRING));
+        $this->assertEquals(10, $this->subject->strlen(self::TEST_STRING));
     }
 
     /**
diff --git a/tests/unit/Mage/Core/Model/LocaleTest.php b/tests/unit/Mage/Core/Model/LocaleTest.php
index 3bcacfb0565..2ec18a03617 100644
--- a/tests/unit/Mage/Core/Model/LocaleTest.php
+++ b/tests/unit/Mage/Core/Model/LocaleTest.php
@@ -44,7 +44,7 @@ public function setUp(): void
      */
     public function testGetNumber(?float $expectedResult, $value): void
     {
-        $this->assertSame($expectedResult, $this->subject->getNumber($value));
+        $this->assertEquals($expectedResult, $this->subject->getNumber($value));
     }
 
     /**
diff --git a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
index 5a558d6fc0a..48f82fa68bf 100644
--- a/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
+++ b/tests/unit/Mage/Core/Model/Security/HtmlEscapedStringTest.php
@@ -42,7 +42,7 @@ public function testToSting(string $expectedResult, string $string, ?array $allo
     {
         // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $this->subject = new Mage_Core_Model_Security_HtmlEscapedString($string, $allowedTags);
-        $this->assertSame($expectedResult, $this->subject->__toString());
+        $this->assertEquals($expectedResult, $this->subject->__toString());
     }
 
     /**
@@ -58,7 +58,7 @@ public function testGetUnescapedValue(string $expectedResult, string $string, ?a
     {
         // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $this->subject = new Mage_Core_Model_Security_HtmlEscapedString($string, $allowedTags);
-        $this->assertSame($expectedResult, $this->subject->getUnescapedValue());
+        $this->assertEquals($expectedResult, $this->subject->getUnescapedValue());
     }
 
     /**
diff --git a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php
index cd41052403a..bcd4c7ea96c 100644
--- a/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php
+++ b/tests/unit/Mage/Customer/Model/Convert/Adapter/CustomerTest.php
@@ -48,7 +48,7 @@ public function setUp(): void
 //            $this->subject->saveRow($data);
 //            $this->fail();
 //        } catch (Mage_Core_Exception $e) {
-//            $this->assertSame('Skipping import row, required field "website" is not defined.', $e->getMessage());
+//            $this->assertEquals('Skipping import row, required field "website" is not defined.', $e->getMessage());
 //        }
 //    }
 //
@@ -67,7 +67,7 @@ public function setUp(): void
 //            $this->subject->saveRow($data);
 //            $this->fail();
 //        } catch (Mage_Core_Exception $e) {
-//            $this->assertSame('Skipping import row, required field "email" is not defined.', $e->getMessage());
+//            $this->assertEquals('Skipping import row, required field "email" is not defined.', $e->getMessage());
 //        }
 //    }
 //
@@ -87,7 +87,7 @@ public function setUp(): void
 //            $this->subject->saveRow($data);
 //            $this->fail();
 //        } catch (Mage_Core_Exception $e) {
-//            $this->assertSame('Skipping import row, the value "" is not valid for the "group" field.', $e->getMessage());
+//            $this->assertEquals('Skipping import row, the value "" is not valid for the "group" field.', $e->getMessage());
 //        }
 //    }
 //
@@ -130,7 +130,7 @@ public function setUp(): void
 //            $this->subject->saveRow($data);
 //            $this->fail();
 //        } catch (Mage_Core_Exception $e) {
-//            $this->assertSame('Skip import row, required field "lastname" for the new customer is not defined.', $e->getMessage());
+//            $this->assertEquals('Skip import row, required field "lastname" for the new customer is not defined.', $e->getMessage());
 //        }
 //    }
 
diff --git a/tests/unit/Mage/Downloadable/Helper/FileTest.php b/tests/unit/Mage/Downloadable/Helper/FileTest.php
index f4dcd0b0447..83d48bf4314 100644
--- a/tests/unit/Mage/Downloadable/Helper/FileTest.php
+++ b/tests/unit/Mage/Downloadable/Helper/FileTest.php
@@ -46,7 +46,7 @@ public function setUp(): void
     public function testGetFilePath(string $expectedResult, string $path, ?string $file): void
     {
         $result = $this->subject->getFilePath($path, $file);
-        $this->assertSame($expectedResult, $result);
+        $this->assertEquals($expectedResult, $result);
     }
 
     /**
diff --git a/tests/unit/Mage/Uploader/Helper/FileTest.php b/tests/unit/Mage/Uploader/Helper/FileTest.php
index f56ddf6e319..e815c3cf5de 100644
--- a/tests/unit/Mage/Uploader/Helper/FileTest.php
+++ b/tests/unit/Mage/Uploader/Helper/FileTest.php
@@ -49,7 +49,7 @@ public function setUp(): void
      */
     public function testGetMimeTypeFromExtensionList(array $expectedResult, $extensionsList): void
     {
-        $this->assertSame($expectedResult, $this->subject->getMimeTypeFromExtensionList($extensionsList));
+        $this->assertEquals($expectedResult, $this->subject->getMimeTypeFromExtensionList($extensionsList));
     }
 
     /**
@@ -112,7 +112,7 @@ public function testGetDataMaxSize(): void
 
         $mock->expects($this->once())->method('getPostMaxSize')->willReturn('1G');
         $mock->expects($this->once())->method('getUploadMaxSize')->willReturn('1M');
-        $this->assertSame('1M', $mock->getDataMaxSize());
+        $this->assertEquals('1M', $mock->getDataMaxSize());
     }
 
     /**
@@ -130,7 +130,7 @@ public function testGetDataMaxSizeInBytes(int $expectedResult, string $maxSize):
             ->getMock();
 
         $mock->expects($this->once())->method('getDataMaxSize')->willReturn($maxSize);
-        $this->assertSame($expectedResult, $mock->getDataMaxSizeInBytes());
+        $this->assertEquals($expectedResult, $mock->getDataMaxSizeInBytes());
     }
 
     /**
diff --git a/tests/unit/Varien/ObjectTest.php b/tests/unit/Varien/ObjectTest.php
index d7c2e785e63..928275852a4 100644
--- a/tests/unit/Varien/ObjectTest.php
+++ b/tests/unit/Varien/ObjectTest.php
@@ -181,9 +181,9 @@ public function testToString(): void
     {
         $this->subject->setString1('open');
         $this->subject->setString2('mage');
-        $this->assertSame('open, mage', $this->subject->toString());
-        $this->assertSame('openmage', $this->subject->toString('{{string1}}{{string2}}'));
-        $this->assertSame('open', $this->subject->toString('{{string1}}{{string_not_exists}}'));
+        $this->assertEquals('open, mage', $this->subject->toString());
+        $this->assertEquals('openmage', $this->subject->toString('{{string1}}{{string2}}'));
+        $this->assertEquals('open', $this->subject->toString('{{string1}}{{string_not_exists}}'));
     }
 
     /**
@@ -202,36 +202,36 @@ public function testGetSetUnsData(): void
         $this->subject->setData('left', 'over');
         $this->assertFalse($this->subject->isEmpty());
 
-        $this->assertSame('abc', $this->subject->getData('a_b_c'));
-        $this->assertSame('abc', $this->subject->getABC());
+        $this->assertEquals('abc', $this->subject->getData('a_b_c'));
+        $this->assertEquals('abc', $this->subject->getABC());
         $this->subject->unsetData('a_b_c');
 
-        $this->assertSame('efg', $this->subject->getData('efg'));
-        $this->assertSame('efg', $this->subject->getEfg());
+        $this->assertEquals('efg', $this->subject->getData('efg'));
+        $this->assertEquals('efg', $this->subject->getEfg());
         $this->subject->unsEfg();
 
-        $this->assertSame('123', $this->subject->getData('123'));
-        $this->assertSame('123', $this->subject->get123());
+        $this->assertEquals('123', $this->subject->getData('123'));
+        $this->assertEquals('123', $this->subject->get123());
         $this->subject->uns123();
 
         $this->subject->unsetData('345');
 
-        $this->assertSame('value_a_first', $this->subject->getData('key_a_first'));
-        $this->assertSame('value_a_first', $this->subject->getKeyAFirst());
+        $this->assertEquals('value_a_first', $this->subject->getData('key_a_first'));
+        $this->assertEquals('value_a_first', $this->subject->getKeyAFirst());
         $this->subject->unsetData('key_a_first');
 
-        $this->assertSame('value_a_2nd', $this->subject->getData('key_a_2nd'));
-        $this->assertSame('value_a_2nd', $this->subject->getKeyA_2nd());
+        $this->assertEquals('value_a_2nd', $this->subject->getData('key_a_2nd'));
+        $this->assertEquals('value_a_2nd', $this->subject->getKeyA_2nd());
         $this->subject->unsetData('key_a_2nd');
 
-        $this->assertSame('value_a_3rd', $this->subject->getData('key_a3rd'));
-        $this->assertSame('value_a_3rd', $this->subject->getKeyA3rd());
+        $this->assertEquals('value_a_3rd', $this->subject->getData('key_a3rd'));
+        $this->assertEquals('value_a_3rd', $this->subject->getKeyA3rd());
         $this->subject->unsetData('key_a3rd');
 
-        $this->assertSame(['left' => 'over'], $this->subject->getData());
+        $this->assertEquals(['left' => 'over'], $this->subject->getData());
 
         $this->subject->unsetData();
-        $this->assertSame([], $this->subject->getData());
+        $this->assertEquals([], $this->subject->getData());
         $this->assertTrue($this->subject->isEmpty());
 
         try {
@@ -252,8 +252,8 @@ public function testOffset(): void
 
         $this->subject->offsetSet('off', 'set');
         $this->assertTrue($this->subject->offsetExists('off'));
-        $this->assertSame('set', $this->subject->offsetGet('off'));
-        $this->assertSame(null, $this->subject->offsetGet('not-exists'));
+        $this->assertEquals('set', $this->subject->offsetGet('off'));
+        $this->assertEquals(null, $this->subject->offsetGet('not-exists'));
 
         $this->subject->offsetUnset('off');
         $this->assertFalse($this->subject->offsetExists('off'));

From 59e38eafb1a8b25585520d4590e0c6dceb54e071 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 22:42:32 +0200
Subject: [PATCH 72/79] Nicer output?

---
 .github/workflows/phpunit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index d9142354e3b..b91d6326136 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -87,7 +87,7 @@ jobs:
           --skip_url_validation 'yes'
 
       - name: Run phpUnit
-        run: php -f vendor/bin/phpunit
+        run: php -f vendor/bin/phpunit --testdox
 
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2

From 5a2d48a49459e2476be1f2972ed95be3654aa19f Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 22:55:15 +0200
Subject: [PATCH 73/79] Don't wait for phpcs

---
 .github/workflows/workflow.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 62152951fcb..f678da46524 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -93,10 +93,10 @@ jobs:
     uses: ./.github/workflows/phpstan.yml
 
   # DOES NOT run by default
-  # runs on schedule or when worklfow changed
+  # runs on schedule or when workflow changed
   syntax_php:
     name: PHP Syntax
-    needs: [check, phpcs, php-cs-fixer]
+    needs: [check, php-cs-fixer]
     if: needs.check.outputs.workflow > 0
     uses: ./.github/workflows/syntax-php.yml
 
@@ -107,10 +107,10 @@ jobs:
     uses: ./.github/workflows/syntax-xml.yml
 
   # DOES NOT run by default
-  # runs on schedule or when worklfow or unit tests changed
+  # runs on schedule or when workflow or unit tests changed
   unit_tests:
     name: Unit Tests (OpenMage)
-    needs: [check, phpcs, php-cs-fixer]
+    needs: [check, php-cs-fixer]
     if: |
       needs.check.outputs.phpunit-test > 0 ||
       needs.check.outputs.phpunit > 0 ||

From 19354fbe5db334f3cdc3fffce4cd1935bc6afcfc Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Wed, 4 Sep 2024 22:56:41 +0200
Subject: [PATCH 74/79] Revert output

---
 .github/workflows/phpunit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index b91d6326136..d9142354e3b 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -87,7 +87,7 @@ jobs:
           --skip_url_validation 'yes'
 
       - name: Run phpUnit
-        run: php -f vendor/bin/phpunit --testdox
+        run: php -f vendor/bin/phpunit
 
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2

From e8145473ec55151c1f9a401b386f053d75f359de Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 9 Sep 2024 20:59:02 +0200
Subject: [PATCH 75/79] Updated workflows

---
 .gitattributes                    | 5 ++---
 .github/workflows/check-files.yml | 9 ++++-----
 .github/workflows/workflow.yml    | 1 +
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index a54ca6bcb41..33a3b1e2c65 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,9 +14,8 @@
 /.phpcs.php.xml.dist export-ignore
 /.phpcs.xml.dist export-ignore
 /.phpmd.dist.xml export-ignore
-/phpstan.dist.baseline.neon export-ignore
-/phpstan.dist.issues.neon export-ignore
-/phpstan.dist.neon export-ignore
+/.phpstan.dist.baseline.neon export-ignore
+/.phpstan.dist.neon export-ignore
 
 /README.md export-ignore
 
diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml
index 516235773c7..a83d663a780 100644
--- a/.github/workflows/check-files.yml
+++ b/.github/workflows/check-files.yml
@@ -83,9 +83,8 @@ jobs:
             **phpcs**
             **php-cs-fixer**
             **phpstan**
-            dev/tests/
-            dev/phpunit*
-            dev/sonar*
+            tests/
+            phpunit*
 
       - name: Check if composer files changed
         id: changes-composer
@@ -157,7 +156,7 @@ jobs:
         id: changes-phpunit-test
         if: steps.changed-files-specific.outputs.any_modified == 'true'
         run: |
-          count="$(grep -oE "dev/tests/" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
+          count="$(grep -oE "tests/" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
           echo "$count UnitTest test file(s) changed"
           echo "phpunit-test=$count" >> $GITHUB_OUTPUT
 
@@ -165,6 +164,6 @@ jobs:
         id: changes-phpunit
         if: steps.changed-files-specific.outputs.any_modified == 'true'
         run: |
-          count="$(grep -oE "dev/phpunit*" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
+          count="$(grep -oE "phpunit*" <<< "${{ steps.changed-files-specific.outputs.all_modified_files }}" | wc -l)"
           echo "$count PHPUnit file(s) changed"
           echo "phpunit=$count" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index f678da46524..669207a35ec 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -112,6 +112,7 @@ jobs:
     name: Unit Tests (OpenMage)
     needs: [check, php-cs-fixer]
     if: |
+      needs.check.outputs.php > 0 ||
       needs.check.outputs.phpunit-test > 0 ||
       needs.check.outputs.phpunit > 0 ||
       needs.check.outputs.workflow > 0

From c1a1b5fbc6ca2dfe460f44f1b2d73c2d53e5526e Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 9 Sep 2024 21:12:05 +0200
Subject: [PATCH 76/79] Added test

---
 tests/unit/Mage/Log/Model/VisitorTest.php | 46 +++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 tests/unit/Mage/Log/Model/VisitorTest.php

diff --git a/tests/unit/Mage/Log/Model/VisitorTest.php b/tests/unit/Mage/Log/Model/VisitorTest.php
new file mode 100644
index 00000000000..25c33a92b13
--- /dev/null
+++ b/tests/unit/Mage/Log/Model/VisitorTest.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * OpenMage
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available at https://opensource.org/license/osl-3-0-php
+ *
+ * @category   OpenMage
+ * @package    OpenMage_Tests
+ * @copyright  Copyright (c) 2024 The OpenMage Contributors (https://www.openmage.org)
+ * @license    https://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+declare(strict_types=1);
+
+namespace OpenMage\Tests\Unit\Mage\Log\Model;
+
+use Mage;
+use Mage_Log_Model_Visitor;
+use PHPUnit\Framework\TestCase;
+
+class VisitorTest extends TestCase
+{
+    /**
+     * @var Mage_Log_Model_Visitor
+     */
+    public Mage_Log_Model_Visitor $subject;
+
+    public function setUp(): void
+    {
+        Mage::app();
+        $this->subject = Mage::getModel('log/visitor');
+    }
+
+    /**
+     * @group Mage_Log
+     * @group Mage_Log_Model
+     * @runInSeparateProcess
+     */
+    public function testInitServerData(): void
+    {
+        $this->assertInstanceOf(Mage_Log_Model_Visitor::class, $this->subject->initServerData());
+    }
+}

From 737c5bcbad225a37e211259f26e34167344d3fd8 Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 9 Sep 2024 21:13:18 +0200
Subject: [PATCH 77/79] Added phpunit command to composer.json

---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index 6725104f690..93b391f3edc 100644
--- a/composer.json
+++ b/composer.json
@@ -127,5 +127,10 @@
             "php": "7.4"
         },
         "sort-packages": true
+    },
+    "scripts": {
+        "phpunit:test": "@php vendor/bin/phpunit --no-coverage \"$@\" --testdox",
+        "phpunit:coverage": "@php -XDEBUG_MODE=coverage vendor/bin/phpunit --testdox",
+        "phpunit:coverage-local": "@php -XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-html build/coverage --testdox"
     }
 }

From d9bb9afe3d4bc6f830bccbb1401e608fd2bef90b Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Mon, 9 Sep 2024 21:38:51 +0200
Subject: [PATCH 78/79] Updated DDEV commands

---
 .ddev/commands/web/phpunit-coverage       | 2 +-
 .ddev/commands/web/phpunit-coverage-local | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100755 .ddev/commands/web/phpunit-coverage-local

diff --git a/.ddev/commands/web/phpunit-coverage b/.ddev/commands/web/phpunit-coverage
index 7a877d6cb6d..c0971c51e6c 100755
--- a/.ddev/commands/web/phpunit-coverage
+++ b/.ddev/commands/web/phpunit-coverage
@@ -5,5 +5,5 @@
 ## Example: ddev phpunit-coverage
 
 enable_xdebug
-XDEBUG_MODE=coverage php vendor/bin/phpunit "$@" --testdox
+XDEBUG_MODE=coverage php vendor/bin/phpunit --testdox
 disable_xdebug
\ No newline at end of file
diff --git a/.ddev/commands/web/phpunit-coverage-local b/.ddev/commands/web/phpunit-coverage-local
new file mode 100755
index 00000000000..ce6c0987a5c
--- /dev/null
+++ b/.ddev/commands/web/phpunit-coverage-local
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+## Description: run PHPUnit with local HTML coverage
+## Usage: phpunit-coverage-local
+## Example: ddev phpunit-coverage-local
+
+enable_xdebug
+XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-html build/coverage --testdox
+disable_xdebug
\ No newline at end of file

From ca7c803f14260f812d031ce87e7d6606010295ef Mon Sep 17 00:00:00 2001
From: Sven Reichel <github-sr@hotmail.com>
Date: Tue, 10 Sep 2024 05:17:25 +0200
Subject: [PATCH 79/79] Updated composer scripts

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 93b391f3edc..3fc9d0344f9 100644
--- a/composer.json
+++ b/composer.json
@@ -129,8 +129,8 @@
         "sort-packages": true
     },
     "scripts": {
-        "phpunit:test": "@php vendor/bin/phpunit --no-coverage \"$@\" --testdox",
-        "phpunit:coverage": "@php -XDEBUG_MODE=coverage vendor/bin/phpunit --testdox",
-        "phpunit:coverage-local": "@php -XDEBUG_MODE=coverage vendor/bin/phpunit --coverage-html build/coverage --testdox"
+        "phpunit:test": "vendor/bin/phpunit --no-coverage \"$@\" --testdox",
+        "phpunit:coverage": "XDEBUG_MODE=coverage php vendor/bin/phpunit --testdox",
+        "phpunit:coverage-local": "XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-html build/coverage --testdox"
     }
 }