Skip to content
Snippets Groups Projects
Commit ff4ac7c5 authored by Oleksandr Karpenko's avatar Oleksandr Karpenko
Browse files

MAGETWO-44017: Exception appears when user opens scheduled import export...

MAGETWO-44017: Exception appears when user opens scheduled import export without installed imort/export
parent 7fb9c49b
Branches
No related merge requests found
...@@ -33,8 +33,10 @@ class DependencyChecker ...@@ -33,8 +33,10 @@ class DependencyChecker
*/ */
private $graph; private $graph;
/** @var PackageInfo */ /**
private $packageInfo; * @var PackageInfo
*/
protected $packageInfo;
/** /**
* Constructor * Constructor
......
...@@ -53,7 +53,9 @@ class PackageInfo ...@@ -53,7 +53,9 @@ class PackageInfo
*/ */
private $componentRegistrar; private $componentRegistrar;
/** @var array */ /**
* @var array
*/
protected $nonExistingDependencies = []; protected $nonExistingDependencies = [];
/** /**
...@@ -111,7 +113,7 @@ class PackageInfo ...@@ -111,7 +113,7 @@ class PackageInfo
$moduleName = null; $moduleName = null;
if (isset($this->packageModuleMap[$packageName])) { if (isset($this->packageModuleMap[$packageName])) {
$moduleName = $this->packageModuleMap[$packageName]; $moduleName = $this->packageModuleMap[$packageName];
} else if ($this->isInternalPackage($packageName)) { } elseif ($this->isMagentoPackage($packageName)) {
$moduleName = $this->convertPackageNameToModuleName($packageName); $moduleName = $this->convertPackageNameToModuleName($packageName);
$this->addNonExistingDependency($moduleName); $this->addNonExistingDependency($moduleName);
} }
...@@ -122,7 +124,8 @@ class PackageInfo ...@@ -122,7 +124,8 @@ class PackageInfo
/** /**
* Add non existing dependency * Add non existing dependency
* *
* @param $dependency * @param string $dependency
* @return void
*/ */
protected function addNonExistingDependency($dependency) protected function addNonExistingDependency($dependency)
{ {
...@@ -151,8 +154,7 @@ class PackageInfo ...@@ -151,8 +154,7 @@ class PackageInfo
{ {
$moduleName = str_replace('magento/module-', '', $packageName); $moduleName = str_replace('magento/module-', '', $packageName);
$moduleName = str_replace('-', ' ', $moduleName); $moduleName = str_replace('-', ' ', $moduleName);
$moduleName = ucwords($moduleName); $moduleName = str_replace(' ', '', ucwords($moduleName));
$moduleName = str_replace(' ', '', $moduleName);
return 'Magento_' . $moduleName; return 'Magento_' . $moduleName;
} }
...@@ -163,7 +165,7 @@ class PackageInfo ...@@ -163,7 +165,7 @@ class PackageInfo
* @param string $packageName * @param string $packageName
* @return bool * @return bool
*/ */
protected function isInternalPackage($packageName) protected function isMagentoPackage($packageName)
{ {
return strpos($packageName, 'magento/module-') === 0; return strpos($packageName, 'magento/module-') === 0;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment