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
symfony · May 22, 2017 · 98a2d3c · 98a2d3c
2 parents 08aa6a8 + 1705eeb
commit 98a2d3c
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/src/Symfony/Bridge/PhpUnit/CHANGELOG.md b/src/Symfony/Bridge/PhpUnit/CHANGELOG.md
@@ -0,0 +1,10 @@
+CHANGELOG
+=========
+
+3.3.0
+-----
+
+ * using the `testLegacy` prefix in method names to mark a test as legacy is
+   deprecated, use the `@group legacy` notation instead
+ * using the `Legacy` prefix in class names to mark a test as legacy is deprecated,
+   use the `@group legacy` notation instead
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
@@ -258,10 +258,6 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
             return $builder->getAlias($serviceId);
         }
 
-        if ('service_container' === $serviceId) {
-            return $builder;
-        }
-
         // the service has been injected in some special way, just return the service
         return $builder->get($serviceId);
     }

diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -48,10 +48,11 @@ class Translator extends BaseTranslator implements WarmableInterface
      *   * debug:     Whether to enable debugging or not (false by default)
      *   * resource_files: List of translation resources available grouped by locale.
      *
-     * @param ContainerInterface $container A ContainerInterface instance
-     * @param MessageSelector    $selector  The message selector for pluralization
-     * @param array              $loaderIds An array of loader Ids
-     * @param array              $options   An array of options
+     * @param ContainerInterface $container     A ContainerInterface instance
+     * @param MessageSelector    $selector      The message selector for pluralization
+     * @param string             $defaultLocale
+     * @param array              $loaderIds     An array of loader Ids
+     * @param array              $options       An array of options
      *
      * @throws InvalidArgumentException
      */

diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -163,7 +163,6 @@ private function doProcessValue($value, $isRoot = false)
      */
     private function getMethodsToAutowire(\ReflectionClass $reflectionClass)
     {
-        $found = array();
         $methodsToAutowire = array();
 
         foreach ($reflectionClass->getMethods() as $reflectionMethod) {

diff --git a/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
@@ -192,8 +192,7 @@ private function findNodes()
             }
 
             if (!$container->hasDefinition($id)) {
-                $class = get_class('service_container' === $id ? $this->container : $container->get($id));
-                $nodes[$id] = array('class' => str_replace('\\', '\\\\', $class), 'attributes' => $this->options['node.instance']);
+                $nodes[$id] = array('class' => str_replace('\\', '\\\\', get_class($container->get($id))), 'attributes' => $this->options['node.instance']);
             }
         }
 

diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -26,9 +26,6 @@ public function testDenormalize()
         $this->assertSame('baz', $normalizedData->baz);
     }
 
-    /**
-     * @group legacy
-     */
     public function testInstantiateObjectDenormalizer()
     {
         $data = array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz');

diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php
@@ -74,11 +74,10 @@ class Translator implements TranslatorInterface, TranslatorBagInterface
     /**
      * Constructor.
      *
-     * @param string               $locale        The locale
-     * @param MessageSelector|null $selector      The message selector for pluralization
-     * @param string               $defaultLocale
-     * @param string|null          $cacheDir      The directory to use for the cache
-     * @param bool                 $debug         Use cache in debug mode ?
+     * @param string               $locale   The locale
+     * @param MessageSelector|null $selector The message selector for pluralization
+     * @param string|null          $cacheDir The directory to use for the cache
+     * @param bool                 $debug    Use cache in debug mode ?
      *
      * @throws InvalidArgumentException If a locale contains invalid characters
      */

diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
@@ -51,7 +51,6 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, $isNested,
                 unset($v->value['position'], $v->value['isVariadic'], $v->value['byReference'], $v);
             }
         }
-        ;
 
         if (!($filter & Caster::EXCLUDE_VERBOSE) && $f = $c->getFileName()) {
             $a[$prefix.'file'] = new LinkStub($f, $c->getStartLine());