Skip to content

Commit 9755522

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: CS: fixes Translator component has default domain for null implemented no need to have default translation domain logic in 3 different places [Form] [TwigBridge] Bootstrap layout whitespace control [travis] Kill tests when a new commit has been pushed fixed CS Change behavior to mirror hash_equals() returning early if there is a length mismatch CS fixing Prevent modifying secrets as much as possible Update StringUtils.php Whitespace Update StringUtils.php StringUtils::equals() arguments in RememberMe Cookie based implementation are confused CS: general fixes [SecurityBundle] removed a duplicated service definition and simplified others. Conflicts: src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml
2 parents b2d0d62 + 28d9ad5 commit 9755522

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/Definition/Builder/ExprBuilderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function testIfNotInArrayExpression()
114114
$this->assertFinalizedValueIs('new_value', $test);
115115

116116
$test = $this->getTestBuilder()
117-
->ifNotInArray(array('foo', 'bar', 'value_from_config' ))
117+
->ifNotInArray(array('foo', 'bar', 'value_from_config'))
118118
->then($this->returnClosure('new_value'))
119119
->end();
120120
$this->assertFinalizedValueIs('new_value', $test);

0 commit comments

Comments
 (0)