MAGETWO-95628: Filesystem Directory Improvement

Author: StasKozar

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/UploaderTest.php

@@ -46,6 +46,7 @@ protected function setUp()
         $mediaPath = $appParams[DirectoryList::MEDIA][DirectoryList::PATH];
         $this->directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
         $tmpDir = $this->directory->getRelativePath($mediaPath . '/import');
+        $this->directory->create($tmpDir);
         $this->uploader->setTmpDir($tmpDir);
 
         parent::setUp();
@@ -79,4 +80,18 @@ public function testMoveWithInvalidFile()
 
         $this->assertFalse($this->directory->isExist($this->uploader->getTmpDir() . '/' . $fileName));
     }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tearDownAfterClass()
+    {
+        $filesystem = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Framework\Filesystem::class);
+        /** @var \Magento\Framework\Filesystem\Directory\WriteInterface $directory */
+        $directory = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        if ($directory->isExist('import')) {
+            $directory->delete('import');
+        }
+    }
 }

dev/tests/integration/testsuite/Magento/Framework/App/Filesystem/DirectoryResolverTest.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Framework\App\Filesystem;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -24,9 +25,9 @@ class DirectoryResolverTest extends \PHPUnit_Framework_TestCase
     private $directoryResolver;
 
     /**
-     * @var \Magento\Framework\Filesystem\Directory\WriteInterface
+     * @var \Magento\Framework\Filesystem
      */
-    private $directory;
+    private $filesystem;
 
     /**
      * @inheritdoc
@@ -36,9 +37,7 @@ protected function setUp()
         $this->objectManager = Bootstrap::getObjectManager();
         $this->directoryResolver = $this->objectManager
             ->create(\Magento\Framework\App\Filesystem\DirectoryResolver::class);
-        /** @var \Magento\Framework\Filesystem $filesystem */
-        $filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
-        $this->directory = $filesystem->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
+        $this->filesystem = $this->objectManager->create(\Magento\Framework\Filesystem::class);
     }
 
     /**
@@ -47,10 +46,12 @@ protected function setUp()
      * @param bool $expectation
      * @dataProvider validatePathDataProvider
      * @magentoAppIsolation enabled
+     * @return void
      */
     public function testValidatePath($path, $directoryConfig, $expectation)
     {
-        $path = $this->directory->getAbsolutePath($path);
+        $directory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $path = $directory->getAbsolutePath() .'/' .$path;
         $this->assertEquals($expectation, $this->directoryResolver->validatePath($path, $directoryConfig));
     }
 
@@ -60,7 +61,8 @@ public function testValidatePath($path, $directoryConfig, $expectation)
      */
     public function testValidatePathWithException()
     {
-        $path = $this->directory->getAbsolutePath();
+        $directory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+        $path = $directory->getAbsolutePath();
         $this->directoryResolver->validatePath($path, 'wrong_dir');
     }
 
@@ -76,7 +78,7 @@ public function validatePathDataProvider()
                 true,
             ],
             [
-                 '/../../pub/',
+                '/../../pub/',
                 DirectoryList::MEDIA,
                 false,
             ],

lib/internal/Magento/Framework/Filesystem/Directory/PathValidator.php

@@ -56,7 +56,7 @@ public function validate(
         }
 
         if (mb_strpos($actualPath, $realDirectoryPath) !== 0
-            && $path .DIRECTORY_SEPARATOR !== $realDirectoryPath
+            && $path . DIRECTORY_SEPARATOR !== $realDirectoryPath
         ) {
             throw new ValidatorException(
                 new Phrase(