Updated PHPStan to 1.9.13, ZF1Future to 1.22 (#2960)

OpenMage · Jan 19, 2023 · 8d0828e · 8d0828e
1 parent 2a8e91d
commit 8d0828e
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 224 deletions.
diff --git a/app/code/core/Mage/Core/Model/Cache.php b/app/code/core/Mage/Core/Model/Cache.php
@@ -47,7 +47,7 @@ class Mage_Core_Model_Cache
     /**
      * Cache frontend API
      *
-     * @var Varien_Cache_Core
+     * @var Varien_Cache_Core|Zend_Cache_Core
      */
     protected $_frontend;
 
@@ -355,7 +355,7 @@ protected function _tags($tags = [])
     /**
      * Get cache frontend API object
      *
-     * @return Varien_Cache_Core
+     * @return Varien_Cache_Core|Zend_Cache_Core
      */
     public function getFrontend()
     {

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "pelago/emogrifier": "^7.0",
         "phpseclib/mcrypt_compat": "^2.0.3",
         "phpseclib/phpseclib": "^3.0.14",
-        "shardj/zf1-future": "^1.21",
+        "shardj/zf1-future": "^1.22",
         "symfony/polyfill-php74": "^1.27",
         "symfony/polyfill-php80": "^1.27",
         "symfony/polyfill-php81": "^1.27"
@@ -42,7 +42,7 @@
         "openmage/dev-meta-package": "^1.0",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.13",
-        "phpstan/phpstan": "^1.9.7",
+        "phpstan/phpstan": "^1.9.13",
         "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.7",
         "symplify/vendor-patches": "^11.1"
@@ -101,12 +101,6 @@
                 "MAG-1.9.3.0": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/MAG-1.9.3.0.patch",
                 "MAG-1.9.3.7 - SUPEE-10415": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/MAG-1.9.3.7.patch",
                 "MAG-1.9.3.9": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/MAG-1.9.3.9.patch",
-                "MAG-1.9.3.10": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/MAG-1.9.3.10.patch",
-                "MAG-1.9.4.0": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/MAG-1.9.4.0.patch",
-                "ZF-295 - SUPEE-9652/10570": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/ZF-295.patch",
-                "ZF-296 - Better IIS suport": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/ZF-296.patch",
-                "ZF-297 - Invalid argument type": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/ZF-297.patch",
-                "ZF-299 - Limit mktime() year": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/ZF-299.patch",
                 "OM-918 - Add runtime cache to Zend_Locale_Data": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/OM-918.patch",
                 "OM-1081 - Not detecting HTTPS behind a proxy": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/OM-1081.patch",
                 "OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/magento-lts/1.9.4.x/patches/OM-2047.patch",

diff --git a/composer.lock b/composer.lock
diff --git a/patches/MAG-1.9.3.10.patch b/patches/MAG-1.9.3.10.patch
diff --git a/patches/MAG-1.9.4.0.patch b/patches/MAG-1.9.4.0.patch
diff --git a/patches/ZF-295.patch b/patches/ZF-295.patch
diff --git a/patches/ZF-296.patch b/patches/ZF-296.patch
diff --git a/patches/ZF-297.patch b/patches/ZF-297.patch
diff --git a/patches/ZF-299.patch b/patches/ZF-299.patch
diff --git a/phpstan.dist.baseline.neon b/phpstan.dist.baseline.neon
@@ -3250,11 +3250,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/Core/Model/Cache.php
 
-		-
-			message: "#^Property Mage_Core_Model_Cache\\:\\:\\$_frontend \\(Varien_Cache_Core\\) does not accept Zend_Cache_Core\\|Zend_Cache_Frontend\\.$#"
-			count: 1
-			path: app/code/core/Mage/Core/Model/Cache.php
-
 		-
 			message: "#^Call to an undefined method SimpleXMLElement\\:\\:getClassName\\(\\)\\.$#"
 			count: 1