Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 9 commits into from
Jul 11, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1210a4f
Fixed PHPStan errors in Mage_Media_Model_File_Image
fballiano May 17, 2023
f6fcdd8
Fixed PHPStan errors in Varien_Io_Ftp
fballiano May 17, 2023
7dc1841
Removed deprecated method Mage_Api_Model_Wsdl_Config_Element::getChil…
fballiano May 17, 2023
7305ef1
Merge branch 'next' into phpstannext
fballiano May 30, 2023
0b4f983
Merge branch 'next' into phpstannext
fballiano May 30, 2023
9754a7d
Merge branch 'next' into phpstannext
fballiano Jun 14, 2023
895b890
Merge branch 'next' into phpstannext
fballiano Jul 6, 2023
2913ec5
Merge branch 'next' into phpstannext
fballiano Jul 11, 2023
d286e1b
Fixed composer validate error
fballiano Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions app/code/core/Mage/Api/Model/Wsdl/Config/Element.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Media/Model/File/Image.php
View file
Open in desktop
kiatng marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
{
Expand Down
6 changes: 3 additions & 3 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/Varien/Io/Ftp.php
View file
Open in desktop
kiatng marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Varien_Io_Ftp extends Varien_Io_Abstract
/**
* An FTP connection
*
* @var resource
* @var false|resource|FTP\Connection
*/
protected $_conn;

Expand Down