Skip to content

Commit 5049ee1

Browse files
committed
MC-14917: Update Symfony components to 4.4LTS for 2.4.x
- fix after CR
1 parent 5e9ef73 commit 5049ee1

File tree

3 files changed

+37
-33
lines changed

3 files changed

+37
-33
lines changed

composer.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
"preferred-install": "dist",
1111
"sort-packages": true
1212
},
13+
"repositories": [
14+
{
15+
"type": "git",
16+
"url": "https://github.com/magento/composer"
17+
}
18+
],
1319
"require": {
1420
"php": "~7.1.3||~7.2.0||~7.3.0",
1521
"ext-bcmath": "*",
@@ -35,7 +41,7 @@
3541
"colinmollenhour/php-redis-session-abstract": "~1.4.0",
3642
"composer/composer": "^1.6",
3743
"elasticsearch/elasticsearch": "~2.0||~5.1||~6.1",
38-
"magento/composer": "~1.5.0",
44+
"magento/composer": "1.6.x-dev",
3945
"magento/magento-composer-installer": ">=0.1.11",
4046
"magento/zendframework1": "~1.14.2",
4147
"monolog/monolog": "^1.17",

composer.lock

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

dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class ComposerTest extends \PHPUnit\Framework\TestCase
4848
/**
4949
* @var string
5050
*/
51-
private static $magentoFrameworkLibaryName = 'magento/framework';
51+
private static $magentoFrameworkLibraryName = 'magento/framework';
5252

5353
public static function setUpBeforeClass()
5454
{
@@ -317,9 +317,9 @@ private function assertDependsOnPhp(\StdClass $json)
317317
private function assertDependsOnFramework(\StdClass $json)
318318
{
319319
$this->assertObjectHasAttribute(
320-
self::$magentoFrameworkLibaryName,
320+
self::$magentoFrameworkLibraryName,
321321
$json,
322-
'This component is expected to depend on ' . self::$magentoFrameworkLibaryName
322+
'This component is expected to depend on ' . self::$magentoFrameworkLibraryName
323323
);
324324
}
325325

@@ -516,11 +516,11 @@ public function testConsistencyOfDeclarationsInComposerFiles()
516516
}
517517

518518
$componentRegistrar = new ComponentRegistrar();
519-
$magentoFrameworkLibaryDir =
520-
$componentRegistrar->getPath(ComponentRegistrar::LIBRARY, self::$magentoFrameworkLibaryName);
519+
$magentoFrameworkLibraryDir =
520+
$componentRegistrar->getPath(ComponentRegistrar::LIBRARY, self::$magentoFrameworkLibraryName);
521521
$magentoFrameworkComposerFile =
522522
json_decode(
523-
file_get_contents($magentoFrameworkLibaryDir . DIRECTORY_SEPARATOR . 'composer.json'),
523+
file_get_contents($magentoFrameworkLibraryDir . DIRECTORY_SEPARATOR . 'composer.json'),
524524
true
525525
);
526526

@@ -536,7 +536,7 @@ public function testConsistencyOfDeclarationsInComposerFiles()
536536
$this->assertEmpty(
537537
$inconsistentDependencies,
538538
'There is a discrepancy between the declared versions of the following modules in "'
539-
. self::$magentoFrameworkLibaryName . '" and the root composer.json: '
539+
. self::$magentoFrameworkLibraryName . '" and the root composer.json: '
540540
. implode(', ', $inconsistentDependencies)
541541
);
542542
}

0 commit comments

Comments
 (0)