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.3.1"
+        "willdurand/negotiation": "^2.0.3"
     },
     "require-dev": {
         "behat/behat": "^3.1",

src/DataProvider/CollectionDataProviderInterface.php

@@ -30,7 +30,7 @@ interface CollectionDataProviderInterface
      *
      * @throws ResourceClassNotSupportedException
      *
-     * @return array|PaginatorInterface|\Traversable
+     * @return array|\Traversable
      */
     public function getCollection(string $resourceClass, string $operationName = null);
 }

src/EventListener/ReadListener.php

@@ -15,7 +15,6 @@
 
 use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface;
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
-use ApiPlatform\Core\DataProvider\PaginatorInterface;
 use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface;
 use ApiPlatform\Core\Exception\RuntimeException;
 use ApiPlatform\Core\Util\RequestAttributesExtractor;
@@ -77,7 +76,7 @@ public function onKernelRequest(GetResponseEvent $event)
      * @param Request $request
      * @param array   $attributes
      *
-     * @return array|\Traversable|PaginatorInterface|null
+     * @return array|\Traversable|null
      */
     private function getCollectionData(Request $request, array $attributes)
     {