From aaa644395403d853c3f5a8a053658dcd11231133 Mon Sep 17 00:00:00 2001
From: Marco Pivetta <ocramius@gmail.com>
Date: Sat, 17 Jan 2015 02:45:50 +0100
Subject: [PATCH] #1178 - `PersisterHelper::getTypeOfColumn()` should not fail
 silently, as that makes persister bugs impossible to spot

---
 lib/Doctrine/ORM/Utility/PersisterHelper.php | 29 +++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/lib/Doctrine/ORM/Utility/PersisterHelper.php b/lib/Doctrine/ORM/Utility/PersisterHelper.php
index 5567f3fdd..28b7748ed 100644
--- a/lib/Doctrine/ORM/Utility/PersisterHelper.php
+++ b/lib/Doctrine/ORM/Utility/PersisterHelper.php
@@ -107,7 +107,9 @@ class PersisterHelper
      * @param ClassMetadata          $class
      * @param EntityManagerInterface $em
      *
-     * @return string|null
+     * @return string
+     *
+     * @throws \RuntimeException
      */
     public static function getTypeOfColumn($columnName, ClassMetadata $class, EntityManagerInterface $em)
     {
@@ -117,10 +119,9 @@ class PersisterHelper
             if (isset($class->fieldMappings[$fieldName])) {
                 return $class->fieldMappings[$fieldName]['type'];
             }
-
-            return null;
         }
 
+        // iterate over to-one association mappings
         foreach ($class->associationMappings as $assoc) {
             if ( ! isset($assoc['joinColumns'])) {
                 continue;
@@ -136,6 +137,26 @@ class PersisterHelper
             }
         }
 
-        return null;
+        // iterate over to-many association mappings
+        foreach ($class->associationMappings as $assoc) {
+            if ( ! (isset($assoc['joinTable']) && isset($assoc['joinTable']['joinColumns']))) {
+                continue;
+            }
+
+            foreach ($assoc['joinTable']['joinColumns'] as $joinColumn) {
+                if ($joinColumn['name'] == $columnName) {
+                    $targetColumnName = $joinColumn['referencedColumnName'];
+                    $targetClass      = $em->getClassMetadata($assoc['targetEntity']);
+
+                    return self::getTypeOfColumn($targetColumnName, $targetClass, $em);
+                }
+            }
+        }
+
+        throw new \RuntimeException(sprintf(
+            'Could not resolve type of column "%s" of class "%s"',
+            $columnName,
+            $class->getName()
+        ));
     }
 }