From 07a5481a3ba45a2d99ef548ed7afc5874c57593b Mon Sep 17 00:00:00 2001 From: dunglas Date: Wed, 15 Jun 2016 05:46:43 -0400 Subject: [PATCH] Applied fixes from StyleCI --- src/Bridge/Doctrine/Orm/CollectionDataProvider.php | 6 +++--- src/Bridge/Doctrine/Orm/ItemDataProvider.php | 2 +- .../DependencyInjection/Compiler/DataProviderPass.php | 3 ++- src/Bridge/Symfony/Routing/IriConverter.php | 2 +- src/Hydra/Serializer/CollectionNormalizer.php | 2 +- tests/Bridge/Symfony/Routing/IriConverterTest.php | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Bridge/Doctrine/Orm/CollectionDataProvider.php b/src/Bridge/Doctrine/Orm/CollectionDataProvider.php index 28f53f664fe..ee73261d9de 100644 --- a/src/Bridge/Doctrine/Orm/CollectionDataProvider.php +++ b/src/Bridge/Doctrine/Orm/CollectionDataProvider.php @@ -11,9 +11,9 @@ namespace ApiPlatform\Core\Bridge\Doctrine\Orm; -use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface; use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryCollectionExtensionInterface; use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryResultExtensionInterface; +use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface; use ApiPlatform\Core\Exception\ResourceClassNotSupportedException; use Doctrine\Common\Persistence\ManagerRegistry; @@ -29,8 +29,8 @@ class CollectionDataProvider implements CollectionDataProviderInterface private $collectionExtensions; /** - * @param ManagerRegistry $managerRegistry - * @param QueryCollectionExtensionInterface[] $collectionExtensions + * @param ManagerRegistry $managerRegistry + * @param QueryCollectionExtensionInterface[] $collectionExtensions */ public function __construct(ManagerRegistry $managerRegistry, array $collectionExtensions = []) { diff --git a/src/Bridge/Doctrine/Orm/ItemDataProvider.php b/src/Bridge/Doctrine/Orm/ItemDataProvider.php index b848344c54a..b688c4d7506 100644 --- a/src/Bridge/Doctrine/Orm/ItemDataProvider.php +++ b/src/Bridge/Doctrine/Orm/ItemDataProvider.php @@ -11,8 +11,8 @@ namespace ApiPlatform\Core\Bridge\Doctrine\Orm; -use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\Bridge\Doctrine\Orm\Extension\QueryItemExtensionInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\Exception\InvalidArgumentException; use ApiPlatform\Core\Exception\ResourceClassNotSupportedException; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php b/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php index a3396007511..cddae693190 100644 --- a/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php +++ b/src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/DataProviderPass.php @@ -41,7 +41,8 @@ public function process(ContainerBuilder $container) * @param ContainerBuilder $container * @param string $type */ - private function registerDataProviders(ContainerBuilder $container, string $type) { + private function registerDataProviders(ContainerBuilder $container, string $type) + { $services = $container->findTaggedServiceIds('api_platform.'.$type.'_data_provider'); $queue = new \SplPriorityQueue(); diff --git a/src/Bridge/Symfony/Routing/IriConverter.php b/src/Bridge/Symfony/Routing/IriConverter.php index dbbefebf6cf..df84e441b7e 100644 --- a/src/Bridge/Symfony/Routing/IriConverter.php +++ b/src/Bridge/Symfony/Routing/IriConverter.php @@ -12,8 +12,8 @@ namespace ApiPlatform\Core\Bridge\Symfony\Routing; use ApiPlatform\Core\Api\IriConverterInterface; -use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\Api\UrlGeneratorInterface; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\Exception\InvalidArgumentException; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface; diff --git a/src/Hydra/Serializer/CollectionNormalizer.php b/src/Hydra/Serializer/CollectionNormalizer.php index 78214847719..5104997330d 100644 --- a/src/Hydra/Serializer/CollectionNormalizer.php +++ b/src/Hydra/Serializer/CollectionNormalizer.php @@ -12,8 +12,8 @@ namespace ApiPlatform\Core\Hydra\Serializer; use ApiPlatform\Core\Api\IriConverterInterface; -use ApiPlatform\Core\DataProvider\PaginatorInterface; use ApiPlatform\Core\Api\ResourceClassResolverInterface; +use ApiPlatform\Core\DataProvider\PaginatorInterface; use ApiPlatform\Core\Exception\RuntimeException; use ApiPlatform\Core\JsonLd\ContextBuilderInterface; use ApiPlatform\Core\JsonLd\Serializer\ContextTrait; diff --git a/tests/Bridge/Symfony/Routing/IriConverterTest.php b/tests/Bridge/Symfony/Routing/IriConverterTest.php index a1534456b48..e21b8afcb92 100644 --- a/tests/Bridge/Symfony/Routing/IriConverterTest.php +++ b/tests/Bridge/Symfony/Routing/IriConverterTest.php @@ -11,8 +11,8 @@ namespace ApiPlatform\Core\Tests\Symfony\Bridge\Bundle\DependencyInjection; -use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\Bridge\Symfony\Routing\IriConverter; +use ApiPlatform\Core\DataProvider\ItemDataProviderInterface; use ApiPlatform\Core\Exception\InvalidArgumentException; use ApiPlatform\Core\Metadata\Property\Factory\PropertyMetadataFactoryInterface; use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;