Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit dff84957040b · 2017-05-22T11:56:34.000+02:00
* 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
diff --git a/Tests/Normalizer/AbstractObjectNormalizerTest.php b/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');

Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,6 @@ public function testDenormalize()`
`26`	`26`	`$this->assertSame('baz', $normalizedData->baz);`
`27`	`27`	`}`
`28`	`28`
`29`		`- /**`
`30`		`- * @group legacy`
`31`		`- */`
`32`	`29`	`public function testInstantiateObjectDenormalizer()`
`33`	`30`	`{`
`34`	`31`	`$data = array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz');`