Skip to content

Commit a909030

Browse files
committed
MC-15318: Migrate ZF2 components to Laminas
1 parent 787d8d3 commit a909030

File tree

3 files changed

+26
-21
lines changed

3 files changed

+26
-21
lines changed

composer.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,29 +35,14 @@
3535
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
3636
"composer/composer": "^1.6",
3737
"elasticsearch/elasticsearch": "~2.0||~5.1||~6.1",
38-
"magento/composer": "~1.5.0",
39-
"magento/magento-composer-installer": ">=0.1.11",
40-
"magento/zendframework1": "~1.14.2",
41-
"monolog/monolog": "^1.17",
42-
"wikimedia/less.php": "~1.8.0",
43-
"paragonie/sodium_compat": "^1.6",
44-
"pelago/emogrifier": "^2.0.0",
45-
"php-amqplib/php-amqplib": "~2.7.0||~2.10.0",
46-
"phpseclib/mcrypt_compat": "1.0.8",
47-
"phpseclib/phpseclib": "2.0.*",
48-
"ramsey/uuid": "~3.8.0",
49-
"symfony/console": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
50-
"symfony/event-dispatcher": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
51-
"symfony/process": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
52-
"tedivm/jshrink": "~1.3.0",
53-
"tubalmartin/cssmin": "4.1.1",
54-
"webonyx/graphql-php": "^0.13.8",
38+
"guzzlehttp/guzzle": "^6.3.3",
5539
"laminas/laminas-captcha": "^2.7.1",
5640
"laminas/laminas-code": "~3.3.0",
5741
"laminas/laminas-config": "^2.6.0",
5842
"laminas/laminas-console": "^2.6.0",
5943
"laminas/laminas-crypt": "^2.6.0",
6044
"laminas/laminas-db": "^2.8.2",
45+
"laminas/laminas-dependency-plugin": "^1.0",
6146
"laminas/laminas-di": "^2.6.1",
6247
"laminas/laminas-eventmanager": "^3.0.0",
6348
"laminas/laminas-feed": "^2.9.0",
@@ -80,8 +65,23 @@
8065
"laminas/laminas-uri": "^2.5.1",
8166
"laminas/laminas-validator": "^2.6.0",
8267
"laminas/laminas-view": "~2.11.2",
83-
"guzzlehttp/guzzle": "^6.3.3",
84-
"laminas/laminas-dependency-plugin": "^1.0"
68+
"magento/composer": "~1.5.0",
69+
"magento/magento-composer-installer": ">=0.1.11",
70+
"magento/zendframework1": "~1.14.2",
71+
"monolog/monolog": "^1.17",
72+
"paragonie/sodium_compat": "^1.6",
73+
"pelago/emogrifier": "^2.0.0",
74+
"php-amqplib/php-amqplib": "~2.7.0||~2.10.0",
75+
"phpseclib/mcrypt_compat": "1.0.8",
76+
"phpseclib/phpseclib": "2.0.*",
77+
"ramsey/uuid": "~3.8.0",
78+
"symfony/console": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
79+
"symfony/event-dispatcher": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
80+
"symfony/process": "~4.1.0||~4.2.0||~4.3.0||~4.4.0",
81+
"tedivm/jshrink": "~1.3.0",
82+
"tubalmartin/cssmin": "4.1.1",
83+
"webonyx/graphql-php": "^0.13.8",
84+
"wikimedia/less.php": "~1.8.0"
8585
},
8686
"require-dev": {
8787
"allure-framework/allure-phpunit": "~1.2.0",

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

setup/src/Magento/Setup/Module.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
use Laminas\Mvc\ModuleRouteListener;
1515
use Laminas\Mvc\MvcEvent;
1616

17+
/**
18+
* Setup module bootstrap class
19+
*/
1720
class Module implements
1821
BootstrapListenerInterface,
1922
ConfigProviderInterface
@@ -63,10 +66,11 @@ public function onBootstrap(EventInterface $e)
6366
}
6467

6568
/**
66-
* {@inheritdoc}
69+
* @inheritDoc
6770
*/
6871
public function getConfig()
6972
{
73+
// phpcs:disable
7074
$result = array_merge_recursive(
7175
include __DIR__ . '/../../../config/module.config.php',
7276
include __DIR__ . '/../../../config/router.config.php',
@@ -82,6 +86,7 @@ public function getConfig()
8286
include __DIR__ . '/../../../config/languages.config.php',
8387
include __DIR__ . '/../../../config/marketplace.config.php'
8488
);
89+
// phpcs:enable
8590
return $result;
8691
}
8792
}

0 commit comments

Comments
 (0)