diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source 
* 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
This commit is contained in:
Fabien Potencier 2013-04-06 12:15:43 +02:00
commit 9a7c56788e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
View File

@ -84,19 +84,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) {

2
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
View File

@ -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'%}

2
src/Symfony/Component/HttpFoundation/Session/Attribute/AttributeBag.php
View File

@ -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')
{