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

Updated PHPStan to 1.9.13 and ZF1Future to 1.22 #2960

Merged
merged 9 commits into from
Jan 19, 2023
Merged

Updated PHPStan to 1.9.13 and ZF1Future to 1.22 #2960

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
5afbec7
Updated PHPStan 1.9.12 and ZF1F 1.22
fballiano Jan 17, 2023
790ddc2
removed unneeded patches
fballiano Jan 17, 2023
1abeaf2
updated composerlock
fballiano Jan 17, 2023
8387290
removed ZF299
fballiano Jan 17, 2023
56aa151
updated composerlock
fballiano Jan 17, 2023
1d826f1
file deleted
fballiano Jan 17, 2023
eef3ad1
Merge branch '1.9.4.x' into update_deps
fballiano Jan 18, 2023
dc42a7c
phpstan 1.9.13
fballiano Jan 18, 2023
0f85794
phpstan.dist.baseline.neon
sreichel Jan 18, 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
4 changes: 2 additions & 2 deletions app/code/core/Mage/Core/Model/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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()
{
Expand Down
10 changes: 2 additions & 8 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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",
Expand Down
32 changes: 16 additions & 16 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.

34 changes: 0 additions & 34 deletions patches/MAG-1.9.3.10.patch
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions patches/MAG-1.9.4.0.patch
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions patches/ZF-295.patch
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions patches/ZF-296.patch
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions patches/ZF-297.patch
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions patches/ZF-299.patch
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions phpstan.dist.baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down