Merge branch '3.0'

fabpot · fabpot · commit 307ad07c6157 · 2016-01-07T14:39:00.000+01:00
* 3.0: [WebProfilerBundle] Remove loading status from AJAX toolbar after error Add missing apostrophe in setSaveHandler phpdoc [VarDumper] Fix typo bug #14246 [Filesystem] dumpFile() negates default file permissions [FrameworkBundle] Add case in Kernel directory guess for PHPUnit [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -80,10 +80,14 @@ private static function getPhpUnitCliConfigArgument()
             if (preg_match('/^-[^ \-]*c$/', $testArg) || $testArg === '--configuration') {
                 $dir = realpath($reversedArgs[$argIndex - 1]);
                 break;
-            } elseif (strpos($testArg, '--configuration=') === 0) {
+            } elseif (0 === strpos($testArg, '--configuration=')) {
                 $argPath = substr($testArg, strlen('--configuration='));
                 $dir = realpath($argPath);
                 break;
+            } elseif (0 === strpos($testArg, '-c')) {
+                $argPath = substr($testArg, strlen('-c'));
+                $dir = realpath($argPath);
+                break;
             }
         }
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig
@@ -188,6 +188,7 @@
                     Sfjs.removeClass(ajaxToolbarPanel, 'sf-toolbar-status-red');
                 } else if (state == 'error') {
                     Sfjs.addClass(ajaxToolbarPanel, 'sf-toolbar-status-red');
+                    Sfjs.removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading');
                 } else {
                     Sfjs.addClass(ajaxToolbarPanel, 'sf-ajax-request-loading');
                 }
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -522,12 +522,16 @@ public function dumpFile($filename, $content)
             throw new IOException(sprintf('Unable to write to the "%s" directory.', $dir), 0, null, $dir);
         }
 
+        // Will create a temp file with 0600 access rights
+        // when the filesystem supports chmod.
         $tmpFile = $this->tempnam($dir, basename($filename));
 
         if (false === @file_put_contents($tmpFile, $content)) {
             throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);
         }
 
+        // Ignore for filesystems that do not support umask
+        @chmod($tmpFile, 0666);
         $this->rename($tmpFile, $filename, true);
     }
 
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1076,7 +1076,7 @@ public function testDumpFile()
 
         // skip mode check on Windows
         if ('\\' !== DIRECTORY_SEPARATOR) {
-            $this->assertFilePermissions(600, $filename);
+            $this->assertFilePermissions(666, $filename);
         }
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -332,7 +332,7 @@ public function setOptions(array $options)
      * session.save_handler and session.save_path e.g.
      *
      *     ini_set('session.save_handler', 'files');
-     *     ini_set('session.save_path', /tmp');
+     *     ini_set('session.save_path', '/tmp');
      *
      * or pass in a NativeSessionHandler instance which configures session.save_handler in the
      * constructor, for a template see NativeFileSessionHandler or use handlers in
diff --git a/src/Symfony/Component/VarDumper/Cloner/Data.php b/src/Symfony/Component/VarDumper/Cloner/Data.php
@@ -53,7 +53,7 @@ public function withMaxDepth($maxDepth)
     }
 
     /**
-     * Limits the numbers of elements per depth level.
+     * Limits the number of elements per depth level.
      *
      * @param int $maxItemsPerDepth The max number of items dumped per depth level.
      *

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,7 @@`
`188`	`188`	`Sfjs.removeClass(ajaxToolbarPanel, 'sf-toolbar-status-red');`
`189`	`189`	`} else if (state == 'error') {`
`190`	`190`	`Sfjs.addClass(ajaxToolbarPanel, 'sf-toolbar-status-red');`
	`191`	`+ Sfjs.removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading');`
`191`	`192`	`} else {`
`192`	`193`	`Sfjs.addClass(ajaxToolbarPanel, 'sf-ajax-request-loading');`
`193`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -522,12 +522,16 @@ public function dumpFile($filename, $content)`
`522`	`522`	`throw new IOException(sprintf('Unable to write to the "%s" directory.', $dir), 0, null, $dir);`
`523`	`523`	`}`
`524`	`524`
	`525`	`+ // Will create a temp file with 0600 access rights`
	`526`	`+ // when the filesystem supports chmod.`
`525`	`527`	`$tmpFile = $this->tempnam($dir, basename($filename));`
`526`	`528`
`527`	`529`	`if (false === @file_put_contents($tmpFile, $content)) {`
`528`	`530`	`throw new IOException(sprintf('Failed to write file "%s".', $filename), 0, null, $filename);`
`529`	`531`	`}`
`530`	`532`
	`533`	`+ // Ignore for filesystems that do not support umask`
	`534`	`+ @chmod($tmpFile, 0666);`
`531`	`535`	`$this->rename($tmpFile, $filename, true);`
`532`	`536`	`}`
`533`	`537`
Original file line number	Diff line number	Diff line change
`@@ -1076,7 +1076,7 @@ public function testDumpFile()`
`1076`	`1076`
`1077`	`1077`	`// skip mode check on Windows`
`1078`	`1078`	`if ('\\' !== DIRECTORY_SEPARATOR) {`
`1079`		`- $this->assertFilePermissions(600, $filename);`
	`1079`	`+ $this->assertFilePermissions(666, $filename);`
`1080`	`1080`	`}`
`1081`	`1081`	`}`
`1082`	`1082`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ public function setOptions(array $options)`
`332`	`332`	`* session.save_handler and session.save_path e.g.`
`333`	`333`	`*`
`334`	`334`	`* ini_set('session.save_handler', 'files');`
`335`		`- * ini_set('session.save_path', /tmp');`
	`335`	`+ * ini_set('session.save_path', '/tmp');`
`336`	`336`	`*`
`337`	`337`	`* or pass in a NativeSessionHandler instance which configures session.save_handler in the`
`338`	`338`	`* constructor, for a template see NativeFileSessionHandler or use handlers in`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function withMaxDepth($maxDepth)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`/**`
`56`		`- * Limits the numbers of elements per depth level.`
	`56`	`+ * Limits the number of elements per depth level.`
`57`	`57`	`*`
`58`	`58`	`* @param int $maxItemsPerDepth The max number of items dumped per depth level.`
`59`	`59`	`*`