merged branch SamsonIT/remove_symlink_on_windows (PR #4565)

fabpot · fabpot · commit c07e9163a6ed · 2012-06-13T16:41:41.000+02:00
Commits ------- fc3ebb8 [FileSystem] added if-windows check 0b58828 [FileSystem] remove symlinks under windows Discussion ---------- [FileSystem] remove symlinks under windows Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes When installing assets on Windows with symlink, the following error occurs when symlink-folders already exist. This PR makes sure symlink-folders are removed under Windows. ``` $ app/console assets:install web --symlink Installing assets using the symlink option Installing assets for Symfony\Bundle\FrameworkBundle into web/bundles/framework [ErrorException] Warning: symlink(): Cannot create symlink, error code(1314) in C:\workspace\erik\roompot\vendor\symfony\symfony\src\Symfony\Component\Filesystem\Filesystem.php line 167 assets:install [--symlink] [--relative] target ``` --------------------------------------------------------------------------- by travisbot at 2012-06-13T09:00:42Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1608541) (merged 0b58828 into 37550d2). --------------------------------------------------------------------------- by travisbot at 2012-06-13T14:39:32Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1611288) (merged fc3ebb8 into 0f67ca8).
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -97,7 +97,12 @@ public function remove($files)
 
                 rmdir($file);
             } else {
-                unlink($file);
+                // https://bugs.php.net/bug.php?id=52176
+                if (defined('PHP_WINDOWS_VERSION_MAJOR') && is_dir($file)) {
+                    rmdir($file);
+                } else {
+                    unlink($file);
+                }
             }
         }
     }
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -421,6 +421,20 @@ public function testSymlink()
         $this->assertTrue(is_link($link));
         $this->assertEquals($file, readlink($link));
     }
+    
+    /**
+     * @depends testSymlink 
+     */
+    public function testRemoveSymlink()
+    {
+        $this->markAsSkippedIfSymlinkIsMissing();
+        
+        $link = $this->workspace.DIRECTORY_SEPARATOR.'link';
+        
+        $this->filesystem->remove($link);
+        
+        $this->assertTrue(!is_link($link));
+    }
 
     public function testSymlinkIsOverwrittenIfPointsToDifferentTarget()
     {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,12 @@ public function remove($files)`
`97`	`97`
`98`	`98`	`rmdir($file);`
`99`	`99`	`} else {`
`100`		`- unlink($file);`
	`100`	`+ // https://bugs.php.net/bug.php?id=52176`
	`101`	`+ if (defined('PHP_WINDOWS_VERSION_MAJOR') && is_dir($file)) {`
	`102`	`+ rmdir($file);`
	`103`	`+ } else {`
	`104`	`+ unlink($file);`
	`105`	`+ }`
`101`	`106`	`}`
`102`	`107`	`}`
`103`	`108`	`}`