From a67332fb51e0572b3d8edba4ae6a1c9b979ac8fb Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Thu, 22 Jan 2015 12:11:03 +0100
Subject: [PATCH] #1176 DDC-3378 - minor CS fixes (imports, spacing, IDE hints)

---
 lib/Doctrine/ORM/Id/AssignedGenerator.php        |  3 +--
 lib/Doctrine/ORM/Utility/IdentifierFlattener.php | 14 ++++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/lib/Doctrine/ORM/Id/AssignedGenerator.php b/lib/Doctrine/ORM/Id/AssignedGenerator.php
index 9bdaa0efc..447dbd6d5 100644
--- a/lib/Doctrine/ORM/Id/AssignedGenerator.php
+++ b/lib/Doctrine/ORM/Id/AssignedGenerator.php
@@ -40,8 +40,7 @@ class AssignedGenerator extends AbstractIdGenerator
      *
      * @throws \Doctrine\ORM\ORMException
      */
-    public function generate(
-        EntityManager $em, $entity)
+    public function generate(EntityManager $em, $entity)
     {
         $class      = $em->getClassMetadata(get_class($entity));
         $idFields   = $class->getIdentifierFieldNames();
diff --git a/lib/Doctrine/ORM/Utility/IdentifierFlattener.php b/lib/Doctrine/ORM/Utility/IdentifierFlattener.php
index d16da3255..166e0acb6 100644
--- a/lib/Doctrine/ORM/Utility/IdentifierFlattener.php
+++ b/lib/Doctrine/ORM/Utility/IdentifierFlattener.php
@@ -36,22 +36,22 @@ final class IdentifierFlattener
     /**
      * The UnitOfWork used to coordinate object-level transactions.
      *
-     * @var \Doctrine\ORM\UnitOfWork
+     * @var UnitOfWork
      */
     private $unitOfWork;
 
     /**
      * The metadata factory, used to retrieve the ORM metadata of entity classes.
      *
-     * @var \Doctrine\Common\Persistence\Mapping\ClassMetadataFactory
+     * @var ClassMetadataFactory
      */
     private $metadataFactory;
 
     /**
      * Initializes a new IdentifierFlattener instance, bound to the given EntityManager.
      *
-     * @param \Doctrine\ORM\UnitOfWork $unitOfWork
-     * @param \Doctrine\Common\Persistence\Mapping\ClassMetadataFactory $metadataFactory
+     * @param UnitOfWork           $unitOfWork
+     * @param ClassMetadataFactory $metadataFactory
      */
     public function __construct(UnitOfWork $unitOfWork, ClassMetadataFactory $metadataFactory)
     {
@@ -62,8 +62,9 @@ final class IdentifierFlattener
     /**
      * convert foreign identifiers into scalar foreign key values to avoid object to string conversion failures.
      *
-     * @param \Doctrine\ORM\Mapping\ClassMetadata $class
-     * @param array $id
+     * @param ClassMetadata $class
+     * @param array         $id
+     *
      * @return array
      */
     public function flattenIdentifier(ClassMetadata $class, array $id)
@@ -72,6 +73,7 @@ final class IdentifierFlattener
 
         foreach ($id as $idField => $idValue) {
             if (isset($class->associationMappings[$idField]) && is_object($idValue)) {
+                /* @var $targetClassMetadata ClassMetadata */
                 $targetClassMetadata = $this->metadataFactory->getMetadataFor(
                     $class->associationMappings[$idField]['targetEntity']
                 );