MAGETWO-95628: Filesystem Directory Improvement

Author: StasKozar

dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/ReadTest.php

@@ -46,7 +46,7 @@ public function testGetAbsolutePathOutside($path)
     {
         $dir = $this->getDirectoryInstance('foo');
 
-        $dir->getAbsolutePath($path);
+        $dir->getAbsolutePath($path . '/ReadTest.php');
     }
 
     /**
@@ -55,9 +55,9 @@ public function testGetAbsolutePathOutside($path)
     public function pathDataProvider()
     {
         return [
-            ['../../Directory/ReadTest.php'],
-            ['//./..///../Directory/ReadTest.php'],
-            ['\..\..\Directory\ReadTest.php'],
+            ['../../Directory'],
+            ['//./..///../Directory'],
+            ['\..\..\Directory'],
         ];
     }
 
@@ -83,7 +83,7 @@ public function testGetRelativePathOutside($path)
     {
         $dir = $this->getDirectoryInstance('foo');
 
-        $dir->getRelativePath(__DIR__ . $path);
+        $dir->getRelativePath(__DIR__ . $path . '/ReadTest.php');
     }
 
     /**
@@ -128,7 +128,7 @@ public function testReadOutside($path)
     {
         $dir = $this->getDirectoryInstance('foo');
 
-        $dir->read($path);
+        $dir->read($path . '/ReadTest.php');
     }
 
     /**
@@ -173,7 +173,7 @@ public function testSearchOutside($path)
     {
         $dir = $this->getDirectoryInstance('foo');
 
-        $dir->search('/*/*.txt', $path);
+        $dir->search('/*/*.txt', $path . '/ReadTest.php');
     }
 
     /**
@@ -211,7 +211,7 @@ public function testIsExistOutside($path)
     {
         $dir = $this->getDirectoryInstance('foo');
 
-        $dir->isExist($path);
+        $dir->isExist($path . '/ReadTest.php');
     }
 
     /**
@@ -294,7 +294,7 @@ public function testIsReadableOutside($path)
     {
         $dir = $this->getDirectoryInstance('foo');
 
-        $dir->isReadable($path);
+        $dir->isReadable($path . '/ReadTest.php');
     }
 
     /**
@@ -320,7 +320,7 @@ public function testIsFileOutside($path)
     {
         $dir = $this->getDirectoryInstance('foo');
 
-        $dir->isFile($path);
+        $dir->isFile($path . '/ReadTest.php');
     }
 
     /**
@@ -346,7 +346,7 @@ public function testIsDirectoryOutside($path)
     {
         $dir = $this->getDirectoryInstance('foo');
 
-        $dir->isDirectory($path);
+        $dir->isDirectory($path . '/ReadTest.php');
     }
 
     /**
@@ -400,7 +400,7 @@ public function testOpenFileOutside($path)
     {
         $dir = $this->getDirectoryInstance('foo');
 
-        $dir->openFile($path);
+        $dir->openFile($path . '/ReadTest.php');
     }
 
     /**
@@ -443,7 +443,7 @@ public function testReadFileOutside($path)
     {
         $dir = $this->getDirectoryInstance('foo');
 
-        $dir->readFile($path);
+        $dir->readFile($path . '/ReadTest.php');
     }
 
     /**

dev/tests/integration/testsuite/Magento/Framework/Filesystem/Directory/WriteTest.php

@@ -65,29 +65,17 @@ public function createProvider()
     }
 
     /**
+     * @param string $path
+     *
      * @return void
+     * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @dataProvider pathDataProvider
      */
-    public function testCreateOutside()
+    public function testCreateOutside($path)
     {
-        $exceptions = 0;
         $dir = $this->getDirectoryInstance('newDir1', 0777);
-        try {
-            $dir->create('../../outsideDir');
-        } catch (ValidatorException $exception) {
-            $exceptions++;
-        }
-        try {
-            $dir->create('//./..///../outsideDir');
-        } catch (ValidatorException $exception) {
-            $exceptions++;
-        }
-        try {
-            $dir->create('\..\..\outsideDir');
-        } catch (ValidatorException $exception) {
-            $exceptions++;
-        }
 
-        $this->assertEquals(3, $exceptions);
+        $dir->create($path);
     }
 
     /**

lib/internal/Magento/Framework/Filesystem/Driver/File.php

@@ -939,7 +939,7 @@ public function getRealPathSafety($path)
 
         //Removing redundant directory separators.
         $path = preg_replace(
-            '/\\' . DIRECTORY_SEPARATOR .'\\' . DIRECTORY_SEPARATOR .'+/',
+            '/\\' . DIRECTORY_SEPARATOR . '\\' . DIRECTORY_SEPARATOR . '+/',
             DIRECTORY_SEPARATOR,
             $path
         );

lib/internal/Magento/Framework/Test/Unit/Filesystem/Directory/PathValidatorTest.php

@@ -79,6 +79,7 @@ public function testValidateWithoutAbsolutePath()
     /**
      * @return void
      * @expectedException \Magento\Framework\Exception\ValidatorException
+     * @expectedExceptionMessageRegExp /^Path ".+/static/testFile.txt" cannot be used with directory ".+/pub/static/"$/
      */
     public function testValidateWithWrongPath()
     {