update objectHook dispatch() to match new signature

Author: jwong-dayspring

.github/workflows/ci.yml

@@ -0,0 +1,62 @@
+name: PHP Composer
+
+on:
+  push:
+
+jobs:
+  test:
+    runs-on: ubuntu-22.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php:
+          - '7.4'
+          - '8.0'
+          - '8.1'
+          - '8.2'
+        composer:
+          - ''
+          - '--prefer-lowest'
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Use PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: sqlite3, zip
+          coverage: xdebug
+          tools: composer:v2
+
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: |
+          echo "::set-output name=dir::$(composer config cache-dir)"
+        working-directory: ./
+
+      - name: cache dependencies
+        id: cache-dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.composer }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ matrix.php }}-${{ matrix.composer }}-composer-
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+        working-directory: ./
+
+      - name: Install dependencies
+        env:
+          COMPOSER_FLAGS: ${{ matrix.composer }}
+        run: composer update ${COMPOSER_FLAGS} --prefer-source
+        working-directory: ./
+
+      - name: Run Tests
+        run: composer run-script ci-test
+        working-directory: ./
+        env:
+          SYMFONY_DEPRECATIONS_HELPER: weak

.gitignore

@@ -1,2 +1,6 @@
 vendor
 composer.lock
+
+.phpunit.result.cache
+
+.idea/

composer.json

@@ -4,8 +4,11 @@
     "keywords": [ "propel", "behavior", "event dispatcher", "event" ],
     "license": "MIT",
     "require": {
-        "symfony/event-dispatcher": "~2.1|~3.0|~3.4|^4.4|^5.4",
-        "propel/propel1": "^1.8"
+        "symfony/event-dispatcher": "^4.3|^5.0",
+        "dayspring-tech/propel1": "^1.8"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~8.5.33|^9.0"
     },
     "authors": [
         {
@@ -15,5 +18,11 @@
     ],
     "autoload": {
         "classmap": ["src/"]
+    },
+    "scripts": {
+        "ci-test": [
+            "Composer\\Config::disableProcessTimeout",
+            "vendor/bin/phpunit -c ./phpunit.xml.dist"
+        ]
     }
 }

src/templates/objectHook.php

@@ -1 +1 @@
-self::getEventDispatcher()->dispatch('<?php echo $eventName ?>', new GenericEvent($this<?php if ($withConnection) : ?>, array('connection' => $con)<?php endif; ?>));
+self::getEventDispatcher()->dispatch(new GenericEvent($this<?php if ($withConnection) : ?>, array('connection' => $con)<?php endif; ?>), '<?php echo $eventName ?>');

tests/EventDispatcherBehaviorTest.php

@@ -1,13 +1,12 @@
 <?php
 
-use Symfony\Component\EventDispatcher\Event;
 
 /**
  * @author William Durand <william.durand1@gmail.com>
  */
-class EventDispatcherBehaviorTest extends \PHPUnit_Framework_TestCase
+class EventDispatcherBehaviorTest extends PHPUnit\Framework\TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $tables = array(
             'Post' => <<<EOF
@@ -82,39 +81,39 @@ public function testFireEvent()
 
         $that = $this;
 
-        Post::getEventDispatcher()->addListener(Post::EVENT_POST_HYDRATE, function (Event $event) use (& $postHydrateFired, $that) {
+        Post::getEventDispatcher()->addListener(Post::EVENT_POST_HYDRATE, function (object $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) {
+        Post::getEventDispatcher()->addListener(Post::EVENT_CONSTRUCT, function (object $event) use (& $postConstructFired, $that) {
             $postConstructFired = true;
 
             $that->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
             $that->assertInstanceOf('Post', $event->getSubject());
             $that->assertFalse($event->hasArgument('connection'));
         });
 
-        Thread::getEventDispatcher()->addListener(Thread::EVENT_CONSTRUCT, function (Event $event) use (& $threadConstructFired, $that) {
+        Thread::getEventDispatcher()->addListener(Thread::EVENT_CONSTRUCT, function (object $event) use (& $threadConstructFired, $that) {
             $threadConstructFired = true;
 
             $that->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
             $that->assertInstanceOf('Thread', $event->getSubject());
             $that->assertFalse($event->hasArgument('connection'));
         });
 
-        Post::getEventDispatcher()->addListener(Post::EVENT_PRE_SAVE, function (Event $event) use (& $preSaveFired, $that) {
+        Post::getEventDispatcher()->addListener(Post::EVENT_PRE_SAVE, function (object $event) use (& $preSaveFired, $that) {
             $preSaveFired = true;
 
             $that->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
             $that->assertInstanceOf('Post', $event->getSubject());
             $that->assertInstanceOf('PropelPDO', $event->getArgument('connection'));
         });
 
-        Post::getEventDispatcher()->addListener(Post::EVENT_POST_SAVE, function (Event $event) use (& $postSaveFired, $that) {
+        Post::getEventDispatcher()->addListener(Post::EVENT_POST_SAVE, function (object $event) use (& $postSaveFired, $that) {
             $postSaveFired = true;
 
             $that->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);

tests/EventDispatcherBehaviorWithNamespacesTest.php

@@ -1,14 +1,13 @@
 <?php
 
-use Symfony\Component\EventDispatcher\Event;
 use My\Post;
 
 /**
  * @author William Durand <william.durand1@gmail.com>
  */
-class EventDispatcherBehaviorWithNamespacesTest extends \PHPUnit_Framework_TestCase
+class EventDispatcherBehaviorWithNamespacesTest extends PHPUnit\Framework\TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         if (!class_exists('My\Post')) {
             $schema = <<<EOF
@@ -61,15 +60,15 @@ public function testFireEvent()
         $postSaveFired = false;
 
         $that = $this;
-        Post::getEventDispatcher()->addListener(Post::EVENT_PRE_SAVE, function (Event $event) use (& $preSaveFired, $that) {
+        Post::getEventDispatcher()->addListener(Post::EVENT_PRE_SAVE, function (object $event) use (& $preSaveFired, $that) {
             $preSaveFired = true;
 
             $that->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);
             $that->assertInstanceOf('My\Post', $event->getSubject());
             $that->assertInstanceOf('PropelPDO', $event->getArgument('connection'));
         });
 
-        Post::getEventDispatcher()->addListener(Post::EVENT_POST_SAVE, function (Event $event) use (& $postSaveFired, $that) {
+        Post::getEventDispatcher()->addListener(Post::EVENT_POST_SAVE, function (object $event) use (& $postSaveFired, $that) {
             $postSaveFired = true;
 
             $that->assertInstanceOf('Symfony\Component\EventDispatcher\GenericEvent', $event);

tests/bootstrap.php

@@ -3,4 +3,4 @@
 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';
+require_once __DIR__ . '/../vendor/dayspring-tech/propel1/generator/lib/util/PropelQuickBuilder.php';