8000 Merge branch '2.3' into 2.7 · symfony/symfony@ddc668d · GitHub
[go: up one dir, main page]
Skip to content

Commit ddc668d

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.7
* 2.3: fixed CS
2 parents 00c3192 + b81cac8 commit ddc668d

File tree

8 files changed

+55
-41
lines changed

8 files changed

+55
-41
lines changed

‎src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,17 @@ public function getTransTests()
8787

8888
// transchoice
8989
array('{% transchoice count from "messages" %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
90-
'There is no apples', array('count' => 0),),
90+
'There is no apples', array('count' => 0)),
9191
array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
92-
'There is 5 apples', array('count' => 5),),
92+
'There is 5 apples', array('count' => 5)),
9393
array('{% transchoice count %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
94-
'There is 5 apples (Symfony)', array('count' => 5, 'name' => 'Symfony'),),
94+
'There is 5 apples (Symfony)', array('count' => 5, 'name' => 'Symfony')),
9595
array('{% transchoice count with { \'%name%\': \'Symfony\' } %}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples (%name%){% endtranschoice %}',
96-
'There is 5 apples (Symfony)', array('count' => 5),),
96+
'There is 5 apples (Symfony)', array('count' => 5)),
9797
array('{% transchoice count into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
98-
'There is no apples', array('count' => 0),),
98+
'There is no apples', array('count' => 0)),
9999
array('{% transchoice 5 into "fr"%}{0} There is no apples|{1} There is one apple|]1,Inf] There is %count% apples{% endtranschoice %}',
100-
'There is 5 apples',),
100+
'There is 5 apples'),
101101

102102
// trans filter
103103
array('{{ "Hello"|trans }}', 'Hello'),

‎src/Symfony/Component/Finder/Tests/FinderTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,7 @@ public function testRegexSpecialCharsLocationWithPathRestrictionContainingStartF
526526
$finder->in(__DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'r+e.gex[c]a(r)s')
527527
->path('/^dir/');
528528

529-
$expected = array('r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir',
530-
'r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat',);
529+
$expected = array('r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir', 'r+e.gex[c]a(r)s'.DIRECTORY_SEPARATOR.'dir'.DIRECTORY_SEPARATOR.'bar.dat');
531530
$this->assertIterator($this->toAbsoluteFixtures($expected), $finder);
532531
}
533532

‎src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/AttributeBagTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ protected function setUp()
4343
'category' => array(
4444
'fishing' => array(
4545
'first' => 'cod',
46-
'second' => 'sole',),
46+
'second' => 'sole',
4747
),
48+
),
4849
);
4950
$this->bag = new AttributeBag('_sf2');
5051
$this->bag->initialize($this->array);

‎src/Symfony/Component/HttpFoundation/Tests/Session/Attribute/NamespacedAttributeBagTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ protected function setUp()
4343
'category' => array(
4444
'fishing' => array(
4545
'first' => 'cod',
46-
'second' => 'sole',),
46+
'second' => 'sole',
4747
),
48+
),
4849
);
4950
$this->bag = new NamespacedAttributeBag('_sf2', '/');
5051
$this->bag->initialize($this->array);

‎src/Symfony/Component/Routing/Tests/RouteCompilerTest.php

Lines changed: 41 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,26 @@ public function provideCompileData()
3838
array('/foo'),
3939
'/foo', '#^/foo$#s', array(), array(
4040
array('text', '/foo'),
41-
),),
41+
),
42+
),
4243

4344
array(
4445
'Route with a variable',
4546
array('/foo/{bar}'),
4647
'/foo', '#^/foo/(?P<bar>[^/]++)$#s', array('bar'), array(
4748
array('variable', '/', '[^/]++', 'bar'),
4849
array('text', '/foo'),
49-
),),
50+
),
51+
),
5052

5153
array(
5254
'Route with a variable that has a default value',
5355
array('/foo/{bar}', array('bar' => 'bar')),
5456
'/foo', '#^/foo(?:/(?P<bar>[^/]++))?$#s', array('bar'), array(
5557
array('variable', '/', '[^/]++', 'bar'),
5658
array('text', '/foo'),
57-
),),
59+
),
60+
),
5861

5962
array(
6063
'Route with several variables',
@@ -63,7 +66,8 @@ public function provideCompileData()
6366
array('variable', '/', '[^/]++', 'foobar'),
6467
array('variable', '/', '[^/]++', 'bar'),
6568
array('text', '/foo'),
66-
),),
69+
),
70+
),
6771

6872
array(
6973
'Route with several variables that have default values',
@@ -72,7 +76,8 @@ public function provideCompileData()
7276
array('variable', '/', '[^/]++', 'foobar'),
7377
array('variable', '/', '[^/]++', 'bar'),
7478
array('text', '/foo'),
75-
),),
79+
),
80+
),
7681

7782
array(
7883
'Route with several variables but some of them have no default values',
@@ -81,73 +86,82 @@ public function provideCompileData()
8186
array('variable', '/', '[^/]++', 'foobar'),
8287
array('variable', '/', '[^/]++', 'bar'),
8388
array('text', '/foo'),
84-
),),
89+
),
90+
),
8591

8692
array(
8793
'Route with an optional variable as the first segment',
8894
array('/{bar}', array('bar' => 'bar')),
8995
'', '#^/(?P<bar>[^/]++)?$#s', array('bar'), array(
9096
array('variable', '/', '[^/]++', 'bar'),
91-
),),
97+
),
98+
),
9299

93100
array(
94101
'Route with a requirement of 0',
95102
array('/{bar}', array('bar' => null), array('bar' => '0')),
96103
'', '#^/(?P<bar>0)?$#s', array('bar'), array(
97104
array('variable', '/', '0', 'bar'),
98-
),),
105+
),
106+
),
99107

100108
array(
101109
'Route with an optional variable as the first segment with requirements',
102110
array('/{bar}', array('bar' => 'bar'), array('bar' => '(foo|bar)')),
103111
'', '#^/(?P<bar>(foo|bar))?$#s', array('bar'), array(
104112
array('variable', '/', '(foo|bar)', 'bar'),
105-
),),
113+
),
114+
),
106115

107116
array(
108117
'Route with only optional variables',
109118
array('/{foo}/{bar}', array('foo' => 'foo', 'bar' => 'bar')),
110119
'', '#^/(?P<foo>[^/]++)?(?:/(?P<bar>[^/]++))?$#s', array('foo', 'bar'), array(
111120
array('variable', '/', '[^/]++', 'bar'),
112121
array('variable', '/', '[^/]++', 'foo'),
113-
),),
122+
),
123+
),
114124

115125
array(
116126
'Route with a variable in last position',
117127
array('/foo-{bar}'),
118128
'/foo', '#^/foo\-(?P<bar>[^/]++)$#s', array('bar'), array(
119-
array('variable', '-', '[^/]++', 'bar'),
120-
array('text', '/foo'),
121-
),),
129+
array('variable', '-', '[^/]++', 'bar'),
130+
array('text', '/foo'),
131+
),
132+
),
122133

123134
array(
124135
'Route with nested placeholders',
125136
array('/{static{var}static}'),
126137
'/{static', '#^/\{static(?P<var>[^/]+)static\}$#s', array('var'), array(
127-
array('text', 'static}'),
128-
array('variable', '', '[^/]+', 'var'),
129-
array('text', '/{static'),
130-
),),
138+
array('text', 'static}'),
139+
array('variable', '', '[^/]+', 'var'),
140+
array('text', '/{static'),
141+
),
142+
),
131143

132144
array(
133145
'Route without separator between variables',
134146
array('/{w}{x}{y}{z}.{_format}', array('z' => 'default-z', '_format' => 'html'), array('y' => '(y|Y)')),
135147
'', '#^/(?P<w>[^/\.]+)(?P<x>[^/\.]+)(?P<y>(y|Y))(?:(?P<z>[^/\.]++)(?:\.(?P<_format>[^/]++))?)?$#s', array('w', 'x', 'y', 'z', '_format'), array(
136-
array('variable', '.', '[^/]++', '_format'),
137-
array('variable', '', '[^/\.]++', 'z'),
138-
array('variable', '', '(y|Y)', 'y'),
139-
array('variable', '', '[^/\.]+', 'x'),
140-
array('variable', '/', '[^/\.]+', 'w'),
141-
),),
148+
array('variable', '.', '[^/]++', '_format'),
149+
array('variable', '', '[^/\.]++', 'z'),
150+
array('variable', '', '(y|Y)', 'y'),
151+
array('variable', '', '[^/\.]+', 'x'),
152+
array('variable', '/', '[^/\.]+', 'w'),
153+
),
154+
),
142155

14315 179B 6
array(
144157
'Route with a format',
145158
array('/foo/{bar}.{_format}'),
146159
'/foo', '#^/foo/(?P<bar>[^/\.]++)\.(?P<_format>[^/]++)$#s', array('bar', '_format'), array(
147-
array('variable', '.', '[^/]++', '_format'),
148-
array('variable', '/', '[^/\.]++', 'bar'),
149-
array('text', '/foo'),
150-
),),
160+
array('variable', '.', '[^/]++', '_format'),
161+
array('variable', '/', '[^/\.]++', 'bar'),
162+
array('text', '/foo'),
163+
),
164+
),
151165
);
152166
}
153167

‎src/Symfony/Component/Serializer/Serializer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,6 @@ private function denormalizeObject($data, $class, $format, array $context = arra
249249
foreach ($this->normalizers as $normalizer) {
250250
if ($normalizer instanceof DenormalizerInterface
251251
&& $normalizer->supportsDenormalization($data, $class, $format)) {
252-
253252
return $normalizer->denormalize($data, $class, $format, $context);
254253
}
255254
}

‎src/Symfony/Component/Translation/Tests/fixtures/resources.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
22

3-
return array (
3+
return array(
44
'foo' => 'bar',
55
);

‎src/Symfony/Component/Yaml/Escaper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ class Escaper
3131
"\x08", "\x09", "\x0a", "\x0b", "\x0c", "\x0d", "\x0e", "\x0f",
3232
"\x10", "\x11", "\x12", "\x13", "\x14", "\x15", "\x16", "\x17",
3333
"\x18", "\x19", "\x1a", "\x1b", "\x1c", "\x1d", "\x1e", "\x1f",
34-
"\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9",);
34+
"\xc2\x85", "\xc2\xa0", "\xe2\x80\xa8", "\xe2\x80\xa9");
3535
private static $escaped = array('\\\\', '\\"', '\\\\', '\\"',
3636
'\\0', '\\x01', '\\x02', '\\x03', '\\x04', '\\x05', '\\x06', '\\a',
3737
'\\b', '\\t', '\\n', '\\v', '\\f', '\\r', '\\x0e', '\\x0f',
3838
'\\x10', '\\x11', '\\x12', '\\x13', '\\x14', '\\x15', '\\x16', '\\x17',
3939
'\\x18', '\\x19', '\\x1a', '\\e', '\\x1c', '\\x1d', '\\x1e', '\\x1f',
40-
'\\N', '\\_', '\\L', '\\P',);
40+
'\\N', '\\_', '\\L', '\\P');
4141

4242
/**
4343
* Determines if a PHP value would require double quoting in YAML.

0 commit comments

Comments
 (0)
0