Skip to content

Commit b836666

Browse files
authored
Fixed PHPStan warnings for branch "next" (PHP 8.1) (OpenMage#3269)
1 parent 5ea608f commit b836666

File tree

4 files changed

+6
-18
lines changed

4 files changed

+6
-18
lines changed

app/code/core/Mage/Api/Model/Wsdl/Config/Element.php

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -157,18 +157,6 @@ public function getAttributes($source, $namespace = null)
157157
return $attributes;
158158
}
159159

160-
/**
161-
* @deprecated due to conflict with PHP8 parent class update
162-
* @param Varien_Simplexml_Element $source
163-
* @return array
164-
*/
165-
#[\ReturnTypeWillChange]
166-
public function getChildren($source = null)
167-
{
168-
Mage::log('Use of deprecated method: ' . __METHOD__);
169-
return self::_getChildren($source);
170-
}
171-
172160
/**
173161
* Return children of all namespaces
174162
*

app/code/core/Mage/Media/Model/File/Image.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function delete(Mage_Media_Model_Image $object)
8080
* Create image resource for operation from file
8181
*
8282
* @param Mage_Media_Model_Image $object
83-
* @return bool|false|resource
83+
* @return false|GdImage|resource
8484
* @throws Mage_Core_Exception
8585
*/
8686
public function getImage(Mage_Media_Model_Image $object)
@@ -112,7 +112,7 @@ public function getImage(Mage_Media_Model_Image $object)
112112
* Create tmp image resource for operations
113113
*
114114
* @param Mage_Media_Model_Image $object
115-
* @return resource
115+
* @return false|GdImage|resource
116116
*/
117117
public function getTmpImage(Mage_Media_Model_Image $object)
118118
{

composer.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/Varien/Io/Ftp.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Varien_Io_Ftp extends Varien_Io_Abstract
3939
/**
4040
* An FTP connection
4141
*
42-
* @var resource
42+
* @var false|resource|FTP\Connection
4343
*/
4444
protected $_conn;
4545

0 commit comments

Comments
 (0)