Skip to content

Commit 382854d

Browse files
committed
Merge remote-tracking branch 'origin/php8-develop' into 32321-31854-migrate-from-laminas-console
2 parents 3fe67e3 + 93f2ab1 commit 382854d

File tree

4 files changed

+85
-70
lines changed

4 files changed

+85
-70
lines changed

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"elasticsearch/elasticsearch": "~7.11.0",
3737
"guzzlehttp/guzzle": "^6.3.3",
3838
"laminas/laminas-captcha": "^2.7.1",
39-
"laminas/laminas-code": "~3.4.1",
39+
"laminas/laminas-code": "^3.5.1",
4040
"laminas/laminas-crypt": "^3.4.0",
4141
"laminas/laminas-db": "^2.12.0",
4242
"laminas/laminas-dependency-plugin": "^2.1.0",
@@ -49,19 +49,19 @@
4949
"laminas/laminas-json": "^3.2.0",
5050
"laminas/laminas-log": "^2.9.1",
5151
"laminas/laminas-mail": "^2.9.0",
52-
"laminas/laminas-mime": "^2.5.0",
52+
"laminas/laminas-mime": "^2.8.0",
5353
"laminas/laminas-modulemanager": "^2.7",
5454
"laminas/laminas-mvc": "^3.2.0",
5555
"laminas/laminas-serializer": "^2.7.2",
5656
"laminas/laminas-server": "^2.6.1",
5757
"laminas/laminas-servicemanager": "^3.6.0",
5858
"laminas/laminas-session": "^2.7.3",
59-
"laminas/laminas-soap": "^2.7.0",
59+
"laminas/laminas-soap": "^2.9.0",
6060
"laminas/laminas-stdlib": "^3.2.1",
6161
"laminas/laminas-text": "^2.6.0",
6262
"laminas/laminas-uri": "^2.5.1",
6363
"laminas/laminas-validator": "^2.6.0",
64-
"laminas/laminas-view": "~2.11.2",
64+
"laminas/laminas-view": "~2.12.0",
6565
"league/flysystem": "^1.0",
6666
"league/flysystem-aws-s3-v3": "^1.0",
6767
"league/flysystem-cached-adapter": "^1.0",

composer.lock

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

lib/internal/Magento/Framework/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
2626
"composer/composer": "^1.9 || ^2.0",
2727
"guzzlehttp/guzzle": "^6.3.3",
28-
"laminas/laminas-code": "~3.4.1",
28+
"laminas/laminas-code": "^3.5.1",
2929
"laminas/laminas-crypt": "^3.4.0",
3030
"laminas/laminas-http": "^2.6.0",
3131
"laminas/laminas-mail": "^2.9.0",
32-
"laminas/laminas-mime": "^2.5.0",
32+
"laminas/laminas-mime": "^2.8.0",
3333
"laminas/laminas-mvc": "^3.2.0",
3434
"laminas/laminas-stdlib": "^3.2.1",
3535
"laminas/laminas-uri": "^2.5.1",

setup/src/Magento/Setup/Module/Di/Code/Reader/FileScanner.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ protected function scan()
3838
define('T_TRAIT', 42001);
3939
}
4040

41+
// ensure php backwards compatibility (from laminas code 3.5.x)
42+
if (!defined('T_NAME_QUALIFIED')) {
43+
define('T_NAME_QUALIFIED', 24001);
44+
}
45+
if (!defined('T_NAME_FULLY_QUALIFIED')) {
46+
define('T_NAME_FULLY_QUALIFIED', 24002);
47+
}
48+
4149
/**
4250
* Variables & Setup
4351
*/

0 commit comments

Comments
 (0)