Author: Kris.Wallsmith
Date: 2010-04-05 02:27:39 +0200 (Mon, 05 Apr 2010)
New Revision: 28976

Modified:
   
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
   
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
Log:
[1.3, 1.4] added expansion of short listeners syntax when merging schemas 
(closes #7701, refs #8449)

Modified: 
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
===================================================================
--- 
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php 
    2010-04-05 00:26:03 UTC (rev 28975)
+++ 
branches/1.3/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php 
    2010-04-05 00:27:39 UTC (rev 28976)
@@ -268,6 +268,19 @@
       }
     }
 
+    // expand short "listeners" syntax
+    if (isset($definition['listeners']))
+    {
+      foreach ($definition['listeners'] as $key => $value)
+      {
+        if (is_numeric($key))
+        {
+          $definition['listeners'][$value] = array();
+          unset($definition['listeners'][$key]);
+        }
+      }
+    }
+
     return $definition;
   }
 }

Modified: 
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
===================================================================
--- 
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php 
    2010-04-05 00:26:03 UTC (rev 28975)
+++ 
branches/1.4/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php 
    2010-04-05 00:27:39 UTC (rev 28976)
@@ -268,6 +268,19 @@
       }
     }
 
+    // expand short "listeners" syntax
+    if (isset($definition['listeners']))
+    {
+      foreach ($definition['listeners'] as $key => $value)
+      {
+        if (is_numeric($key))
+        {
+          $definition['listeners'][$value] = array();
+          unset($definition['listeners'][$key]);
+        }
+      }
+    }
+
     return $definition;
   }
 }

-- 
You received this message because you are subscribed to the Google Groups 
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/symfony-svn?hl=en.

Reply via email to