Merge branch '2.1'

Author: dunglas

.travis.yml

@@ -30,7 +30,7 @@ before_install:
   - phpenv config-rm xdebug.ini || echo "xdebug not available"
   - echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - npm install -g swagger-cli
-  - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.7.1/php-cs-fixer.phar; fi
+  - if [[ $lint = 1 ]]; then wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.8.2/php-cs-fixer.phar; fi
   - if [[ $lint = 1 ]]; then composer global require --dev 'phpstan/phpstan:^0.8'; fi
   - export PATH="$PATH:$HOME/.composer/vendor/bin"
 

src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

@@ -436,6 +436,8 @@ private function registerCacheConfiguration(ContainerBuilder $container)
         $container->register('api_platform.cache.metadata.property', ArrayAdapter::class);
         $container->register('api_platform.cache.metadata.resource', ArrayAdapter::class);
         $container->register('api_platform.cache.route_name_resolver', ArrayAdapter::class);
+        $container->register('api_platform.cache.identifiers_extractor', ArrayAdapter::class);
+        $container->register('api_platform.cache.subresource_operation_factory', ArrayAdapter::class);
     }
 
     /**