Skip to content

Commit 9801d8e

Browse files
fabpotfabpot
committed
Merge branch '2.4' into 2.5
* 2.4: fixed CS [Process] fixed some volatile tests [HttpKernel] fixed a volatile test [HttpFoundation] fixed some volatile tests [Tests] PHPUnit Optimizations Use getPathname() instead of string casting to get BinaryFileReponse file path Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php src/Symfony/Component/ClassLoader/Tests/ApcUniversalClassLoaderTest.php src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/HttpKernel/Tests/DataCollector/LoggerDataCollectorTest.php src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php src/Symfony/Component/HttpKernel/Tests/Debug/TraceableEventDispatcherTest.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php src/Symfony/Component/Security/Http/Tests/Firewall/SwitchUserListenerTest.php src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php src/Symfony/Component/Translation/Tests/Dumper/IcuResFileDumperTest.php src/Symfony/Component/Validator/Constraints/ChoiceValidator.php src/Symfony/Component/Validator/Constraints/CollectionValidator.php src/Symfony/Component/Validator/Tests/Constraints/AbstractConstraintValidatorTest.php src/Symfony/Component/Validator/Tests/Constraints/IsbnValidatorTest.php src/Symfony/Component/Validator/Tests/ValidationVisitorTest.php src/Symfony/Component/Yaml/Parser.php
2 parents aab19b4 + 6943e99 commit 9801d8e

17 files changed

+23
-31
lines changed

‎ConfigCache.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,4 @@ private function getMetaFile()
123123
{
124124
return $this->file.'.meta';
125125
}
126-
127126
}

‎Definition/Builder/BooleanNodeDefinition.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,4 @@ protected function instantiateNode()
3939
{
4040
return new BooleanNode($this->name, $this->parent);
4141
}
42-
4342
}

‎Definition/Builder/NodeBuilder.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,5 +243,4 @@ protected function getNodeClass($type)
243243

244244
return $class;
245245
}
246-
247246
}

‎Definition/Builder/NodeDefinition.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,5 +340,4 @@ protected function normalization()
340340
* @throws InvalidDefinitionException When the definition is invalid
341341
*/
342342
abstract protected function createNode();
343-
344343
}

‎Definition/Builder/VariableNodeDefinition.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,4 @@ protected function createNode()
6161

6262
return $node;
6363
}
64-
6564
}

‎Definition/Dumper/YamlReferenceDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private function writeNode(NodeInterface $node, $depth = 0)
126126
if ($info = $node->getInfo()) {
127127
$this->writeLine('');
128128
// indenting multi-line info
129-
$info = str_replace("\n", sprintf("\n%".$depth * 4 . "s# ", ' '), $info);
129+
$info = str_replace("\n", sprintf("\n%".($depth * 4)."s# ", ' '), $info);
130130
$this->writeLine('# '.$info, $depth * 4);
131131
}
132132

‎Definition/PrototypedArrayNode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ protected function mergeValues($leftSide, $rightSide)
309309
if (!array_key_exists($k, $leftSide)) {
310310
if (!$this->allowNewKeys) {
311311
$ex = new InvalidConfigurationException(sprintf(
312-
'You are not allowed to define new elements for path "%s". ' .
312+
'You are not allowed to define new elements for path "%s". '.
313313
'Please define all elements for this path in one config file.',
314314
$this->getPath()
315315
));

‎Loader/LoaderInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,4 @@ public function getResolver();
4949
* @param LoaderResolverInterface $resolver A LoaderResolverInterface instance
5050
*/
5151
public function setResolver(LoaderResolverInterface $resolver);
52-
5352
}

‎Tests/Definition/ArrayNodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function getPreNormalizationTests()
7777
array(
7878
array('foo-bar' => null, 'foo_bar' => 'foo'),
7979
array('foo-bar' => null, 'foo_bar' => 'foo'),
80-
)
80+
),
8181
);
8282
}
8383

‎Tests/Definition/Builder/ArrayNodeDefinitionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function providePrototypeNodeSpecificCalls()
5353
array('defaultValue', array(array())),
5454
array('addDefaultChildrenIfNoneSet', array()),
5555
array('requiresAtLeastOneElement', array()),
56-
array('useAttributeAsKey', array('foo'))
56+
array('useAttributeAsKey', array('foo')),
5757
);
5858
}
5959

‎Tests/Definition/Builder/ExprBuilderTest.php

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
class ExprBuilderTest extends \PHPUnit_Framework_TestCase
1717
{
18-
1918
public function testAlwaysExpression()
2019
{
2120
$test = $this->getTestBuilder()
@@ -31,7 +30,7 @@ public function testIfTrueExpression()
3130
->ifTrue()
3231
->then($this->returnClosure('new_value'))
3332
->end();
34-
$this->assertFinalizedValueIs('new_value', $test, array('key'=>true));
33+
$this->assertFinalizedValueIs('new_value', $test, array('key' => true));
3534

3635
$test = $this->getTestBuilder()
3736
->ifTrue( function ($v) { return true; })
@@ -58,8 +57,7 @@ public function testIfStringExpression()
5857
->ifString()
5958
->then($this->returnClosure('new_value'))
6059
->end();
61-
$this->assertFinalizedValueIs(45, $test, array('key'=>45));
62-
60+
$this->assertFinalizedValueIs(45, $test, array('key' => 45));
6361
}
6462

6563
public function testIfNullExpression()
@@ -68,7 +66,7 @@ public function testIfNullExpression()
6866
->ifNull()
6967
->then($this->returnClosure('new_value'))
7068
->end();
71-
$this->assertFinalizedValueIs('new_value', $test, array('key'=>null));
69+
$this->assertFinalizedValueIs('new_value', $test, array('key' => null));
7270

7371
$test = $this->getTestBuilder()
7472
->ifNull()
@@ -83,7 +81,7 @@ public function testIfArrayExpression()
8381
->ifArray()
8482
->then($this->returnClosure('new_value'))
8583
->end();
86-
$this->assertFinalizedValueIs('new_value', $test, array('key'=>array()));
84+
$this->assertFinalizedValueIs('new_value', $test, array('key' => array()));
8785

8886
$test = $this->getTestBuilder()
8987
->ifArray()
@@ -182,7 +180,7 @@ protected function finalizeTestBuilder($testBuilder, $config = null)
182180
->end()
183181
->end()
184182
->buildTree()
185-
->finalize(null === $config ? array('key'=>'value') : $config)
183+
->finalize(null === $config ? array('key' => 'value') : $config)
186184
;
187185
}
188186

@@ -207,6 +205,6 @@ protected function returnClosure($val)
207205
*/
208206
protected function assertFinalizedValueIs($value, $treeBuilder, $config = null)
209207
{
210-
$this->assertEquals(array('key'=>$value), $this->finalizeTestBuilder($treeBuilder, $config));
208+
$this->assertEquals(array('key' => $value), $this->finalizeTestBuilder($treeBuilder, $config));
211209
}
212210
}

‎Tests/Definition/Dumper/XmlReferenceDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function testNamespaceDumper()
3434

3535
private function getConfigurationAsString()
3636
{
37-
return <<<EOL
37+
return <<<EOL
3838
<!-- Namespace: http://example.org/schema/dic/acme_root -->
3939
<!-- scalar-required: Required -->
4040
<!-- enum: One of "this"; "that" -->

‎Tests/Definition/Dumper/YamlReferenceDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function testDumper()
2828

2929
private function getConfigurationAsString()
3030
{
31-
return <<<EOL
31+
return <<<EOL
3232
acme_root:
3333
boolean: true
3434
scalar_empty: ~

‎Tests/Definition/FloatNodeTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function getValidValues()
3434
// Integer are accepted too, they will be cast
3535
array(17),
3636
array(-10),
37-
array(0)
37+
array(0),
3838
);
3939
}
4040

‎Tests/Definition/MergeTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,14 @@ public function testDoesNotAllowNewKeysInSubsequentConfigs()
115115

116116
$a = array(
117117
'test' => array(
118-
'a' => array('value' => 'foo')
119-
)
118+
'a' => array('value' => 'foo'),
119+
),
120120
);
121121

122122
$b = array(
123123
'test' => array(
124-
'b' => array('value' => 'foo')
125-
)
124+
'b' => array('value' => 'foo'),
125+
),
126126
);
127127

128128
$tree->merge($a, $b);
@@ -157,13 +157,13 @@ public function testPerformsNoDeepMerging()
157157
$b = array(
158158
'no_deep_merging' => array(
159159
'c' => 'd',
160-
)
160+
),
161161
);
162162

163163
$this->assertEquals(array(
164164
'no_deep_merging' => array(
165165
'c' => 'd',
166-
)
166+
),
167167
), $tree->merge($a, $b));
168168
}
169169

‎Tests/Definition/NormalizationTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ public function testNonAssociativeArrayThrowsExceptionIfAttributeNotSet()
176176
{
177177
$denormalized = array(
178178
'thing' => array(
179-
array('foo', 'bar'), array('baz', 'qux')
180-
)
179+
array('foo', 'bar'), array('baz', 'qux'),
180+
),
181181
);
182182

183183
$this->assertNormalized($this->getNumericKeysTestTree(), $denormalized, array());

‎Tests/Resource/DirectoryResourceTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ protected function removeDirectory($directory)
4242
continue;
4343
}
4444
if ($path->isDir()) {
45-
rmdir($path->__toString());
45+
rmdir($path->__toString());
4646
} else {
47-
unlink($path->__toString());
47+
unlink($path->__toString());
4848
}
4949
}
5050
rmdir($directory);

0 commit comments

Comments
 (0)