Skip to content

Update laminas-code to ^3.5.1 to be PHP8 compatible #32209

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

Merged
magento-cicd2 merged 11 commits into from
Mar 11, 2021
Merged

Update laminas-code to ^3.5.1 to be PHP8 compatible #32209

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
be4e4a7
#31345 Update laminas-code to ^3.5.1 to be PHP8 compatible
hws47a Feb 17, 2021
aec1039
#31345 Fix for ArgumentsReader as ParameterReflection::getClass fails…
hws47a Feb 17, 2021
136b1a4
Merge remote-tracking branch 'origin/php8-develop' into 31345-update-…
hws47a Feb 18, 2021
4bbe7a0
#31345: update laminas-code in magento framework
hws47a Feb 18, 2021
8063e14
#31345 Temporary add missing constants to autoload.php to see if othe…
hws47a Feb 23, 2021
1afe9b0
Merge remote-tracking branch 'origin/php8-develop' into 31345-update-…
hws47a Feb 23, 2021
422f73c
#31345 A better fix for ArgumentsReader::processType
hws47a Feb 23, 2021
81203f6
#31345: Alternative way to fix missing constants
hws47a Feb 26, 2021
7803e7c
Merge remote-tracking branch 'origin/php8-develop' into 31345-update-…
hws47a Mar 9, 2021
6ffa870
#31345 code style fix
hws47a Mar 10, 2021
872aa8e
Merge branch 'php8-develop' into 31345-update-laminas-code
hws47a Mar 10, 2021
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"elasticsearch/elasticsearch": "~7.11.0",
"guzzlehttp/guzzle": "^6.3.3",
"laminas/laminas-captcha": "^2.7.1",
"laminas/laminas-code": "~3.4.1",
"laminas/laminas-code": "^3.5.1",
"laminas/laminas-console": "^2.6.0",
"laminas/laminas-crypt": "^3.4.0",
"laminas/laminas-db": "^2.8.2",
Expand Down
69 changes: 42 additions & 27 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/internal/Magento/Framework/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
"composer/composer": "^1.9 || ^2.0",
"guzzlehttp/guzzle": "^6.3.3",
"laminas/laminas-code": "~3.4.1",
"laminas/laminas-code": "^3.5.1",
"laminas/laminas-crypt": "^3.4.0",
"laminas/laminas-http": "^2.6.0",
"laminas/laminas-mail": "^2.9.0",
Expand Down
8 changes: 8 additions & 0 deletions setup/src/Magento/Setup/Module/Di/Code/Reader/FileScanner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ protected function scan()
define('T_TRAIT', 42001);
}

// ensure php backwards compatibility (from laminas code 3.5.x)
if (! defined('T_NAME_QUALIFIED')) {
define('T_NAME_QUALIFIED', 24001);
}
if (! defined('T_NAME_FULLY_QUALIFIED')) {
define('T_NAME_FULLY_QUALIFIED', 24002);
}

/**
* Variables & Setup
*/
Expand Down