Skip to content

Commit 3f0bde0

Browse files
committed
MC-13825: [2.4.x] Migrate ZF2 components to Laminas
-- fix merge conflict
1 parent 73f1d9e commit 3f0bde0

File tree

5 files changed

+2884
-2673
lines changed

5 files changed

+2884
-2673
lines changed

composer.json

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,35 @@
3636
"composer/composer": "^1.6",
3737
"elasticsearch/elasticsearch": "~2.0||~5.1||~6.1",
3838
"guzzlehttp/guzzle": "^6.3.3",
39+
"laminas/laminas-captcha": "^2.7.1",
40+
"laminas/laminas-code": "~3.3.0",
41+
"laminas/laminas-config": "^2.6.0",
42+
"laminas/laminas-console": "^2.6.0",
43+
"laminas/laminas-crypt": "^2.6.0",
44+
"laminas/laminas-db": "^2.8.2",
45+
"laminas/laminas-dependency-plugin": "^1.0",
46+
"laminas/laminas-di": "^2.6.1",
47+
"laminas/laminas-eventmanager": "^3.0.0",
48+
"laminas/laminas-feed": "^2.9.0",
49+
"laminas/laminas-form": "^2.10.0",
50+
"laminas/laminas-http": "^2.6.0",
51+
"laminas/laminas-i18n": "^2.7.3",
52+
"laminas/laminas-json": "^2.6.1",
53+
"laminas/laminas-log": "^2.9.1",
54+
"laminas/laminas-mail": "^2.9.0",
55+
"laminas/laminas-mime": "^2.5.0",
56+
"laminas/laminas-modulemanager": "^2.7",
57+
"laminas/laminas-mvc": "~2.7.0",
58+
"laminas/laminas-serializer": "^2.7.2",
59+
"laminas/laminas-server": "^2.6.1",
60+
"laminas/laminas-servicemanager": "^2.7.8",
61+
"laminas/laminas-session": "^2.7.3",
62+
"laminas/laminas-soap": "^2.7.0",
63+
"laminas/laminas-stdlib": "^3.2.1",
64+
"laminas/laminas-text": "^2.6.0",
65+
"laminas/laminas-uri": "^2.5.1",
66+
"laminas/laminas-validator": "^2.6.0",
67+
"laminas/laminas-view": "~2.11.2",
3968
"league/flysystem": "^1.0",
4069
"league/flysystem-aws-s3-v3": "^1.0",
4170
"league/flysystem-azure-blob-storage": "^0.1.6",
@@ -55,35 +84,7 @@
5584
"tedivm/jshrink": "~1.3.0",
5685
"tubalmartin/cssmin": "4.1.1",
5786
"webonyx/graphql-php": "^0.13.8",
58-
"wikimedia/less.php": "~1.8.0",
59-
"zendframework/zend-captcha": "^2.7.1",
60-
"zendframework/zend-code": "~3.3.0",
61-
"zendframework/zend-config": "^2.6.0",
62-
"zendframework/zend-console": "^2.6.0",
63-
"zendframework/zend-crypt": "^2.6.0",
64-
"zendframework/zend-db": "^2.8.2",
65-
"zendframework/zend-di": "^2.6.1",
66-
"zendframework/zend-eventmanager": "^3.0.0",
67-
"zendframework/zend-feed": "^2.9.0",
68-
"zendframework/zend-form": "^2.10.0",
69-
"zendframework/zend-http": "^2.6.0",
70-
"zendframework/zend-i18n": "^2.7.3",
71-
"zendframework/zend-json": "^2.6.1",
72-
"zendframework/zend-log": "^2.9.1",
73-
"zendframework/zend-mail": "^2.9.0",
74-
"zendframework/zend-mime": "^2.5.0",
75-
"zendframework/zend-modulemanager": "^2.7",
76-
"zendframework/zend-mvc": "~2.7.0",
77-
"zendframework/zend-serializer": "^2.7.2",
78-
"zendframework/zend-server": "^2.6.1",
79-
"zendframework/zend-servicemanager": "^2.7.8",
80-
"zendframework/zend-session": "^2.7.3",
81-
"zendframework/zend-soap": "^2.7.0",
82-
"zendframework/zend-stdlib": "^3.2.1",
83-
"zendframework/zend-text": "^2.6.0",
84-
"zendframework/zend-uri": "^2.5.1",
85-
"zendframework/zend-validator": "^2.6.0",
86-
"zendframework/zend-view": "~2.11.2"
87+
"wikimedia/less.php": "~1.8.0"
8788
},
8889
"require-dev": {
8990
"allure-framework/allure-phpunit": "~1.2.0",
@@ -322,7 +323,7 @@
322323
"Magento\\Framework\\": "lib/internal/Magento/Framework/",
323324
"Magento\\Setup\\": "setup/src/Magento/Setup/",
324325
"Magento\\": "app/code/Magento/",
325-
"Zend\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
326+
"Laminas\\Mvc\\Controller\\": "setup/src/Zend/Mvc/Controller/"
326327
},
327328
"psr-0": {
328329
"": [

0 commit comments

Comments
 (0)