Skip to content

Commit 1716f16

Browse files
author
Igor Melnikov
committed
MAGETWO-54120: Installation fails
Removing magento-hackathon/magento-composer-installer from replace section
1 parent a27a846 commit 1716f16

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,7 @@
194194
"blueimp/jquery-file-upload": "5.6.14",
195195
"components/jqueryui": "1.10.4",
196196
"twbs/bootstrap": "3.1.0",
197-
"tinymce/tinymce": "3.4.7",
198-
"magento-hackathon/magento-composer-installer": "*"
197+
"tinymce/tinymce": "3.4.7"
199198
},
200199
"extra": {
201200
"component_paths": {

composer.lock

Lines changed: 10 additions & 7 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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,11 +341,7 @@ public function testComponentPathsInRoot()
341341
"The {$component} is specified in 'extra->component_paths', but missing in 'replace' section"
342342
);
343343
}
344-
$allowedMissingComponents = file(__DIR__ . '/_files/blacklist/missing_components.txt');
345344
foreach (array_keys(self::$rootJson['replace']) as $replace) {
346-
if (in_array($replace, $allowedMissingComponents)) {
347-
continue;
348-
}
349345
if (!MagentoComponent::matchMagentoComponent($replace)) {
350346
$this->assertArrayHasKey(
351347
$replace,

dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/missing_components.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)