Merge branch '2.1' into 2.2

fabpot · fabpot · commit 9a7c56788efa · 2013-04-06T12:15:43.000+02:00
* 2.1: [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562) [WebProfilerBundle] removed next pointer class in a template
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
@@ -84,19 +84,19 @@ protected static function getPhpUnitXmlDir()
     }
 
     /**
-     * Finds the value of configuration flag from cli
+     * Finds the value of the CLI configuration option.
      *
      * PHPUnit will use the last configuration argument on the command line, so this only returns
-     * the last configuration argument
+     * the last configuration argument.
      *
-     * @return string The value of the phpunit cli configuration option
+     * @return string The value of the PHPUnit cli configuration option
      */
     private static function getPhpUnitCliConfigArgument()
     {
         $dir = null;
         $reversedArgs = array_reverse($_SERVER['argv']);
         foreach ($reversedArgs as $argIndex => $testArg) {
-            if ($testArg === '-c' || $testArg === '--configuration') {
+            if (preg_match('/^-[^ \-]*c$/', $testArg) || $testArg === '--configuration') {
                 $dir = realpath($reversedArgs[$argIndex - 1]);
                 break;
             } elseif (strpos($testArg, '--configuration=') === 0) {
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
@@ -9,7 +9,7 @@
                 {{ collector.controller.method }}
             </span>
         {% else %}
-            <span class="sf-toolbar-info-class sf-toolbar-info-with-next-pointer">{{ collector.controller }}</span>
+            <span class="sf-toolbar-info-class">{{ collector.controller }}</span>
         {% endif %}
     {% endset %}
     {% set request_status_code_color = (400 > collector.statuscode) ? ((200 == collector.statuscode) ? 'green' : 'yellow') : 'red'%}
diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
@@ -31,7 +31,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta
     /**
      * Constructor.
      *
-     * @param string $storageKey The key used to store flashes in the session.
+     * @param string $storageKey The key used to store attributes in the session.
      */
     public function __construct($storageKey = '_sf2_attributes')
     {

Original file line number	Diff line number	Diff line change
`@@ -84,19 +84,19 @@ protected static function getPhpUnitXmlDir()`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`/**`
`87`		`- * Finds the value of configuration flag from cli`
	`87`	`+ * Finds the value of the CLI configuration option.`
`88`	`88`	`*`
`89`	`89`	`* PHPUnit will use the last configuration argument on the command line, so this only returns`
`90`		`- * the last configuration argument`
	`90`	`+ * the last configuration argument.`
`91`	`91`	`*`
`92`		`- * @return string The value of the phpunit cli configuration option`
	`92`	`+ * @return string The value of the PHPUnit cli configuration option`
`93`	`93`	`*/`
`94`	`94`	`private static function getPhpUnitCliConfigArgument()`
`95`	`95`	`{`
`96`	`96`	`$dir = null;`
`97`	`97`	`$reversedArgs = array_reverse($_SERVER['argv']);`
`98`	`98`	`foreach ($reversedArgs as $argIndex => $testArg) {`
`99`		`- if ($testArg === '-c' \|\| $testArg === '--configuration') {`
	`99`	`+ if (preg_match('/^-[^ \-]*c$/', $testArg) \|\| $testArg === '--configuration') {`
`100`	`100`	`$dir = realpath($reversedArgs[$argIndex - 1]);`
`101`	`101`	`break;`
`102`	`102`	`} elseif (strpos($testArg, '--configuration=') === 0) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class AttributeBag implements AttributeBagInterface, \IteratorAggregate, \Counta`
`31`	`31`	`/**`
`32`	`32`	`* Constructor.`
`33`	`33`	`*`
`34`		`- * @param string $storageKey The key used to store flashes in the session.`
	`34`	`+ * @param string $storageKey The key used to store attributes in the session.`
`35`	`35`	`*/`
`36`	`36`	`public function __construct($storageKey = '_sf2_attributes')`
`37`	`37`	`{`