From b0ba9fd712335fce1f389eadeda30348b1da3e7d Mon Sep 17 00:00:00 2001 From: Bilal Amarni Date: Tue, 2 Apr 2013 11:25:27 +0300 Subject: [PATCH 1/3] [WebProfilerBundle] removed next pointer class in a template --- .../Resources/views/Collector/request.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig index fa43c50201..511a666a2a 100644 --- 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 }} {% else %} - {{ collector.controller }} + {{ collector.controller }} {% endif %} {% endset %} {% set request_status_code_color = (400 > collector.statuscode) ? ((200 == collector.statuscode) ? 'green' : 'yellow') : 'red'%} From 375ded4227f55b341898446434336fb56a3f11ef Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 5 Apr 2013 08:39:48 +0200 Subject: [PATCH 2/3] [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562) --- src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php index ea0c49ecbd..0048f5539c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php +++ b/src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php @@ -82,19 +82,19 @@ abstract class WebTestCase extends \PHPUnit_Framework_TestCase } /** - * 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) { From 815eb6144cd284eb292e235e41657ba6d76a631a Mon Sep 17 00:00:00 2001 From: phc Date: Fri, 5 Apr 2013 14:59:25 +0200 Subject: [PATCH 3/3] [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag --- .../Component/HttpFoundation/Session/Attribute/AttributeBag.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php b/src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php index 2f1a4222e7..e9d0257152 100644 --- 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') {