Skip to content

Commit a95c047

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 f7bca26 + b5854c3 commit a95c047

File tree

6 files changed

+15
-19
lines changed

6 files changed

+15
-19
lines changed

‎Encoder/JsonDecode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private function resolveContext(array $context)
132132
$defaultOptions = array(
133133
'json_decode_associative' => $this->associative,
134134
'json_decode_recursion_depth' => $this->recursionDepth,
135-
'json_decode_options' => 0
135+
'json_decode_options' => 0,
136136
);
137137

138138
return array_merge($defaultOptions, $context);

‎Encoder/JsonEncode.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121
class JsonEncode implements EncoderInterface
2222
{
23-
private $options ;
23+
private $options;
2424
private $lastError = JSON_ERROR_NONE;
2525

2626
public function __construct($bitmask = 0)

‎Serializer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ public function supportsDenormalization($data, $type, $format = null)
164164
*/
165165
private function getNormalizer($data, $format)
166166
{
167-
168167
$class = get_class($data);
169168
if (isset($this->normalizerCache[$class][$format])) {
170169
return $this->normalizerCache[$class][$format];

‎Tests/Encoder/XmlEncoderTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ public function testAttributes()
6767
$obj->xmlFoo = array(
6868
'foo-bar' => array(
6969
'@id' => 1,
70-
'@name' => 'Bar'
70+
'@name' => 'Bar',
7171
),
7272
'Foo' => array(
7373
'Bar' => "Test",
74-
'@Type' => 'test'
74+
'@Type' => 'test',
7575
),
7676
'föo_bär' => 'a',
7777
"Bar" => array(1,2,3),
@@ -141,7 +141,7 @@ public function testEncodeScalarRootAttributes()
141141
{
142142
$array = array(
143143
'#' => 'Paul',
144-
'@gender' => 'm'
144+
'@gender' => 'm',
145145
);
146146

147147
$expected = '<?xml version="1.0"?>'."\n".
@@ -154,7 +154,7 @@ public function testEncodeRootAttributes()
154154
{
155155
$array = array(
156156
'firstname' => 'Paul',
157-
'@gender' => 'm'
157+
'@gender' => 'm',
158158
);
159159

160160
$expected = '<?xml version="1.0"?>'."\n".
@@ -272,7 +272,7 @@ public function testDecodeScalarRootAttributes()
272272

273273
$expected = array(
274274
'#' => 'Peter',
275-
'@gender' => 'M'
275+
'@gender' => 'M',
276276
);
277277

278278
$this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
@@ -286,7 +286,7 @@ public function testDecodeRootAttributes()
286286
$expected = array(
287287
'firstname' => 'Peter',
288288
'lastname' => 'Mac Calloway',
289-
'@gender' => 'M'
289+
'@gender' => 'M',
290290
);
291291

292292
$this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
@@ -305,8 +305,8 @@ public function testDecodeArray()
305305
$expected = array(
306306
'people' => array('person' => array(
307307
array('firstname' => 'Benjamin', 'lastname' => 'Alexandre'),
308-
array('firstname' => 'Damien', 'lastname' => 'Clay')
309-
))
308+
array('firstname' => 'Damien', 'lastname' => 'Clay'),
309+
)),
310310
);
311311

312312
$this->assertEquals($expected, $this->encoder->decode($source, 'xml'));
@@ -318,11 +318,11 @@ public function testDecodeWithoutItemHash()
318318
$obj->xmlFoo = array(
319319
'foo-bar' => array(
320320
'@key' => "value",
321-
'item' => array("@key" => 'key', "key-val" => 'val')
321+
'item' => array("@key" => 'key', "key-val" => 'val'),
322322
),
323323
'Foo' => array(
324324
'Bar' => "Test",
325-
'@Type' => 'test'
325+
'@Type' => 'test',
326326
),
327327
'föo_bär' => 'a',
328328
"Bar" => array(1,2,3),
@@ -331,11 +331,11 @@ public function testDecodeWithoutItemHash()
331331
$expected = array(
332332
'foo-bar' => array(
333333
'@key' => "value",
334-
'key' => array('@key' => 'key', "key-val" => 'val')
334+
'key' => array('@key' => 'key', "key-val" => 'val'),
335335
),
336336
'Foo' => array(
337337
'Bar' => "Test",
338-
'@Type' => 'test'
338+
'@Type' => 'test',
339339
),
340340
'föo_bär' => 'a',
341341
"Bar" => array(1,2,3),

‎Tests/Fixtures/DenormalizableDummy.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616

1717
class DenormalizableDummy implements DenormalizableInterface
1818
{
19-
2019
public function denormalize(DenormalizerInterface $denormalizer, $data, $format = null, array $context = array())
2120
{
22-
2321
}
24-
2522
}

‎Tests/Normalizer/GetSetMethodNormalizerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public function provideCallbacks()
216216
),
217217
'baz',
218218
array('foo' => '', 'bar' => null, 'baz' => true),
219-
'Null an item'
219+
'Null an item',
220220
),
221221
array(
222222
array(

0 commit comments

Comments
 (0)