Fixed PHPStan warnings for branch "next" (PHP 8.1) (OpenMage#3269)

empiricompany · Jul 11, 2023 · b836666 · b836666
1 parent 5ea608f
commit b836666
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 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
@@ -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
      *

diff --git 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)
     {

diff --git a/composer.lock b/composer.lock
diff --git 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;