From b2eeac564026d97647b67d7af618f8a5354f030d Mon Sep 17 00:00:00 2001
From: "Jonathan H. Wage" <jonwage@gmail.com>
Date: Wed, 14 Apr 2010 20:41:41 -0400
Subject: [PATCH] Fixing strict standards notice

---
 lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php
index a1fd97bb1..d0eb5e9f0 100644
--- a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php
+++ b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php
@@ -41,7 +41,8 @@ class ConvertDoctrine1Schema
     private $_legacyTypeMap = array(
         // TODO: This list may need to be updated
         'clob' => 'text',
-        'timestamp' => 'datetime'
+        'timestamp' => 'datetime',
+        'enum' => 'string'
     );
 
     /**
@@ -238,6 +239,7 @@ class ConvertDoctrine1Schema
                 if (isset($relation['refClass'])) {
                     $type = 'many';
                     $foreignType = 'many';
+                    $joinColumns = array();
                 } else {
                     $type = isset($relation['type']) ? $relation['type'] : 'one';
                     $foreignType = isset($relation['foreignType']) ? $relation['foreignType'] : 'many';