Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 98a2d3c

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.3' into 3.4
* 3.3: [Serializer] Remove a useless legacy annotation Fixed extra semi-colon fix docblock position [DependencyInjection] remove unused variable [PhpUnitBridge] add changelog entries for #21140 [DI] Remove dead service_container checks
2 parents 08aa6a8 + 1705eeb commit 98a2d3c
Copy full SHA for 98a2d3c

File tree

8 files changed

+20
-20
lines changed
Filter options

8 files changed

+20
-20
lines changed

‎src/Symfony/Bridge/PhpUnit/CHANGELOG.md

Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
CHANGELOG
2+
=========
3+
4+
3.3.0
5+
-----
6+
7+
* using the `testLegacy` prefix in method names to mark a test as legacy is
8+
deprecated, use the `@group legacy` notation instead
9+
* using the `Legacy` prefix in class names to mark a test as legacy is deprecated,
10+
use the `@group legacy` notation instead

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,6 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
258258
return $builder->getAlias($serviceId);
259259
}
260260

261-
if ('service_container' === $serviceId) {
262-
return $builder;
263-
}
264-
265261
// the service has been injected in some special way, just return the service
266262
return $builder->get($serviceId);
267263
}

‎src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
+5-4Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,11 @@ class Translator extends BaseTranslator implements WarmableInterface
4848
* * debug: Whether to enable debugging or not (false by default)
4949
* * resource_files: List of translation resources available grouped by locale.
5050
*
51-
* @param ContainerInterface $container A ContainerInterface instance
52-
* @param MessageSelector $selector The message selector for pluralization
53-
* @param array $loaderIds An array of loader Ids
54-
* @param array $options An array of options
51+
* @param ContainerInterface $container A ContainerInterface instance
52+
* @param MessageSelector $selector The message selector for pluralization
53+
* @param string $defaultLocale
54+
* @param array $loaderIds An array of loader Ids
55+
* @param array $options An array of options
5556
*
5657
* @throws InvalidArgumentException
5758
*/

‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ private function doProcessValue($value, $isRoot = false)
163163
*/
164164
private function getMethodsToAutowire(\ReflectionClass $reflectionClass)
165165
{
166-
$found = array();
167166
$methodsToAutowire = array();
168167

169168
foreach ($reflectionClass->getMethods() as $reflectionMethod) {

‎src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,7 @@ private function findNodes()
192192
}
193193

194194
if (!$container->hasDefinition($id)) {
195-
$class = get_class('service_container' === $id ? $this->container : $container->get($id));
196-
$nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => $this->options['node.instance']);
195+
$nodes[$id] = array('class' => str_replace('\\', '\\\\', get_class($container->get($id))), 'attributes' => $this->options['node.instance']);
197196
}
198197
}
199198

‎src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ public function testDenormalize()
2626
$this->assertSame('baz', $normalizedData->baz);
2727
}
2828

29-
/**
30-
* @group legacy
31-
*/
3229
public function testInstantiateObjectDenormalizer()
3330
{
3431
$data = array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz');

‎src/Symfony/Component/Translation/Translator.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Translator.php
+4-5Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,10 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
7474
/**
7575
* Constructor.
7676
*
77-
* @param string $locale The locale
78-
* @param MessageSelector|null $selector The message selector for pluralization
79-
* @param string $defaultLocale
80-
* @param string|null $cacheDir The directory to use for the cache
81-
* @param bool $debug Use cache in debug mode ?
77+
* @param string $locale The locale
78+
* @param MessageSelector|null $selector The message selector for pluralization
79+
* @param string|null $cacheDir The directory to use for the cache
80+
* @param bool $debug Use cache in debug mode ?
8281
*
8382
* @throws InvalidArgumentException If a locale contains invalid characters
8483
*/

‎src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, $isNested,
5151
unset($v->value['position'], $v->value['isVariadic'], $v->value['byReference'], $v);
5252
}
5353
}
54-
;
5554

5655
if (!($filter & Caster::EXCLUDE_VERBOSE) && $f = $c->getFileName()) {
5756
$a[$prefix.'file'] = new LinkStub($f, $c->getStartLine());

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.