Skip to content

Commit f55c743

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

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,19 @@ public function collectEntities(array $files)
3737
if (
3838
$forType !== null
3939
&& $replacementType !== null
40-
&& (substr($forType->nodeValue, -19) == 'RepositoryInterface')
40+
&& (substr($forType->nodeValue, -19) === 'RepositoryInterface')
4141
) {
42-
if (!class_exists($replacementType->nodeValue, false)
43-
&& !AutoloaderRegistry::getAutoloader()->loadClass($replacementType->nodeValue)) {
44-
$persistor = str_replace('\\Repository', 'InterfacePersistor', $replacementType->nodeValue);
45-
$factory = str_replace('\\Repository', 'InterfaceFactory', $replacementType->nodeValue);
46-
$searchResultFactory
47-
= str_replace('\\Repository', 'SearchResultInterfaceFactory', $replacementType->nodeValue);
42+
$nodeValue = ltrim($replacementType->nodeValue, '\\');
43+
if (!class_exists($nodeValue, false)
44+
&& !AutoloaderRegistry::getAutoloader()->loadClass($nodeValue)
45+
) {
46+
$persistor = str_replace('\\Repository', 'InterfacePersistor', $nodeValue);
47+
$factory = str_replace('\\Repository', 'InterfaceFactory', $nodeValue);
48+
$searchResultFactory = str_replace('\\Repository', 'SearchResultInterfaceFactory', $nodeValue);
4849
$repositoryClassNames[$persistor] = $persistor;
4950
$repositoryClassNames[$factory] = $factory;
5051
$repositoryClassNames[$searchResultFactory] = $searchResultFactory;
51-
$repositoryClassNames[$replacementType->nodeValue] = $replacementType->nodeValue;
52+
$repositoryClassNames[$nodeValue] = $nodeValue;
5253
}
5354
}
5455
}

0 commit comments

Comments
 (0)