[WIP] Fixes ENV overriding config

.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

.ddev/commands/web/phpunit-coverage-local

@@ -5,5 +5,5 @@
 ## Example: ddev phpunit-coverage-local
 
 enable_xdebug
-XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-html build/coverage --testdox
+XDEBUG_MODE=coverage php vendor/bin/phpunit --coverage-html build/coverage "$@" --testdox
 disable_xdebug

.github/workflows/phpstan.yml

@@ -36,5 +36,19 @@ jobs:
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress --ignore-platform-req=ext-*
 
+      - name: "Restore result cache"
+        uses: actions/cache/restore@v4
+        with:
+          path: .phpstan.cache
+          key: "phpstan-result-cache-${{ runner.os }}-${{ matrix.php-versions }}-${{ github.run_id }}"
+          restore-keys: phpstan-result-cache-
+
       - name: PHPStan Static Analysis
         run: XDEBUG_MODE=off php vendor/bin/phpstan.phar analyze
+
+      - name: "Save result cache"
+        uses: actions/cache/save@v4
+        if: always()
+        with:
+          path: .phpstan.cache
+          key: "phpstan-result-cache-${{ runner.os }}-${{ matrix.php-versions }}-${{ github.run_id }}"

.github/workflows/rector.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   rector:
-    name: Validation
+    name: Rector
     runs-on: [ubuntu-latest]
 
     steps:

.gitignore

@@ -64,6 +64,7 @@
 !.phpcs*.xml.dist
 
 # PhpStan
+.phpstan.cache
 .phpstan*.neon
 phpstan*.neon
 !.phpstan.dist.neon

.phpstan.dist.neon

@@ -69,5 +69,6 @@ parameters:
     checkFunctionNameCase: true
     checkInternalClassCaseSensitivity: true
     treatPhpDocTypesAsCertain: false
+    tmpDir: .phpstan.cache
 #    universalObjectCratesClasses:
 #        - Varien_Object

app/code/core/Mage/Admin/Model/Block.php

@@ -37,7 +37,7 @@ protected function _construct()
     }
 
     /**
-     * @return array|bool
+     * @return array|true
      * @throws Exception
      * @throws Zend_Validate_Exception
      */

app/code/core/Mage/Admin/Model/User.php

@@ -364,7 +364,7 @@ public function getAclRole()
     }
 
     /**
-     * Authenticate user name and password and save loaded record
+     * Authenticate username and password and save loaded record
      *
      * @param string $username
      * @param string $password
@@ -384,7 +384,7 @@ public function authenticate($username, $password)
             $this->loadByUsername($username);
             $sensitive = ($config) ? $username == $this->getUsername() : true;
 
-            if ($sensitive && $this->getId() && Mage::helper('core')->validateHash($password, $this->getPassword())) {
+            if ($sensitive && $this->getId() && $this->validatePasswordHash($password, $this->getPassword())) {
                 if ($this->getIsActive() != '1') {
                     Mage::throwException(Mage::helper('adminhtml')->__('This account is inactive.'));
                 }
@@ -411,6 +411,11 @@ public function authenticate($username, $password)
         return $result;
     }
 
+    public function validatePasswordHash(string $string1, string $string2): bool
+    {
+        return Mage::helper('core')->validateHash($string1, $string2);
+    }
+
     /**
      * Login user
      *

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Edit/Tab/Websites.php

@@ -42,7 +42,7 @@ public function getProduct()
     /**
      * Get store ID of current product
      *
-     * @return int
+     * @return string
      */
     public function getStoreId()
     {

app/code/core/Mage/Adminhtml/Block/Newsletter/Queue/Edit.php

@@ -224,7 +224,7 @@ protected function isSingleStoreMode()
     /**
      * Getter for id of current store (the only one in single-store mode and current in multi-stores mode)
      *
-     * @return int
+     * @return string
      */
     protected function getStoreId()
     {

app/code/core/Mage/Adminhtml/Block/Newsletter/Template/Edit.php

@@ -335,7 +335,7 @@ protected function isSingleStoreMode()
     /**
      * Getter for id of current store (the only one in single-store mode and current in multi-stores mode)
      *
-     * @return int
+     * @return string
      */
     protected function getStoreId()
     {

app/code/core/Mage/Adminhtml/Block/System/Config/Form/Field.php

@@ -47,6 +47,7 @@ public function render(Varien_Data_Form_Element_Abstract $element)
         $options = $element->getValues();
 
         $addInheritCheckbox = false;
+        $checkboxLabel = '';
         if ($element->getCanUseWebsiteValue()) {
             $addInheritCheckbox = true;
             $checkboxLabel = $this->__('Use Website');
@@ -55,6 +56,15 @@ public function render(Varien_Data_Form_Element_Abstract $element)
             $checkboxLabel = $this->__('Use Default');
         }
 
+        $envConfig = Mage::getConfig()->getEnvOverriddenConfigPaths();
+        $envConfigIds = array_combine(str_replace('/', '_', array_keys($envConfig)), array_values($envConfig));
+        if (array_key_exists($element->getId(), $envConfigIds)) {
+            $addInheritCheckbox = false;
+            $element->setDisabled(true);
+            $element->setScopeLabel('[ENV]]');
+            $element->setValue($envConfigIds[$element->getId()]);
+        }
+
         if ($addInheritCheckbox) {
             $inherit = $element->getInherit() == 1 ? 'checked="checked"' : '';
             if ($inherit) {

app/code/core/Mage/Adminhtml/Model/System/Store.php

@@ -48,6 +48,7 @@ class Mage_Adminhtml_Model_System_Store extends Varien_Object
     /**
      * @var bool
      */
+    // phpcs:ignore Ecg.PHP.PrivateClassMember.PrivateClassMemberError
     private $_isAdminScopeAllowed = true;
 
     /**
@@ -122,6 +123,7 @@ public function getStoreValuesForForm($empty = false, $all = false)
             ];
         }
 
+        // phpcs:ignore Ecg.Security.ForbiddenFunction.Found
         $nonEscapableNbspChar = html_entity_decode(' ', ENT_NOQUOTES, 'UTF-8');
 
         foreach ($this->_websiteCollection as $website) {

app/code/core/Mage/Adminhtml/controllers/System/StoreController.php

@@ -442,7 +442,7 @@ public function deleteStorePostAction()
      *
      * @param string $failPath redirect path if backup failed
      * @param array $arguments
-     * @return $this
+     * @return $this|void
      */
     protected function _backupDatabase($failPath, $arguments = [])
     {
@@ -468,11 +468,11 @@ protected function _backupDatabase($failPath, $arguments = [])
         } catch (Mage_Core_Exception $e) {
             $this->_getSession()->addError($e->getMessage());
             $this->_redirect($failPath, $arguments);
-            return ;
+            return;
         } catch (Exception $e) {
             $this->_getSession()->addException($e, Mage::helper('backup')->__('Unable to create backup. Please, try again later.'));
             $this->_redirect($failPath, $arguments);
-            return ;
+            return;
         }
         return $this;
     }

app/code/core/Mage/Api2/Model/Resource.php

@@ -621,6 +621,7 @@ protected function _critical($message, $code = null)
             }
             $code = $errors[$message];
         }
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         throw new Mage_Api2_Exception($message, $code);
     }
 
@@ -657,6 +658,7 @@ protected function _getCriticalErrors()
      */
     protected function _error($message, $code)
     {
+        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $this->getResponse()->setException(new Mage_Api2_Exception($message, $code));
         return $this;
     }

app/code/core/Mage/Api2/Model/Route/ApiType.php

@@ -45,6 +45,7 @@ public function __construct(
         ?Zend_Translate $translator = null,
         $locale = null
     ) {
+        // phpcs:ignore Ecg.Security.ForbiddenFunction.Found
         parent::__construct([Mage_Api2_Model_Route_Abstract::PARAM_ROUTE => str_replace('.php', '', basename(getenv('SCRIPT_FILENAME'))) . '/:api_type']);
     }
 }

app/code/core/Mage/Bundle/Model/Product/Price.php

@@ -79,7 +79,6 @@ public function getTotalBundleItemsPrice($product, $qty = null)
                 $selectionIds = unserialize($customOption->getValue(), ['allowed_classes' => false]);
                 /** @var Mage_Bundle_Model_Product_Type $productType */
                 $productType = $product->getTypeInstance(true);
-                /** @var Mage_Bundle_Model_Resource_Selection_Collection $selections */
                 $selections = $productType->getSelectionsByIds($selectionIds, $product);
                 $selections->addTierPriceData();
                 Mage::dispatchEvent('prepare_catalog_product_collection_prices', [

app/code/core/Mage/Captcha/Helper/Data.php

@@ -62,7 +62,7 @@ public function isEnabled(): bool
      * Get Captcha
      *
      * @param string $formId
-     * @return Mage_Captcha_Model_Interface
+     * @return Mage_Captcha_Model_Zend
      */
     public function getCaptcha($formId)
     {
@@ -76,7 +76,7 @@ public function getCaptcha($formId)
     /**
      * Returns value of the node with respect to current area (frontend or backend)
      *
-     * @param string $id The last part of XML_PATH_$area_CAPTCHA_ constant (case insensitive)
+     * @param string $id The last part of XML_PATH_$area_CAPTCHA_ constant (case-insensitive)
      * @param Mage_Core_Model_Store $store
      * @return Mage_Core_Model_Config_Element
      */

app/code/core/Mage/Catalog/Helper/Data.php

@@ -44,7 +44,7 @@ class Mage_Catalog_Helper_Data extends Mage_Core_Helper_Abstract
     /**
      * Breadcrumb Path cache
      *
-     * @var string
+     * @var string|array<string, array<string, string|null>>
      */
     protected $_categoryPath;
 
@@ -236,7 +236,7 @@ public function isPriceGlobal()
     /**
      * Indicate whether to save URL Rewrite History or not (create redirects to old URLs)
      *
-     * @param int $storeId Store View
+     * @param null|string|bool|int|Mage_Core_Model_Store $storeId Store View
      * @return bool
      */
     public function shouldSaveUrlRewritesHistory($storeId = null)

app/code/core/Mage/Catalog/Model/Api/Resource.php

@@ -78,7 +78,7 @@ protected function _isAllowedAttribute($attribute, $attributes = null)
      * it use seted session or admin store
      *
      * @param string|int $store
-     * @return int
+     * @return string
      */
     protected function _getStoreId($store = null)
     {
@@ -117,7 +117,7 @@ protected function _getProduct($productId, $store = null, $identifierType = null
      * Set current store for catalog.
      *
      * @param string|int $store
-     * @return int
+     * @return string
      */
     public function currentStore($store = null)
     {

app/code/core/Mage/Catalog/Model/Category.php

@@ -138,6 +138,7 @@ class Mage_Catalog_Model_Category extends Mage_Catalog_Model_Abstract
      *
      * @var array
      */
+    // phpcs:ignore Ecg.PHP.PrivateClassMember.PrivateClassMemberError
     private $_designAttributes  = [
         'custom_design',
         'custom_design_from',
@@ -313,7 +314,7 @@ public function move($parentId, $afterCategoryId)
     /**
      * Retrieve default attribute set id
      *
-     * @return int
+     * @return string
      */
     public function getDefaultAttributeSetId()
     {
@@ -440,9 +441,9 @@ public function getLayoutUpdateHandle()
     /**
      * Return store id.
      *
-     * If store id is underfined for category return current active store id
+     * If store id is undefined for category return current active store id
      *
-     * @return int
+     * @return string
      */
     public function getStoreId()
     {
@@ -629,6 +630,7 @@ public function getDesignAttributes()
      * @param string $attributeCode
      * @return Mage_Eav_Model_Entity_Attribute_Abstract
      */
+    // phpcs:ignore Ecg.PHP.PrivateClassMember.PrivateClassMemberError
     private function _getAttribute($attributeCode)
     {
         if (!$this->_useFlatResource) {

app/code/core/Mage/Catalog/Model/Product.php

@@ -138,7 +138,7 @@
  * @method string getMetaDescription()
  * @method string getMetaKeyword()
  * @method string getMetaTitle()
- * @method $this hasMsrpEnabled(bool $value)
+ * @method $this hasMsrpEnabled()
  * @method bool getMsrpEnabled()
  * @method string getMsrpDisplayActualPriceType()
  *
@@ -217,7 +217,7 @@
  * @method $this setStoreIds(array $storeIds)
  * @method array getSwatchPrices()
  *
- * @method int getTaxClassId()
+ * @method string getTaxClassId()
  * @method string getThumbnail()
  * @method float getTaxPercent()
  * @method $this setTaxPercent(float $value)
@@ -360,7 +360,7 @@ protected function _initOldFieldsMap()
     /**
      * Retrieve Store Id
      *
-     * @return int
+     * @return string
      */
     public function getStoreId()
     {
@@ -417,7 +417,7 @@ public function validate()
     /**
      * Get product name
      *
-     * @return string
+     * @return string|null
      */
     public function getName()
     {
@@ -442,16 +442,18 @@ public function getPrice()
      * Set Price calculation flag
      *
      * @param bool $calculate
+     * @return $this
      */
     public function setPriceCalculation($calculate = true)
     {
         $this->_calculatePrice = $calculate;
+        return $this;
     }
 
     /**
      * Get product type identifier
      *
-     * @return string
+     * @return string|null
      */
     public function getTypeId()
     {
@@ -875,7 +877,7 @@ public function cleanCache()
     /**
      * Get product price model
      *
-     * @return Mage_Catalog_Model_Product_Type_Price|Mage_Bundle_Model_Product_Price
+     * @return Mage_Bundle_Model_Product_Price
      */
     public function getPriceModel()
     {

app/code/core/Mage/Catalog/Model/Product/Url.php

@@ -213,7 +213,7 @@ public function getUrl(Mage_Catalog_Model_Product $product, $params = [])
      * Returns checked store_id value
      *
      * @param int|null $id
-     * @return int
+     * @return string
      */
     protected function _getStoreId($id = null)
     {