Merge branch '2.1'

Author: dunglas

tests/Api/FilterLocatorTraitTest.php

@@ -53,7 +53,7 @@ public function testSetFilterLocatorWithNullAndNullAllowed()
         $filterLocatorTraitImpl = $this->getFilterLocatorTraitImpl();
         $filterLocatorTraitImpl->setFilterLocator(null, true);
 
-        $this->assertEquals(null, $filterLocatorTraitImpl->getFilterLocator());
+        $this->assertNull($filterLocatorTraitImpl->getFilterLocator());
     }
 
     /**

tests/Fixtures/TestBundle/Entity/DummyProduct.php

@@ -114,7 +114,7 @@ public function setRelatedProducts(Collection $relatedProducts)
         $this->relatedProducts = $relatedProducts;
     }
 
-    public function addRelatedProduct(DummyProduct $relatedProduct)
+    public function addRelatedProduct(self $relatedProduct)
     {
         $this->relatedProducts->add($relatedProduct);
         $relatedProduct->setParent($this);
@@ -125,7 +125,7 @@ public function getParent()
         return $this->parent;
     }
 
-    public function setParent(DummyProduct $product)
+    public function setParent(self $product)
     {
         $this->parent = $product;
     }

tests/Swagger/Serializer/DocumentationNormalizerTest.php

@@ -1207,9 +1207,9 @@ public function testSupports()
 
         $documentation = new Documentation(new ResourceNameCollection([Dummy::class]), 'Test API', 'This is a test API.', '1.2.3', ['jsonld' => ['application/ld+json']]);
 
-        $this->assertEquals(true, $normalizer->supportsNormalization($documentation, 'json'));
-        $this->assertEquals(false, $normalizer->supportsNormalization($documentation));
-        $this->assertEquals(false, $normalizer->supportsNormalization(new Dummy(), 'json'));
+        $this->assertTrue($normalizer->supportsNormalization($documentation, 'json'));
+        $this->assertFalse($normalizer->supportsNormalization($documentation));
+        $this->assertFalse($normalizer->supportsNormalization(new Dummy(), 'json'));
     }
 
     public function testNoOperations()