Move properties in IdentifierManagerTrait and fix CS.

Author: dunglas

src/Bridge/Doctrine/Orm/ItemDataProvider.php

@@ -32,17 +32,16 @@
  */
 class ItemDataProvider implements ItemDataProviderInterface
 {
+    use IdentifierManagerTrait;
+
     private $managerRegistry;
-    private $propertyNameCollectionFactory;
-    private $propertyMetadataFactory;
     private $itemExtensions;
 
-    use IdentifierManagerTrait;
-
     /**
-     * @param ManagerRegistry               $managerRegistry
-     * @param IdentifierManagerInterface    $identifierManager
-     * @param QueryItemExtensionInterface[] $itemExtensions
+     * @param ManagerRegistry                        $managerRegistry
+     * @param PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory
+     * @param PropertyMetadataFactoryInterface       $propertyMetadataFactory
+     * @param QueryItemExtensionInterface[]          $itemExtensions
      */
     public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory, array $itemExtensions = [])
     {

src/Bridge/Doctrine/Orm/Util/IdentifierManagerTrait.php

@@ -19,6 +19,9 @@
  */
 trait IdentifierManagerTrait
 {
+    private $propertyNameCollectionFactory;
+    private $propertyMetadataFactory;
+
     /**
      * Transform and check the identifier, composite or not.
      *

tests/Bridge/Doctrine/Util/IdentifierManagerTraitTest.php

@@ -23,8 +23,6 @@
 class IdentifierManagerTraitImpl
 {
     use IdentifierManagerTrait;
-    private $propertyNameCollectionFactory;
-    private $propertyMetadataFactory;
 
     public function __construct(PropertyNameCollectionFactoryInterface $propertyNameCollectionFactory, PropertyMetadataFactoryInterface $propertyMetadataFactory)
     {