From 66c556fbfd53bc019aecfd9f2f5ec99d6df59483 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Tue, 13 Jan 2015 02:48:57 +0100
Subject: [PATCH] #1240 DDC-3479 - Fixing minor CS issues (naming, alignment)

---
 lib/Doctrine/ORM/EntityNotFoundException.php | 16 +++++++---
 lib/Doctrine/ORM/Proxy/ProxyFactory.php      | 32 ++++++++++++++------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/lib/Doctrine/ORM/EntityNotFoundException.php b/lib/Doctrine/ORM/EntityNotFoundException.php
index 3a7024dc3..7062112fc 100644
--- a/lib/Doctrine/ORM/EntityNotFoundException.php
+++ b/lib/Doctrine/ORM/EntityNotFoundException.php
@@ -29,15 +29,21 @@ class EntityNotFoundException extends ORMException
 {
     /**
      * Constructor.
+     *
+     * @param string   $className
+     * @param string[] $id
      */
-    public function __construct($class, array $id = array())
+    public function __construct($className, array $id = array())
     {
         $ids = array();
+
         foreach ($id as $key => $value) {
-            $ids[] = "{$key}({$value})";
+            $ids[] = $key . '(' . $value . ')';
         }
-        $idsFormatted = implode(', ', $ids);
-        $message = "Entity of type '" . $class . "'" . ($idsFormatted ? ' for IDs ' . $idsFormatted : '') . ' was not found';
-        parent::__construct($message);
+
+
+        parent::__construct(
+            'Entity of type \'' . $className . '\'' . ($ids ? ' for IDs ' . implode(', ', $ids) : '') . ' was not found'
+        );
     }
 }
diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php
index 2c170466f..5ecd883cf 100644
--- a/lib/Doctrine/ORM/Proxy/ProxyFactory.php
+++ b/lib/Doctrine/ORM/Proxy/ProxyFactory.php
@@ -147,13 +147,17 @@ class ProxyFactory extends AbstractProxyFactory
                 $proxy->__setInitialized(true);
                 $proxy->__wakeup();
 
-                $id = $classMetadata->getIdentifierValues($proxy);
-                if (null === $entityPersister->loadById($id, $proxy)) {
+                $identifier = $classMetadata->getIdentifierValues($proxy);
+
+                if (null === $entityPersister->loadById($identifier, $proxy)) {
                     $proxy->__setInitializer($initializer);
                     $proxy->__setCloner($cloner);
                     $proxy->__setInitialized(false);
 
-                    throw new EntityNotFoundException($classMetadata->getName(), $identifierFlattener->flattenIdentifier($classMetadata, $id));
+                    throw new EntityNotFoundException(
+                        $classMetadata->getName(),
+                        $identifierFlattener->flattenIdentifier($classMetadata, $identifier)
+                    );
                 }
             };
         }
@@ -179,13 +183,17 @@ class ProxyFactory extends AbstractProxyFactory
 
             $proxy->__setInitialized(true);
 
-            $id = $classMetadata->getIdentifierValues($proxy);
-            if (null === $entityPersister->loadById($id, $proxy)) {
+            $identifier = $classMetadata->getIdentifierValues($proxy);
+
+            if (null === $entityPersister->loadById($identifier, $proxy)) {
                 $proxy->__setInitializer($initializer);
                 $proxy->__setCloner($cloner);
                 $proxy->__setInitialized(false);
 
-                throw new EntityNotFoundException($classMetadata->getName(), $identifierFlattener->flattenIdentifier($classMetadata, $id));
+                throw new EntityNotFoundException(
+                    $classMetadata->getName(),
+                    $identifierFlattener->flattenIdentifier($classMetadata, $identifier)
+                );
             }
         };
     }
@@ -203,6 +211,7 @@ class ProxyFactory extends AbstractProxyFactory
     private function createCloner(ClassMetadata $classMetadata, EntityPersister $entityPersister)
     {
         $identifierFlattener = $this->identifierFlattener;
+
         return function (BaseProxy $proxy) use ($entityPersister, $classMetadata, $identifierFlattener) {
             if ($proxy->__isInitialized()) {
                 return;
@@ -211,12 +220,15 @@ class ProxyFactory extends AbstractProxyFactory
             $proxy->__setInitialized(true);
             $proxy->__setInitializer(null);
 
-            $class    = $entityPersister->getClassMetadata();
-            $id       = $classMetadata->getIdentifierValues($proxy);
-            $original = $entityPersister->loadById($id);
+            $class      = $entityPersister->getClassMetadata();
+            $identifier = $classMetadata->getIdentifierValues($proxy);
+            $original   = $entityPersister->loadById($identifier);
 
             if (null === $original) {
-                throw new EntityNotFoundException($classMetadata->getName(), $identifierFlattener->flattenIdentifier($classMetadata, $id));
+                throw new EntityNotFoundException(
+                    $classMetadata->getName(),
+                    $identifierFlattener->flattenIdentifier($classMetadata, $identifier)
+                );
             }
 
             foreach ($class->getReflectionClass()->getProperties() as $property) {