Merge pull request #370 from dunglas/style-1.x

sroze · sroze · commit ba958ffd59d4 · 2015-12-14T19:57:57.000+01:00
Fixes style in 1.x branch
diff --git a/Controller/ResourceController.php b/Controller/ResourceController.php
@@ -11,19 +11,19 @@
 
 namespace Dunglas\ApiBundle\Controller;
 
-use Dunglas\ApiBundle\Event\Events;
+use Dunglas\ApiBundle\Api\ResourceInterface;
 use Dunglas\ApiBundle\Event\DataEvent;
+use Dunglas\ApiBundle\Event\Events;
 use Dunglas\ApiBundle\Exception\DeserializationException;
 use Dunglas\ApiBundle\Exception\ExceptionInterface;
-use Dunglas\ApiBundle\Api\ResourceInterface;
 use Dunglas\ApiBundle\Exception\InvalidArgumentException;
-use Dunglas\ApiBundle\Model\PaginatorInterface;
 use Dunglas\ApiBundle\JsonLd\Response;
+use Dunglas\ApiBundle\Model\PaginatorInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Symfony\Component\Validator\ConstraintViolationListInterface;
 use Symfony\Component\Serializer\Exception\ExceptionInterface as SerializerExceptionInterface;
+use Symfony\Component\Validator\ConstraintViolationListInterface;
 
 /**
  * CRUD operations for the API.
diff --git a/DependencyInjection/Compiler/DataProviderPass.php b/DependencyInjection/Compiler/DataProviderPass.php
@@ -11,10 +11,10 @@
 
 namespace Dunglas\ApiBundle\DependencyInjection\Compiler;
 
+use Dunglas\ApiBundle\Exception\RuntimeException;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
-use Dunglas\ApiBundle\Exception\RuntimeException;
 
 /**
  * Injects data managers in the chain.
diff --git a/Doctrine/EventSubscriber.php b/Doctrine/EventSubscriber.php
@@ -11,10 +11,10 @@
 
 namespace Dunglas\ApiBundle\Doctrine;
 
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\Persistence\ManagerRegistry;
-use Dunglas\ApiBundle\Event\Events;
+use Doctrine\Common\Persistence\ObjectManager;
 use Dunglas\ApiBundle\Event\DataEvent;
+use Dunglas\ApiBundle\Event\Events;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
diff --git a/Doctrine/Orm/DataProvider.php b/Doctrine/Orm/DataProvider.php
@@ -13,12 +13,12 @@
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
-use Doctrine\ORM\Tools\Pagination\Paginator as DoctrineOrmPaginator;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\Tools\Pagination\Paginator as DoctrineOrmPaginator;
+use Dunglas\ApiBundle\Api\ResourceInterface;
 use Dunglas\ApiBundle\Doctrine\Orm\Filter\FilterInterface;
 use Dunglas\ApiBundle\Doctrine\Orm\Util\QueryChecker;
 use Dunglas\ApiBundle\Model\DataProviderInterface;
-use Dunglas\ApiBundle\Api\ResourceInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
diff --git a/Doctrine/Orm/Filter/DateFilter.php b/Doctrine/Orm/Filter/DateFilter.php
@@ -104,11 +104,11 @@ public function apply(ResourceInterface $resource, QueryBuilder $queryBuilder, R
      * Adds the where clause according to the chosen null management.
      *
      * @param QueryBuilder $queryBuilder
-     * @param string $alias
-     * @param string $field
-     * @param string $operator
-     * @param string $value
-     * @param int|null $nullManagement
+     * @param string       $alias
+     * @param string       $field
+     * @param string       $operator
+     * @param string       $value
+     * @param int|null     $nullManagement
      */
     private function addWhere(QueryBuilder $queryBuilder, $alias, $field, $operator, $value, $nullManagement)
     {
@@ -155,7 +155,7 @@ public function getDescription(ResourceInterface $resource)
             if (!$this->isPropertyMapped($property, $resource) || !$this->isDateField($property, $resource)) {
                 continue;
             }
-            
+
             $description += $this->getFilterDescription($property, self::PARAMETER_BEFORE);
             $description += $this->getFilterDescription($property, self::PARAMETER_AFTER);
         }
@@ -185,7 +185,7 @@ private function getFilterDescription($fieldName, $period)
     /**
      * Determines whether the given property refers to a date field.
      *
-     * @param string $property
+     * @param string            $property
      * @param ResourceInterface $resource
      *
      * @return array
diff --git a/Doctrine/Orm/Filter/RangeFilter.php b/Doctrine/Orm/Filter/RangeFilter.php
@@ -77,10 +77,10 @@ public function apply(ResourceInterface $resource, QueryBuilder $queryBuilder, R
      * Adds the where clause according to the operator.
      *
      * @param QueryBuilder $queryBuilder
-     * @param string $alias
-     * @param string $field
-     * @param string $operator
-     * @param string $value
+     * @param string       $alias
+     * @param string       $field
+     * @param string       $operator
+     * @param string       $value
      */
     private function addWhere(QueryBuilder $queryBuilder, $alias, $field, $operator, $value)
     {
diff --git a/FosUser/EventSubscriber.php b/FosUser/EventSubscriber.php
@@ -11,10 +11,10 @@
 
 namespace Dunglas\ApiBundle\FosUser;
 
-use Dunglas\ApiBundle\Event\Events;
 use Dunglas\ApiBundle\Event\DataEvent;
-use FOS\UserBundle\Model\UserManagerInterface;
+use Dunglas\ApiBundle\Event\Events;
 use FOS\UserBundle\Model\UserInterface;
+use FOS\UserBundle\Model\UserManagerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
diff --git a/Hydra/Serializer/CollectionNormalizer.php b/Hydra/Serializer/CollectionNormalizer.php
@@ -76,7 +76,7 @@ public function supportsNormalization($data, $format = null)
     /**
      * {@inheritdoc}
      */
-    public function normalize($object, $format = null, array $context = array())
+    public function normalize($object, $format = null, array $context = [])
     {
         $resource = $this->guessResource($object, $context);
 
diff --git a/Hydra/Serializer/ConstraintViolationListNormalizer.php b/Hydra/Serializer/ConstraintViolationListNormalizer.php
@@ -31,6 +31,7 @@ public function __construct(RouterInterface $router)
     {
         $this->router = $router;
     }
+
     /**
      * {@inheritdoc}
      */
diff --git a/Hydra/Serializer/ErrorNormalizer.php b/Hydra/Serializer/ErrorNormalizer.php
@@ -46,7 +46,7 @@ public function __construct(RouterInterface $router, $debug)
     /**
      * {@inheritdoc}
      */
-    public function normalize($object, $format = null, array $context = array())
+    public function normalize($object, $format = null, array $context = [])
     {
         if ($object instanceof \Exception || $object instanceof FlattenException) {
             $message = $object->getMessage();
diff --git a/JsonLd/Serializer/ItemNormalizer.php b/JsonLd/Serializer/ItemNormalizer.php
@@ -18,9 +18,9 @@
 use Dunglas\ApiBundle\Exception\InvalidArgumentException;
 use Dunglas\ApiBundle\Exception\RuntimeException;
 use Dunglas\ApiBundle\JsonLd\ContextBuilder;
-use Dunglas\ApiBundle\Mapping\ClassMetadataInterface;
-use Dunglas\ApiBundle\Mapping\ClassMetadataFactoryInterface;
 use Dunglas\ApiBundle\Mapping\AttributeMetadataInterface;
+use Dunglas\ApiBundle\Mapping\ClassMetadataFactoryInterface;
+use Dunglas\ApiBundle\Mapping\ClassMetadataInterface;
 use Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 use Symfony\Component\Serializer\Exception\CircularReferenceException;
diff --git a/Mapping/Loader/AttributesLoader.php b/Mapping/Loader/AttributesLoader.php
@@ -142,7 +142,7 @@ public function loadClassMetadata(
                 if ($attribute->isIdentifier()) {
                     continue;
                 }
-                $attributeGroups = isset($normalizationAttributes[$attribute->getName()]) ? $normalizationAttributes[$attribute->getName()]->getGroups() : array();
+                $attributeGroups = isset($normalizationAttributes[$attribute->getName()]) ? $normalizationAttributes[$attribute->getName()]->getGroups() : [];
                 $readable = true;
                 $writable = true;
 
diff --git a/Routing/Router.php b/Routing/Router.php
@@ -56,7 +56,7 @@ public function getRouteCollection()
         return $this->router->getRouteCollection();
     }
 
-    /*
+    /**
      * {@inheritdoc}
      */
     public function match($pathInfo)
@@ -78,7 +78,7 @@ public function match($pathInfo)
         }
     }
 
-    /*
+    /**
      * {@inheritdoc}
      */
     public function generate($name, $parameters = [], $referenceType = self::ABSOLUTE_PATH)
diff --git a/Tests/Behat/TestBundle/Entity/CustomNormalizedDummy.php b/Tests/Behat/TestBundle/Entity/CustomNormalizedDummy.php
@@ -83,7 +83,7 @@ public function getAlias()
         return $this->alias;
     }
 
-    /**n
+    /**
      * @param string $alias
      */
     public function setAlias($alias)
diff --git a/Tests/Behat/TestBundle/Entity/Dummy.php b/Tests/Behat/TestBundle/Entity/Dummy.php
@@ -91,7 +91,7 @@ class Dummy
      */
     public $relatedDummies;
     /**
-     * @var Array serialize data.
+     * @var array serialize data.
      *
      * @ORM\Column(type="json_array", nullable=true)
      */
@@ -106,7 +106,7 @@ class Dummy
     public function __construct()
     {
         $this->relatedDummies = new ArrayCollection();
-        $this->jsonData = array();
+        $this->jsonData = [];
     }
 
     public function getId()
diff --git a/Tests/Behat/TestBundle/Entity/RelatedDummy.php b/Tests/Behat/TestBundle/Entity/RelatedDummy.php
@@ -11,8 +11,8 @@
 
 namespace Dunglas\ApiBundle\Tests\Behat\TestBundle\Entity;
 
-use Dunglas\ApiBundle\Annotation\Iri;
 use Doctrine\ORM\Mapping as ORM;
+use Dunglas\ApiBundle\Annotation\Iri;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints as Assert;
 
diff --git a/Tests/Doctrine/Orm/Filter/DateFilterTest.php b/Tests/Doctrine/Orm/Filter/DateFilterTest.php
@@ -12,14 +12,15 @@
 namespace Dunglas\ApiBundle\Tests\Doctrine\Orm\Filter;
 
 use Doctrine\Common\Persistence\ManagerRegistry;
-use Dunglas\ApiBundle\Tests\Behat\TestBundle\Entity\Dummy;
-use Dunglas\ApiBundle\Doctrine\Orm\Filter\DateFilter;
 use Doctrine\ORM\EntityRepository;
 use Dunglas\ApiBundle\Api\Resource;
+use Dunglas\ApiBundle\Api\ResourceInterface;
+use Dunglas\ApiBundle\Doctrine\Orm\Filter\DateFilter;
+use Dunglas\ApiBundle\Tests\Behat\TestBundle\Entity\Dummy;
+use phpmock\phpunit\PHPMock;
 use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;
-use phpmock\phpunit\PHPMock;
 
 /**
  * @author Théo FIDRY <theo.fidry@gmail.com>
@@ -40,7 +41,7 @@ class DateFilterTest extends KernelTestCase
     private $repository;
 
     /**
-     * @var Resource
+     * @var ResourceInterface
      */
     protected $resource;
 
diff --git a/Tests/Doctrine/Orm/Filter/OrderFilterTest.php b/Tests/Doctrine/Orm/Filter/OrderFilterTest.php
@@ -14,6 +14,7 @@
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityRepository;
 use Dunglas\ApiBundle\Api\Resource;
+use Dunglas\ApiBundle\Api\ResourceInterface;
 use Dunglas\ApiBundle\Doctrine\Orm\Filter\OrderFilter;
 use phpmock\phpunit\PHPMock;
 use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
@@ -39,7 +40,7 @@ class OrderFilterTest extends KernelTestCase
     private $repository;
 
     /**
-     * @var Resource
+     * @var ResourceInterface
      */
     protected $resource;
 
diff --git a/Tests/Doctrine/Orm/Filter/RangeFilterTest.php b/Tests/Doctrine/Orm/Filter/RangeFilterTest.php
@@ -14,6 +14,7 @@
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\ORM\EntityRepository;
 use Dunglas\ApiBundle\Api\Resource;
+use Dunglas\ApiBundle\Api\ResourceInterface;
 use Dunglas\ApiBundle\Doctrine\Orm\Filter\RangeFilter;
 use Dunglas\ApiBundle\Exception\InvalidArgumentException;
 use Dunglas\ApiBundle\Tests\Behat\TestBundle\Entity\Dummy;
@@ -40,7 +41,7 @@ class RangeFilterTest extends KernelTestCase
     private $repository;
 
     /**
-     * @var Resource
+     * @var ResourceInterface
      */
     protected $resource;
 
@@ -70,15 +71,15 @@ public function testApply(array $filterParameters, array $query, $expected)
 
         $uniqid = $this->getFunctionMock('Dunglas\ApiBundle\Doctrine\Orm\Util', 'uniqid');
         $uniqid->expects($this->any())->willReturn('123456abcdefg');
-        
+
         try {
             $filter->apply($this->resource, $queryBuilder, $request);
         } catch (InvalidArgumentException $e) {
         }
 
         $actual = strtolower($queryBuilder->getQuery()->getDQL());
         $expected = strtolower($expected);
-        
+
         $this->assertEquals(
             $expected,
             $actual,
diff --git a/Tests/Fixtures/Query.php b/Tests/Fixtures/Query.php
@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the DunglasApiBundle package.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Dunglas\ApiBundle\Tests\Fixtures;
 
 /**
@@ -10,6 +19,7 @@ class Query
     public function getFirstResult()
     {
     }
+
     public function getMaxResults()
     {
     }
diff --git a/Tests/Routing/RouterTest.php b/Tests/Routing/RouterTest.php
@@ -14,7 +14,6 @@
 use Dunglas\ApiBundle\Routing\Router;
 use Prophecy\Argument;
 use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\Router as SymfonyRouter;
 use Symfony\Component\Routing\RouteCollection;
 use Symfony\Component\Routing\RouterInterface;
 

Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,11 @@ public function apply(ResourceInterface $resource, QueryBuilder $queryBuilder, R`
`104`	`104`	`* Adds the where clause according to the chosen null management.`
`105`	`105`	`*`
`106`	`106`	`* @param QueryBuilder $queryBuilder`
`107`		`- * @param string $alias`
`108`		`- * @param string $field`
`109`		`- * @param string $operator`
`110`		`- * @param string $value`
`111`		`- * @param int\|null $nullManagement`
	`107`	`+ * @param string $alias`
	`108`	`+ * @param string $field`
	`109`	`+ * @param string $operator`
	`110`	`+ * @param string $value`
	`111`	`+ * @param int\|null $nullManagement`
`112`	`112`	`*/`
`113`	`113`	`private function addWhere(QueryBuilder $queryBuilder, $alias, $field, $operator, $value, $nullManagement)`
`114`	`114`	`{`
`@@ -155,7 +155,7 @@ public function getDescription(ResourceInterface $resource)`
`155`	`155`	`if (!$this->isPropertyMapped($property, $resource) \|\| !$this->isDateField($property, $resource)) {`
`156`	`156`	`continue;`
`157`	`157`	`}`
`158`		`-`
	`158`	`+`
`159`	`159`	`$description += $this->getFilterDescription($property, self::PARAMETER_BEFORE);`
`160`	`160`	`$description += $this->getFilterDescription($property, self::PARAMETER_AFTER);`
`161`	`161`	`}`
`@@ -185,7 +185,7 @@ private function getFilterDescription($fieldName, $period)`
`185`	`185`	`/**`
`186`	`186`	`* Determines whether the given property refers to a date field.`
`187`	`187`	`*`
`188`		`- * @param string $property`
	`188`	`+ * @param string $property`
`189`	`189`	`* @param ResourceInterface $resource`
`190`	`190`	`*`
`191`	`191`	`* @return array`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function supportsNormalization($data, $format = null)`
`76`	`76`	`/**`
`77`	`77`	`* {@inheritdoc}`
`78`	`78`	`*/`
`79`		`- public function normalize($object, $format = null, array $context = array())`
	`79`	`+ public function normalize($object, $format = null, array $context = [])`
`80`	`80`	`{`
`81`	`81`	`$resource = $this->guessResource($object, $context);`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public function __construct(RouterInterface $router)`
`31`	`31`	`{`
`32`	`32`	`$this->router = $router;`
`33`	`33`	`}`
	`34`	`+`
`34`	`35`	`/**`
`35`	`36`	`* {@inheritdoc}`
`36`	`37`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function __construct(RouterInterface $router, $debug)`
`46`	`46`	`/**`
`47`	`47`	`* {@inheritdoc}`
`48`	`48`	`*/`
`49`		`- public function normalize($object, $format = null, array $context = array())`
	`49`	`+ public function normalize($object, $format = null, array $context = [])`
`50`	`50`	`{`
`51`	`51`	`if ($object instanceof \Exception \|\| $object instanceof FlattenException) {`
`52`	`52`	`$message = $object->getMessage();`