Merge remote-tracking branch 'origin/MAGETWO-94154' into 2.2-develop-pr4

Author: yelahin-serhiy

dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php

@@ -9,23 +9,29 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 class FileTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Framework\Filesystem\Driver\File
+     * @var File
      */
-    protected $driver;
+    private $driver;
 
     /**
-     * @var string
+     * @var String
      */
-    protected $absolutePath;
+    private $absolutePath;
 
     /**
-     * get relative path for test
+     * @var String
+     */
+    private $generatedPath;
+
+    /**
+     * Returns relative path for the test.
      *
      * @param $relativePath
      * @return string
@@ -36,16 +42,26 @@ protected function getTestPath($relativePath)
     }
 
     /**
-     * Set up
+     * @inheritdoc
      */
     public function setUp()
     {
-        $this->driver = new \Magento\Framework\Filesystem\Driver\File();
+        $this->driver = new File();
         $this->absolutePath = dirname(__DIR__) . '/_files/';
+        $this->generatedPath = $this->getTestPath('generated');
+        $this->removeGeneratedDirectory();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        $this->removeGeneratedDirectory();
     }
 
     /**
-     * test read recursively read
+     * Tests directory recursive read.
      */
     public function testReadDirectoryRecursively()
     {
@@ -63,7 +79,7 @@ public function testReadDirectoryRecursively()
     }
 
     /**
-     * test exception
+     * Tests directory reading exception.
      *
      * @expectedException \Magento\Framework\Exception\FileSystemException
      */
@@ -72,6 +88,11 @@ public function testReadDirectoryRecursivelyFailure()
         $this->driver->readDirectoryRecursively($this->getTestPath('not-existing-directory'));
     }
 
+    /**
+     * Tests of directory creating.
+     *
+     * @throws FileSystemException
+     */
     public function testCreateDirectory()
     {
         $generatedPath = $this->getTestPath('generated/roo/bar/baz/foo');
@@ -123,4 +144,39 @@ public function createFileDataProvider()
             ]
         ];
     }
+
+    /**
+     * Tests creation and removing of symlinks.
+     *
+     * @throws FileSystemException
+     * @return void
+     */
+    public function testSymlinks()
+    {
+        $sourceDirectory = $this->generatedPath . '/source';
+        $destinationDirectory = $this->generatedPath . '/destination';
+
+        $this->driver->createDirectory($sourceDirectory);
+        $this->driver->createDirectory($destinationDirectory);
+
+        $linkName = $destinationDirectory . '/link';
+
+        self::assertTrue($this->driver->isWritable($destinationDirectory));
+        self::assertTrue($this->driver->symlink($sourceDirectory, $linkName));
+        self::assertTrue($this->driver->isExists($linkName));
+        self::assertTrue($this->driver->deleteDirectory($linkName));
+    }
+
+    /**
+     * Remove generated directories.
+     *
+     * @throws FileSystemException
+     * @return void
+     */
+    private function removeGeneratedDirectory()
+    {
+        if (is_dir($this->generatedPath)) {
+            $this->driver->deleteDirectory($this->generatedPath);
+        }
+    }
 }

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

@@ -13,6 +13,7 @@
 
 /**
  * Class File
+ *
  * @package Magento\Framework\Filesystem\Driver
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
@@ -405,7 +406,14 @@ public function deleteDirectory($path)
                 $this->deleteFile($entity->getPathname());
             }
         }
-        $result = @rmdir($this->getScheme() . $path);
+
+        $fullPath = $this->getScheme() . $path;
+        if (is_link($fullPath)) {
+            $result = @unlink($fullPath);
+        } else {
+            $result = @rmdir($fullPath);
+        }
+
         if (!$result) {
             throw new FileSystemException(
                 new \Magento\Framework\Phrase(
@@ -836,6 +844,8 @@ public function fileUnlock($resource)
     }
 
     /**
+     * Returns an absolute path for the given one.
+     *
      * @param string $basePath
      * @param string $path
      * @param string|null $scheme
@@ -872,7 +882,8 @@ public function getRelativePath($basePath, $path = null)
     }
 
     /**
-     * Fixes path separator
+     * Fixes path separator.
+     *
      * Utility method.
      *
      * @param string $path