Merge branch '2.0'

Author: dunglas

composer.json

@@ -22,7 +22,7 @@
         "symfony/property-access": "^2.7 || ^3.0",
         "symfony/property-info": "^3.1",
         "symfony/serializer": "^3.1",
-        "willdurand/negotiation": "^2.0.3"
+        "willdurand/negotiation": "^2.0.3 <2.3"
     },
     "require-dev": {
         "behat/behat": "^3.1",

src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php

@@ -13,8 +13,8 @@
 
 namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension;
 
+use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\EagerLoadingTrait;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\ShouldEagerLoad;
 use ApiPlatform\Core\Exception\PropertyNotFoundException;
 use ApiPlatform\Core\Exception\ResourceClassNotFoundException;
 use ApiPlatform\Core\Exception\RuntimeException;
@@ -36,7 +36,7 @@
  */
 final class EagerLoadingExtension implements QueryCollectionExtensionInterface, QueryItemExtensionInterface
 {
-    use ShouldEagerLoad;
+    use EagerLoadingTrait;
 
     private $propertyNameCollectionFactory;
     private $propertyMetadataFactory;

src/Bridge/Doctrine/Orm/Extension/FilterEagerLoadingExtension.php

@@ -13,8 +13,8 @@
 
 namespace ApiPlatform\Core\Bridge\Doctrine\Orm\Extension;
 
+use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\EagerLoadingTrait;
 use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\QueryNameGeneratorInterface;
-use ApiPlatform\Core\Bridge\Doctrine\Orm\Util\ShouldEagerLoad;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
@@ -25,7 +25,7 @@
  */
 final class FilterEagerLoadingExtension implements QueryCollectionExtensionInterface
 {
-    use ShouldEagerLoad;
+    use EagerLoadingTrait;
 
     public function __construct(ResourceMetadataFactoryInterface $resourceMetadataFactory, $forceEager = true)
     {

src/Bridge/Doctrine/Orm/Util/ShouldEagerLoad.php renamed to src/Bridge/Doctrine/Orm/Util/EagerLoadingTrait.php

@@ -21,7 +21,7 @@
  *
  * @internal
  */
-trait ShouldEagerLoad
+trait EagerLoadingTrait
 {
     private $forceEager;
     private $resourceMetadataFactory;