Skip to content

Commit ff4ac7c

Browse files
author
Oleksandr Karpenko
committed
MAGETWO-44017: Exception appears when user opens scheduled import export without installed imort/export
1 parent 7fb9c49 commit ff4ac7c

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

lib/internal/Magento/Framework/Module/DependencyChecker.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ class DependencyChecker
3333
*/
3434
private $graph;
3535

36-
/** @var PackageInfo */
37-
private $packageInfo;
36+
/**
37+
* @var PackageInfo
38+
*/
39+
protected $packageInfo;
3840

3941
/**
4042
* Constructor

lib/internal/Magento/Framework/Module/PackageInfo.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ class PackageInfo
5353
*/
5454
private $componentRegistrar;
5555

56-
/** @var array */
56+
/**
57+
* @var array
58+
*/
5759
protected $nonExistingDependencies = [];
5860

5961
/**
@@ -111,7 +113,7 @@ public function getModuleName($packageName)
111113
$moduleName = null;
112114
if (isset($this->packageModuleMap[$packageName])) {
113115
$moduleName = $this->packageModuleMap[$packageName];
114-
} else if ($this->isInternalPackage($packageName)) {
116+
} elseif ($this->isMagentoPackage($packageName)) {
115117
$moduleName = $this->convertPackageNameToModuleName($packageName);
116118
$this->addNonExistingDependency($moduleName);
117119
}
@@ -122,7 +124,8 @@ public function getModuleName($packageName)
122124
/**
123125
* Add non existing dependency
124126
*
125-
* @param $dependency
127+
* @param string $dependency
128+
* @return void
126129
*/
127130
protected function addNonExistingDependency($dependency)
128131
{
@@ -151,8 +154,7 @@ protected function convertPackageNameToModuleName($packageName)
151154
{
152155
$moduleName = str_replace('magento/module-', '', $packageName);
153156
$moduleName = str_replace('-', ' ', $moduleName);
154-
$moduleName = ucwords($moduleName);
155-
$moduleName = str_replace(' ', '', $moduleName);
157+
$moduleName = str_replace(' ', '', ucwords($moduleName));
156158

157159
return 'Magento_' . $moduleName;
158160
}
@@ -163,7 +165,7 @@ protected function convertPackageNameToModuleName($packageName)
163165
* @param string $packageName
164166
* @return bool
165167
*/
166-
protected function isInternalPackage($packageName)
168+
protected function isMagentoPackage($packageName)
167169
{
168170
return strpos($packageName, 'magento/module-') === 0;
169171
}

0 commit comments

Comments
 (0)