Skip to content

Commit 53d60ac

Browse files
author
Sergey Shvets
committed
MAGETWO-61188: error when installing 2.0 when using deploy:mode:set production
1 parent f55c743 commit 53d60ac

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

app/code/Magento/Catalog/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@
448448
<preference for="Magento\Catalog\Api\ProductWebsiteLinkRepositoryInterface" type="Magento\Catalog\Model\ProductWebsiteLinkRepository" />
449449
<preference for="\Magento\Catalog\Api\CategoryLinkRepositoryInterface" type="\Magento\Catalog\Model\CategoryLinkRepository" />
450450
<preference for="Magento\Catalog\Api\Data\ProductCustomOptionInterface" type="Magento\Catalog\Model\Product\Option" />
451-
<preference for="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface" type="\Magento\Catalog\Model\Product\Option\Repository" />
451+
<preference for="Magento\Catalog\Api\ProductCustomOptionRepositoryInterface" type="Magento\Catalog\Model\Product\Option\Repository" />
452452
<preference for="Magento\Catalog\Api\Data\ProductCustomOptionTypeInterface" type="Magento\Catalog\Model\Product\Option\Type" />
453453
<preference for="Magento\Catalog\Api\ProductTierPriceManagementInterface" type="\Magento\Catalog\Model\Product\TierPriceManagement" />
454454
<preference for="Magento\Catalog\Api\Data\ProductTierPriceInterface" type="Magento\Catalog\Model\Product\TierPrice" />

setup/src/Magento/Setup/Module/Di/Code/Scanner/RepositoryScanner.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © 2016 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Setup\Module\Di\Code\Scanner;
78

89
use Magento\Framework\Autoload\AutoloaderRegistry;
@@ -39,6 +40,8 @@ public function collectEntities(array $files)
3940
&& $replacementType !== null
4041
&& (substr($forType->nodeValue, -19) === 'RepositoryInterface')
4142
) {
43+
// backward compatibility workaround for composer below 1.3.0
44+
// (https://github.com/composer/composer/issues/5923)
4245
$nodeValue = ltrim($replacementType->nodeValue, '\\');
4346
if (!class_exists($nodeValue, false)
4447
&& !AutoloaderRegistry::getAutoloader()->loadClass($nodeValue)

0 commit comments

Comments
 (0)