Fixed deprecations, updated requirements (#13)

* Fixed deprecations, updated requirements

* Update MockUpdate namespace

Co-authored-by: Jean-Gui <jean-gui@w3.org>

Author: toooni

.travis.yml

@@ -3,10 +3,7 @@ sudo: false
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - hhvm
+  - 7.4
 
 env:
   global:
@@ -15,12 +12,8 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 7.0
-    - php: 5.6
-    - php: 7.1
+    - php: 7.4
       env: DEPENDENCIES=beta
-  allow_failures:
-    - php: hhvm
 
 before_install:
   - if [ "$DEPENDENCIES" = "beta" ]; then composer config minimum-stability beta; fi;

Services/LifecycleEventsDispatcher.php

@@ -2,8 +2,8 @@
 
 namespace W3C\LifecycleEventsBundle\Services;
 
-use Doctrine\Common\Persistence\Event\LifecycleEventArgs;
-use Doctrine\Common\Persistence\Event\PreUpdateEventArgs;
+use Doctrine\Persistence\Event\LifecycleEventArgs;
+use Doctrine\Persistence\Event\PreUpdateEventArgs;
 use Doctrine\Common\Util\ClassUtils;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use W3C\LifecycleEventsBundle\Annotation\Change;
@@ -110,7 +110,7 @@ private function dispatchCreationEvents()
             $eventArgs  = $creation[1];
             $entity     = $eventArgs->getObject();
 
-            $this->dispatcher->dispatch($annotation->event, new $annotation->class($entity));
+            $this->dispatcher->dispatch(new $annotation->class($entity), $annotation->event);
         }
     }
 
@@ -129,7 +129,7 @@ private function dispatchDeletionEvents()
             $identifier = $deletion[2];
             $entity     = $eventArgs->getObject();
 
-            $this->dispatcher->dispatch($annotation->event, new $annotation->class($entity, $identifier));
+            $this->dispatcher->dispatch(new $annotation->class($entity, $identifier), $annotation->event);
         }
     }
 
@@ -145,8 +145,8 @@ private function dispatchUpdateEvents()
             list($annotation, $entity, $propertiesChanges, $collectionsChanges) = $update;
 
             $this->dispatcher->dispatch(
+                new $annotation->class($entity, $propertiesChanges, $collectionsChanges),
                 $annotation->event,
-                new $annotation->class($entity, $propertiesChanges, $collectionsChanges)
             );
         }
     }
@@ -163,8 +163,8 @@ private function dispatchPropertyChangeEvents()
             list($annotation, $entity, $property, $oldValue, $newValue) = $propertyChange;
 
             $this->dispatcher->dispatch(
+                new $annotation->class($entity, $property, $oldValue, $newValue),
                 $annotation->event,
-                new $annotation->class($entity, $property, $oldValue, $newValue)
             );
         }
     }
@@ -187,8 +187,8 @@ private function dispatchCollectionChangeEvents()
             }
 
             $this->dispatcher->dispatch(
+                new $annotation->class($entity, $property, $deleted, $added),
                 $annotation->event,
-                new $annotation->class($entity, $property, $deleted, $added)
             );
         }
     }
@@ -330,6 +330,6 @@ public function setAutoDispatch($autoDispatch)
      */
     public function preAutoDispatch()
     {
-        $this->dispatcher->dispatch('w3c.lifecycle.preAutoDispatch', new PreAutoDispatchEvent($this));
+        $this->dispatcher->dispatch(new PreAutoDispatchEvent($this), 'w3c.lifecycle.preAutoDispatch');
     }
 }

Tests/Annotation/ChangeTest.php

@@ -24,7 +24,7 @@ class ChangeTest extends TestCase
      */
     private $reader;
 
-    public function setUp()
+    public function setUp() : void
     {
         $loader = require __DIR__ . '/../../vendor/autoload.php';
         AnnotationRegistry::registerLoader(array($loader, 'loadClass'));

Tests/Annotation/CreateTest.php

@@ -24,7 +24,7 @@ class CreateTest extends TestCase
      */
     private $reader;
 
-    public function setUp()
+    public function setUp() : void
     {
         $loader = require __DIR__ . '/../../vendor/autoload.php';
         AnnotationRegistry::registerLoader(array($loader, 'loadClass'));

Tests/Annotation/DeleteTest.php

@@ -24,7 +24,7 @@ class DeleteTest extends TestCase
      */
     private $reader;
 
-    public function setUp()
+    public function setUp() : void
     {
         $loader = require __DIR__ . '/../../vendor/autoload.php';
         AnnotationRegistry::registerLoader(array($loader, 'loadClass'));

Tests/Annotation/IgnoreTest.php

@@ -22,7 +22,7 @@ class IgnoreTest extends TestCase
      */
     private $reader;
 
-    public function setUp()
+    public function setUp() : void
     {
         $loader = require __DIR__ . '/../../vendor/autoload.php';
         AnnotationRegistry::registerLoader(array($loader, 'loadClass'));

Tests/Annotation/UpdateTest.php

@@ -24,7 +24,7 @@ class UpdateTest extends TestCase
      */
     private $reader;
 
-    public function setUp()
+    public function setUp() : void
     {
         $loader = require __DIR__ . '/../../vendor/autoload.php';
         AnnotationRegistry::registerLoader(array($loader, 'loadClass'));

Tests/Event/LifecycleUpdateEventTest.php

@@ -20,7 +20,7 @@ class LifecycleUpdateEventTest extends TestCase
      */
     private $event;
 
-    public function setUp()
+    public function setUp() : void
     {
         $entity                  = new User();
         $this->propertyChanges   = ['name' => ['old' => 'foo', 'new' => 'bar']];

Tests/EventListener/LifecycleEventsListenerInverseNoMonitorTest.php

@@ -11,7 +11,8 @@
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\UnitOfWork;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 use W3C\LifecycleEventsBundle\Annotation\Update;
 use W3C\LifecycleEventsBundle\EventListener\LifecycleEventsListener;
 use W3C\LifecycleEventsBundle\Services\AnnotationGetter;
@@ -21,7 +22,7 @@
 /**
  * @author Jean-Guilhem Rouel <jean-gui@w3.org>
  */
-class LifecycleEventsListenerInverseNoMonitorTest extends \PHPUnit_Framework_TestCase
+class LifecycleEventsListenerInverseNoMonitorTest extends TestCase
 {
     /**
      * @var LifecycleEventsListener
@@ -54,7 +55,7 @@ class LifecycleEventsListenerInverseNoMonitorTest extends \PHPUnit_Framework_Tes
     private $friend1;
     private $friend2;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();
 

Tests/EventListener/LifecycleEventsListenerInverseTest.php

@@ -11,7 +11,8 @@
 use Doctrine\ORM\Event\PreUpdateEventArgs;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\UnitOfWork;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 use W3C\LifecycleEventsBundle\Annotation\Change;
 use W3C\LifecycleEventsBundle\Annotation\Update;
 use W3C\LifecycleEventsBundle\EventListener\LifecycleEventsListener;
@@ -22,7 +23,7 @@
 /**
  * @author Jean-Guilhem Rouel <jean-gui@w3.org>
  */
-class LifecycleEventsListenerInverseTest extends \PHPUnit_Framework_TestCase
+class LifecycleEventsListenerInverseTest extends TestCase
 {
     /**
      * @var LifecycleEventsListener
@@ -55,7 +56,7 @@ class LifecycleEventsListenerInverseTest extends \PHPUnit_Framework_TestCase
     private $friend1;
     private $friend2;
 
-    public function setUp()
+    public function setUp() : void
     {
         parent::setUp();