Skip to content

Commit b11309c

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 2e46363 commit b11309c

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

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

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Magento\Framework\Config\Composer\Package;
1313
use Magento\Framework\Config\Composer\PackageFactory;
1414
use Magento\Framework\Filesystem;
15+
use Magento\Framework\Filesystem\Directory\ReadInterfaceFactory;
1516

1617
/**
1718
* Sample Data dependency
@@ -39,32 +40,32 @@ class Dependency
3940
private $componentRegistrar;
4041

4142
/**
42-
* @var Filesystem\Directory\ReadInterfaceFactory
43+
* @var ReadInterfaceFactory
4344
*/
4445
private $directoryReadFactory;
4546

4647
/**
48+
* Initialize dependencies.
49+
*
4750
* @param ComposerInformation $composerInformation
4851
* @param Filesystem $filesystem @deprecated 2.3.0 $directoryReadFactory is used instead
4952
* @param PackageFactory $packageFactory
5053
* @param ComponentRegistrarInterface $componentRegistrar
51-
* @param Filesystem\Directory\ReadInterfaceFactory $directoryReadFactory
52-
* @throws \RuntimeException
54+
* @param Filesystem\Directory\ReadInterfaceFactory|null $directoryReadFactory
5355
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
5456
*/
5557
public function __construct(
5658
ComposerInformation $composerInformation,
57-
Filesystem $filesystem, // $filesystem kept for BC
59+
Filesystem $filesystem,
5860
PackageFactory $packageFactory,
5961
ComponentRegistrarInterface $componentRegistrar,
60-
Filesystem\Directory\ReadInterfaceFactory $directoryReadFactory = null
62+
\Magento\Framework\Filesystem\Directory\ReadInterfaceFactory $directoryReadFactory = null
6163
) {
6264
$this->composerInformation = $composerInformation;
6365
$this->packageFactory = $packageFactory;
6466
$this->componentRegistrar = $componentRegistrar;
65-
$this->directoryReadFactory = $directoryReadFactory ?: ObjectManager::getInstance()->get(
66-
Filesystem\Directory\ReadInterfaceFactory::class
67-
);
67+
$this->directoryReadFactory = $directoryReadFactory ?:
68+
ObjectManager::getInstance()->get(ReadInterfaceFactory::class);
6869
}
6970

7071
/**

0 commit comments

Comments
 (0)