MAGETWO-87646: Fixed fatal error on "magento sampledata:deploy" when magento is not installed. #13571

Oleksii Korshenko · web-flow · commit 711c95a57be4 · 2018-02-15T12:04:18.000-06:00
diff --git a/app/code/Magento/SampleData/Model/Dependency.php b/app/code/Magento/SampleData/Model/Dependency.php
@@ -12,7 +12,7 @@
 use Magento\Framework\Config\Composer\Package;
 use Magento\Framework\Config\Composer\PackageFactory;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\ReadInterfaceFactory;
+use Magento\Framework\Filesystem\Directory\ReadFactory;
 
 /**
  * Sample Data dependency
@@ -40,7 +40,7 @@ class Dependency
     private $componentRegistrar;
 
     /**
-     * @var ReadInterfaceFactory
+     * @var ReadFactory
      */
     private $directoryReadFactory;
 
@@ -51,21 +51,21 @@ class Dependency
      * @param Filesystem $filesystem @deprecated 2.3.0 $directoryReadFactory is used instead
      * @param PackageFactory $packageFactory
      * @param ComponentRegistrarInterface $componentRegistrar
-     * @param Filesystem\Directory\ReadInterfaceFactory|null $directoryReadFactory
+     * @param Filesystem\Directory\ReadFactory|null $directoryReadFactory
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ComposerInformation $composerInformation,
         Filesystem $filesystem,
         PackageFactory $packageFactory,
         ComponentRegistrarInterface $componentRegistrar,
-        \Magento\Framework\Filesystem\Directory\ReadInterfaceFactory $directoryReadFactory = null
+        \Magento\Framework\Filesystem\Directory\ReadFactory $directoryReadFactory = null
     ) {
         $this->composerInformation = $composerInformation;
         $this->packageFactory = $packageFactory;
         $this->componentRegistrar = $componentRegistrar;
         $this->directoryReadFactory = $directoryReadFactory ?:
-            ObjectManager::getInstance()->get(ReadInterfaceFactory::class);
+            ObjectManager::getInstance()->get(ReadFactory::class);
     }
 
     /**
@@ -123,7 +123,7 @@ private function getModuleComposerPackage($moduleDir)
          */
         foreach ([$moduleDir, $moduleDir . DIRECTORY_SEPARATOR . '..'] as $dir) {
             /** @var Filesystem\Directory\ReadInterface $directory */
-            $directory = $this->directoryReadFactory->create(['path' => $dir]);
+            $directory = $this->directoryReadFactory->create($dir);
             if ($directory->isExist('composer.json') && $directory->isReadable('composer.json')) {
                 /** @var Package $package */
                 return $this->packageFactory->create(['json' => json_decode($directory->readFile('composer.json'))]);
diff --git a/app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php b/app/code/Magento/SampleData/Test/Unit/Model/DependencyTest.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Phrase;
 use Magento\SampleData\Model\Dependency;
+use Magento\Framework\Filesystem\DriverPool;
 
 class DependencyTest extends \PHPUnit\Framework\TestCase
 {
@@ -59,7 +60,7 @@ public function testPackagesFromComposerSuggest(
                 $moduleDirectories
             );
 
-        $directoryReadFactory = $this->getMockBuilder(Filesystem\Directory\ReadInterfaceFactory::class)
+        $directoryReadFactory = $this->getMockBuilder(Filesystem\Directory\ReadFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
@@ -88,7 +89,8 @@ public static function dataPackagesFromComposerSuggest()
                 'composerJsonGenerator' => function (DependencyTest $test) {
                     return [
                         [
-                            ['path' => 'app/code/LocalModule'],
+                            'app/code/LocalModule',
+                            DriverPool::FILE,
                             $test->stubComposerJsonReader(
                                 [
                                     'name' => 'local/module',
@@ -99,11 +101,13 @@ public static function dataPackagesFromComposerSuggest()
                             )
                         ],
                         [
-                            ['path' => 'app/code/LocalModuleWithoutComposerJson'],
+                            'app/code/LocalModuleWithoutComposerJson',
+                            DriverPool::FILE,
                             $test->stubFileNotFoundReader()
                         ],
                         [
-                            ['path' => 'vendor/company/module'],
+                            'vendor/company/module',
+                            DriverPool::FILE,
                             $test->stubComposerJsonReader(
                                 [
                                     'name' => 'company/module',
@@ -114,7 +118,8 @@ public static function dataPackagesFromComposerSuggest()
                             )
                         ],
                         [
-                            ['path' => 'vendor/company2/module/src/..'],
+                            'vendor/company2/module/src/..',
+                            DriverPool::FILE,
                             $test->stubComposerJsonReader(
                                 [
                                     'name' => 'company2/module',
@@ -125,19 +130,23 @@ public static function dataPackagesFromComposerSuggest()
                             )
                         ],
                         [
-                            ['path' => 'vendor/company2/module/src'],
+                            'vendor/company2/module/src',
+                            DriverPool::FILE,
                             $test->stubFileNotFoundReader()
                         ],
                         [
-                            ['path' => 'vendor/company/module/..'],
+                            'vendor/company/module/..',
+                            DriverPool::FILE,
                             $test->stubFileNotFoundReader()
                         ],
                         [
-                            ['path' => 'app/code/LocalModuleWithoutComposerJson/..'],
+                            'app/code/LocalModuleWithoutComposerJson/..',
+                            DriverPool::FILE,
                             $test->stubFileNotFoundReader()
                         ],
                         [
-                            ['path' => 'app/code/LocalModule/..'],
+                            'app/code/LocalModule/..',
+                            DriverPool::FILE,
                             $test->stubFileNotFoundReader()
                         ],
                     ];
diff --git a/app/code/Magento/SampleData/etc/di.xml b/app/code/Magento/SampleData/etc/di.xml
@@ -15,10 +15,4 @@
             </argument>
         </arguments>
     </type>
-    <virtualType name="Magento\SampleData\Filesystem\Directory\Read" type="Magento\Framework\Filesystem\Directory\Read">
-        <arguments>
-            <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
-        </arguments>
-    </virtualType>
-    <preference for="Magento\Framework\Filesystem\Directory\ReadInterface" type="Magento\SampleData\Filesystem\Directory\Read" />
 </config>

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`use Magento\Framework\Filesystem;`
`15`	`15`	`use Magento\Framework\Phrase;`
`16`	`16`	`use Magento\SampleData\Model\Dependency;`
	`17`	`+use Magento\Framework\Filesystem\DriverPool;`
`17`	`18`
`18`	`19`	`class DependencyTest extends \PHPUnit\Framework\TestCase`
`19`	`20`	`{`
`@@ -59,7 +60,7 @@ public function testPackagesFromComposerSuggest(`
`59`	`60`	`$moduleDirectories`
`60`	`61`	`);`
`61`	`62`
`62`		`- $directoryReadFactory = $this->getMockBuilder(Filesystem\Directory\ReadInterfaceFactory::class)`
	`63`	`+ $directoryReadFactory = $this->getMockBuilder(Filesystem\Directory\ReadFactory::class)`
`63`	`64`	`->disableOriginalConstructor()`
`64`	`65`	`->setMethods(['create'])`
`65`	`66`	`->getMock();`
`@@ -88,7 +89,8 @@ public static function dataPackagesFromComposerSuggest()`
`88`	`89`	`'composerJsonGenerator' => function (DependencyTest $test) {`
`89`	`90`	`return [`
`90`	`91`	`[`
`91`		`- ['path' => 'app/code/LocalModule'],`
	`92`	`+ 'app/code/LocalModule',`
	`93`	`+ DriverPool::FILE,`
`92`	`94`	`$test->stubComposerJsonReader(`
`93`	`95`	`[`
`94`	`96`	`'name' => 'local/module',`
`@@ -99,11 +101,13 @@ public static function dataPackagesFromComposerSuggest()`
`99`	`101`	`)`
`100`	`102`	`],`
`101`	`103`	`[`
`102`		`- ['path' => 'app/code/LocalModuleWithoutComposerJson'],`
	`104`	`+ 'app/code/LocalModuleWithoutComposerJson',`
	`105`	`+ DriverPool::FILE,`
`103`	`106`	`$test->stubFileNotFoundReader()`
`104`	`107`	`],`
`105`	`108`	`[`
`106`		`- ['path' => 'vendor/company/module'],`
	`109`	`+ 'vendor/company/module',`
	`110`	`+ DriverPool::FILE,`
`107`	`111`	`$test->stubComposerJsonReader(`
`108`	`112`	`[`
`109`	`113`	`'name' => 'company/module',`
`@@ -114,7 +118,8 @@ public static function dataPackagesFromComposerSuggest()`
`114`	`118`	`)`
`115`	`119`	`],`
`116`	`120`	`[`
`117`		`- ['path' => 'vendor/company2/module/src/..'],`
	`121`	`+ 'vendor/company2/module/src/..',`
	`122`	`+ DriverPool::FILE,`
`118`	`123`	`$test->stubComposerJsonReader(`
`119`	`124`	`[`
`120`	`125`	`'name' => 'company2/module',`
`@@ -125,19 +130,23 @@ public static function dataPackagesFromComposerSuggest()`
`125`	`130`	`)`
`126`	`131`	`],`
`127`	`132`	`[`
`128`		`- ['path' => 'vendor/company2/module/src'],`
	`133`	`+ 'vendor/company2/module/src',`
	`134`	`+ DriverPool::FILE,`
`129`	`135`	`$test->stubFileNotFoundReader()`
`130`	`136`	`],`
`131`	`137`	`[`
`132`		`- ['path' => 'vendor/company/module/..'],`
	`138`	`+ 'vendor/company/module/..',`
	`139`	`+ DriverPool::FILE,`
`133`	`140`	`$test->stubFileNotFoundReader()`
`134`	`141`	`],`
`135`	`142`	`[`
`136`		`- ['path' => 'app/code/LocalModuleWithoutComposerJson/..'],`
	`143`	`+ 'app/code/LocalModuleWithoutComposerJson/..',`
	`144`	`+ DriverPool::FILE,`
`137`	`145`	`$test->stubFileNotFoundReader()`
`138`	`146`	`],`
`139`	`147`	`[`
`140`		`- ['path' => 'app/code/LocalModule/..'],`
	`148`	`+ 'app/code/LocalModule/..',`
	`149`	`+ DriverPool::FILE,`
`141`	`150`	`$test->stubFileNotFoundReader()`
`142`	`151`	`],`
`143`	`152`	`];`