Skip to content

Commit 2e46363

Browse files
author
Oleksii Korshenko
committed
MAGETWO-70798: Fall back to parent directory if composer.json not found in module directory #8990
- fixed code style
1 parent 5dfd1d3 commit 2e46363

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

app/code/Magento/SampleData/Model/Dependency.php

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,33 +43,29 @@ class Dependency
4343
*/
4444
private $directoryReadFactory;
4545

46-
//@codingStandardsIgnoreStart
4746
/**
4847
* @param ComposerInformation $composerInformation
49-
* @param Filesystem $filesystem
48+
* @param Filesystem $filesystem @deprecated 2.3.0 $directoryReadFactory is used instead
5049
* @param PackageFactory $packageFactory
5150
* @param ComponentRegistrarInterface $componentRegistrar
5251
* @param Filesystem\Directory\ReadInterfaceFactory $directoryReadFactory
5352
* @throws \RuntimeException
53+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
5454
*/
5555
public function __construct(
5656
ComposerInformation $composerInformation,
57-
// $filesystem kept for BC
58-
Filesystem $filesystem,
57+
Filesystem $filesystem, // $filesystem kept for BC
5958
PackageFactory $packageFactory,
6059
ComponentRegistrarInterface $componentRegistrar,
61-
// $directoryReadFactory optional for BC
6260
Filesystem\Directory\ReadInterfaceFactory $directoryReadFactory = null
6361
) {
6462
$this->composerInformation = $composerInformation;
6563
$this->packageFactory = $packageFactory;
6664
$this->componentRegistrar = $componentRegistrar;
67-
if ($directoryReadFactory === null) {
68-
$directoryReadFactory = ObjectManager::getInstance()->get(Filesystem\Directory\ReadInterfaceFactory::class);
69-
}
70-
$this->directoryReadFactory = $directoryReadFactory;
65+
$this->directoryReadFactory = $directoryReadFactory ?: ObjectManager::getInstance()->get(
66+
Filesystem\Directory\ReadInterfaceFactory::class
67+
);
7168
}
72-
//@codingStandardsIgnoreEnd
7369

7470
/**
7571
* Retrieve list of sample data packages from suggests

0 commit comments

Comments
 (0)