Made it compatible to Propel2 alpha 3.

marcj · Nov 14, 2014 · 7cd46fb · 7cd46fb
1 parent 2b64c84
commit 7cd46fb
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,8 @@ EventDispatcherBehavior
 
 [![Build Status](https://secure.travis-ci.org/willdurand/EventDispatcherBehavior.png?branch=master)](http://travis-ci.org/willdurand/EventDispatcherBehavior)
 
-Integrate the Symfony2 [EventDispatcher](https://github.com/symfony/EventDispatcher) component in your Model classes.
+Integrate the Symfony2 [EventDispatcher](https://github.com/symfony/EventDispatcher) component in your Model classes for Propel 2 alpha 3.
+Final Propel 2 release will have this integrated into core. This is only for guys using Propel 2 already till alpha 3 and need those behavior.
 
 
 ### Installation ###

diff --git a/composer.json b/composer.json
@@ -1,11 +1,10 @@
 {
-    "name": "willdurand/propel-eventdispatcher-behavior",
-    "description": "Integrates the Symfony2 EventDispatcher component in your Model classes. ",
-    "keywords": [ "propel", "behavior", "event dispatcher", "event" ],
+    "name": "marcj/propel-eventdispatcher-behavior",
+    "description": "Integrates the Symfony2 EventDispatcher component in your Model classes for Propel2 alpha 3. ",
+    "keywords": [ "propel2", "behavior", "event dispatcher", "event" ],
     "license": "MIT",
     "require": {
-        "symfony/event-dispatcher": "~2.1",
-        "propel/propel1": "~1.6"
+        "symfony/event-dispatcher": "~2.1"
     },
     "authors": [
         {

diff --git a/src/EventDispatcherBehavior.php b/src/EventDispatcherBehavior.php
@@ -3,7 +3,7 @@
 /**
  * @author William Durand <[email protected]>
  */
-class EventDispatcherBehavior extends Behavior
+class EventDispatcherBehavior extends \Propel\Generator\Model\Behavior
 {
     /**
      * @var EventDispatcherObjectBuilderModifier

diff --git a/src/EventDispatcherObjectBuilderModifier.php b/src/EventDispatcherObjectBuilderModifier.php
@@ -7,7 +7,7 @@ class EventDispatcherObjectBuilderModifier
 {
     private $behavior;
 
-    public function __construct(Behavior $behavior)
+    public function __construct(\Propel\Generator\Model\Behavior $behavior)
     {
         $this->behavior = $behavior;
     }
@@ -73,14 +73,6 @@ public function addConstructHook()
         )) . '    ';
     }
 
-    public function postHydrate()
-    {
-        return $this->behavior->renderTemplate('objectHook', array(
-            'eventName'      => $this->getEventName('post_hydrate'),
-            'withConnection' => false,
-        ));
-    }
-
     public function preSave()
     {
         return $this->behavior->renderTemplate('objectHook', array(
@@ -147,14 +139,14 @@ public function postDelete()
 
     public function objectFilter(&$script)
     {
-        $script = preg_replace('#(implements Persistent)#', '$1, EventDispatcherAwareModelInterface', $script);
+        $script = preg_replace('#(implements ActiveRecordInterface)#', '$1, \EventDispatcherAwareModelInterface', $script);
 
         // rename the dummy_construct to __construct if __construct does not exists
         if (strpos($script, 'function __construct') === false) {
             $script = str_replace('function dummy_construct', 'function __construct', $script);
         }
 
-        $parser = new PropelPHPParser($script, true);
+        $parser = new \Propel\Generator\Util\PhpParser($script, true);
         $parser->removeMethod('dummy_construct');
         $oldCode = $parser->findMethod('__construct');
         $newCode = substr_replace($oldCode, $this->addConstructHook() . '}', strrpos($oldCode, '}'));

diff --git a/tests/EventDispatcherBehaviorTest.php b/tests/EventDispatcherBehaviorTest.php
@@ -16,7 +16,7 @@ public function setUp()
         <column name="id" required="true" primaryKey="true" autoIncrement="true" type="INTEGER" />
         <column name="name" type="VARCHAR" required="true" />
 
-        <behavior name="event_dispatcher" />
+        <behavior name="\EventDispatcherBehavior" />
     </table>
 </database>
 EOF
@@ -28,17 +28,16 @@ public function setUp()
         <column name="text" type="VARCHAR" required="true" />
         <column name="allowed" type="boolean" required="true" defaultValue="false" />
 
-        <behavior name="event_dispatcher" />
+        <behavior name="\EventDispatcherBehavior" />
     </table>
 </database>
 EOF
         );
 
         foreach ($tables as $className => $schema) {
             if (!class_exists($className)) {
-                $builder = new PropelQuickBuilder();
+                $builder = new \Propel\Generator\Util\QuickBuilder();
                 $config  = $builder->getConfig();
-                $config->setBuildProperty('behavior.event_dispatcher.class', '../src/EventDispatcherBehavior');
                 $builder->setConfig($config);
                 $builder->setSchema($schema);
 
@@ -77,19 +76,10 @@ public function testFireEvent()
         $preSaveFired  = false;
         $postSaveFired = false;
         $postConstructFired = false;
-        $postHydrateFired  = false;
         $threadConstructFired = false;
 
         $that = $this;
 
-        Post::getEventDispatcher()->addListener(Post::EVENT_POST_HYDRATE, function (Event $event) use (& $postHydrateFired, $that) {
-            $postHydrateFired = true;
-
-            $that->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
-            $that->assertInstanceOf('Post', $event->getSubject());
-            $that->assertFalse($event->hasArgument('connection'));
-        });
-
         Post::getEventDispatcher()->addListener(Post::EVENT_CONSTRUCT, function (Event $event) use (& $postConstructFired, $that) {
             $postConstructFired = true;
 
@@ -111,29 +101,27 @@ public function testFireEvent()
 
             $that->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
             $that->assertInstanceOf('Post', $event->getSubject());
-            $that->assertInstanceOf('PropelPDO', $event->getArgument('connection'));
+            $that->assertInstanceOf('Propel\Runtime\Connection\ConnectionInterface',  $event->getArgument('connection'));
         });
 
         Post::getEventDispatcher()->addListener(Post::EVENT_POST_SAVE, function (Event $event) use (& $postSaveFired, $that) {
             $postSaveFired = true;
 
             $that->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
             $that->assertInstanceOf('Post', $event->getSubject());
-            $that->assertInstanceOf('PropelPDO', $event->getArgument('connection'));
+            $that->assertInstanceOf('Propel\Runtime\Connection\ConnectionInterface', $event->getArgument('connection'));
         });
 
         new Thread();
         $this->assertTrue($threadConstructFired);
 
-
         $post = new Post();
         $this->assertTrue($postConstructFired);
 
         $post->setName('a-name');
         $post->save();
         $post->reload();
 
-        $this->assertTrue($postHydrateFired);
         $this->assertTrue($preSaveFired);
         $this->assertTrue($postSaveFired);
     }

diff --git a/tests/EventDispatcherBehaviorWithNamespacesTest.php b/tests/EventDispatcherBehaviorWithNamespacesTest.php
@@ -17,14 +17,13 @@ public function setUp()
         <column name="id" required="true" primaryKey="true" autoIncrement="true" type="INTEGER" />
         <column name="name" type="VARCHAR" required="true" />
 
-        <behavior name="event_dispatcher" />
+        <behavior name="\EventDispatcherBehavior" />
     </table>
 </database>
 EOF;
 
-            $builder = new PropelQuickBuilder();
+            $builder = new \Propel\Generator\Util\QuickBuilder();
             $config  = $builder->getConfig();
-            $config->setBuildProperty('behavior.event_dispatcher.class', '../src/EventDispatcherBehavior');
             $builder->setConfig($config);
             $builder->setSchema($schema);
 
@@ -66,15 +65,15 @@ public function testFireEvent()
 
             $that->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
             $that->assertInstanceOf('My\Post', $event->getSubject());
-            $that->assertInstanceOf('PropelPDO', $event->getArgument('connection'));
+            $that->assertInstanceOf('Propel\Runtime\Connection\ConnectionInterface', $event->getArgument('connection'));
         });
 
         Post::getEventDispatcher()->addListener(Post::EVENT_POST_SAVE, function (Event $event) use (& $postSaveFired, $that) {
             $postSaveFired = true;
 
             $that->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
             $that->assertInstanceOf('My\Post', $event->getSubject());
-            $that->assertInstanceOf('PropelPDO', $event->getArgument('connection'));
+            $that->assertInstanceOf('Propel\Runtime\Connection\ConnectionInterface', $event->getArgument('connection'));
         });
 
         $post = new Post();

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,6 +1,3 @@
 <?php
 
 require_once __DIR__ . '/../vendor/autoload.php';
-set_include_path(__DIR__ . '/../vendor/phing/phing/classes' . PATH_SEPARATOR . get_include_path());
-
-require_once __DIR__ . '/../vendor/propel/propel1/generator/lib/util/PropelQuickBuilder.php';