From 1210a4f80bc6bf6a6ae835260eee54150c9c2a9d Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Wed, 17 May 2023 14:53:44 +0100 Subject: [PATCH 1/4] Fixed PHPStan errors in Mage_Media_Model_File_Image --- app/code/core/Mage/Media/Model/File/Image.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/core/Mage/Media/Model/File/Image.php b/app/code/core/Mage/Media/Model/File/Image.php index 1dd677ff386..e913a93a68b 100644 --- a/app/code/core/Mage/Media/Model/File/Image.php +++ b/app/code/core/Mage/Media/Model/File/Image.php @@ -80,7 +80,7 @@ public function delete(Mage_Media_Model_Image $object) * Create image resource for operation from file * * @param Mage_Media_Model_Image $object - * @return bool|false|resource + * @return false|GdImage|resource * @throws Mage_Core_Exception */ public function getImage(Mage_Media_Model_Image $object) @@ -112,7 +112,7 @@ public function getImage(Mage_Media_Model_Image $object) * Create tmp image resource for operations * * @param Mage_Media_Model_Image $object - * @return resource + * @return false|GdImage|resource */ public function getTmpImage(Mage_Media_Model_Image $object) { From f6fcdd83dedb3600a0a34d60fb43f7f581b3d6c3 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Wed, 17 May 2023 15:05:45 +0100 Subject: [PATCH 2/4] Fixed PHPStan errors in Varien_Io_Ftp --- lib/Varien/Io/Ftp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Varien/Io/Ftp.php b/lib/Varien/Io/Ftp.php index 7f27fe9f98e..8f058299a1d 100644 --- a/lib/Varien/Io/Ftp.php +++ b/lib/Varien/Io/Ftp.php @@ -39,7 +39,7 @@ class Varien_Io_Ftp extends Varien_Io_Abstract /** * An FTP connection * - * @var resource + * @var false|resource|FTP\Connection */ protected $_conn; From 7dc1841b918e5066060ea90fa411b78c677ec479 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Wed, 17 May 2023 15:15:02 +0100 Subject: [PATCH 3/4] Removed deprecated method Mage_Api_Model_Wsdl_Config_Element::getChildren() --- app/code/core/Mage/Api/Model/Wsdl/Config/Element.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php index 73c4c4b315a..9cbb491d8fc 100644 --- a/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php +++ b/app/code/core/Mage/Api/Model/Wsdl/Config/Element.php @@ -157,18 +157,6 @@ public function getAttributes($source, $namespace = null) return $attributes; } - /** - * @deprecated due to conflict with PHP8 parent class update - * @param Varien_Simplexml_Element $source - * @return array - */ - #[\ReturnTypeWillChange] - public function getChildren($source = null) - { - Mage::log('Use of deprecated method: ' . __METHOD__); - return self::_getChildren($source); - } - /** * Return children of all namespaces * From d286e1bf6587750190fcca46ab648fa3fab9cb58 Mon Sep 17 00:00:00 2001 From: Fabrizio Balliano Date: Tue, 11 Jul 2023 10:19:47 +0100 Subject: [PATCH 4/4] Fixed composer validate error --- composer.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.lock b/composer.lock index dcb211ad557..e9ff8918641 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": "bcf4c7beaca0c503bdd487b27bb863b6", + "content-hash": "bd9c6926886f768d8b354f3686deeee2", "packages": [ { "name": "colinmollenhour/cache-backend-redis", @@ -5775,7 +5775,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=7.4 <8.3", + "php": ">=8.1 <8.3", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", @@ -5793,7 +5793,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.4" + "php": "8.1" }, "plugin-api-version": "2.3.0" }