[FileSystem] throwing runtimexception when creation of symlink fails due to an error

Erik Trapman · Erik Trapman · commit d0d848f86436 · 2012-06-14T15:17:48.000+02:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -149,7 +149,7 @@ public function rename($origin, $target)
      * @param string  $targetDir     The symbolic link name
      * @param Boolean $copyOnWindows Whether to copy files if on Windows
      *
-     * @throws \RuntimeException When creation of symlink raises an error
+     * @throws \RuntimeException When creation of symlink raises an error that should not be suppressed
      */
     public function symlink($originDir, $targetDir, $copyOnWindows = false)
     {
@@ -171,13 +171,14 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)
         }
 
         if (!$ok) {
-            try {
-                symlink($originDir, $targetDir);
-            } catch (\ErrorException $e) {
-                if (defined('PHP_WINDOWS_VERSION_MAJOR') && false !== strpos($e->getMessage(), 'error code(1314)')) {
-                    throw new \RuntimeException("Unable to create symlink due to error code 1314: A required privilege is not held by the client. Do you have the required Administrator-rights?");
+            if (false === @symlink($originDir, $targetDir)) {
+                $report = error_get_last();
+                if (is_array($report) && $report['type'] & error_reporting()) {
+                    if (defined('PHP_WINDOWS_VERSION_MAJOR') && false !== strpos($report['message'], 'error code(1314)')) {
+                        throw new \RuntimeException('Unable to create symlink due to error code 1314: \'A required privilege is not held by the client\'. Do you have the required Administrator-rights?');
+                    }
+                    throw new \RuntimeException(sprintf("%s in %s line %s", $report['message'], $report['file'], $report['line']));
                 }
-                throw $e;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public function rename($origin, $target)`
`149`	`149`	`* @param string $targetDir The symbolic link name`
`150`	`150`	`* @param Boolean $copyOnWindows Whether to copy files if on Windows`
`151`	`151`	`*`
`152`		`- * @throws \RuntimeException When creation of symlink raises an error`
	`152`	`+ * @throws \RuntimeException When creation of symlink raises an error that should not be suppressed`
`153`	`153`	`*/`
`154`	`154`	`public function symlink($originDir, $targetDir, $copyOnWindows = false)`
`155`	`155`	`{`
`@@ -171,13 +171,14 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`if (!$ok) {`
`174`		`- try {`
`175`		`- symlink($originDir, $targetDir);`
`176`		`- } catch (\ErrorException $e) {`
`177`		`- if (defined('PHP_WINDOWS_VERSION_MAJOR') && false !== strpos($e->getMessage(), 'error code(1314)')) {`
`178`		`- throw new \RuntimeException("Unable to create symlink due to error code 1314: A required privilege is not held by the client. Do you have the required Administrator-rights?");`
	`174`	`+ if (false === @symlink($originDir, $targetDir)) {`
	`175`	`+ $report = error_get_last();`
	`176`	`+ if (is_array($report) && $report['type'] & error_reporting()) {`
	`177`	`+ if (defined('PHP_WINDOWS_VERSION_MAJOR') && false !== strpos($report['message'], 'error code(1314)')) {`
	`178`	`+ throw new \RuntimeException('Unable to create symlink due to error code 1314: \'A required privilege is not held by the client\'. Do you have the required Administrator-rights?');`
	`179`	`+ }`
	`180`	`+ throw new \RuntimeException(sprintf("%s in %s line %s", $report['message'], $report['file'], $report['line']));`
`179`	`181`	`}`
`180`		`- throw $e;`
`181`	`182`	`}`
`182`	`183`	`}`
`183`	`184`	`}`