Merge pull request #109 from chalasr/sf-5

Allow Symfony 5

Author: wouterj

.travis.yml

@@ -7,7 +7,7 @@ cache:
 env:
   global:
     - SYMFONY_PHPUNIT_REMOVE="symfony/yaml"
-    - SYMFONY_DEPRECATIONS_HELPER="max[direct]=0&max[indirect]=0"
+    - SYMFONY_DEPRECATIONS_HELPER="max[direct]=0"
 
 branches:
     only: [master, stable]

composer.json

@@ -10,32 +10,32 @@
         , "illuminate/database": "^5.5"
         , "illuminate/events": "^5.5"
         , "illuminate/console": "^5.5"
-        , "symfony/dependency-injection": "^3.0 || ^4.0"
+        , "symfony/dependency-injection": "^3.0 || ^4.0 || ^5.0"
         , "jdorn/sql-formatter": "^1.2"
     }
     , "require-dev": {
-          "symfony/console": "^3.0 || ^4.0"
-        , "symfony/event-dispatcher": "^3.0 || ^4.0"
-        , "symfony/framework-bundle": "^3.0 || ^4.0"
-        , "symfony/http-kernel": "^3.0 || ^4.0"
-        , "symfony/finder": "^3.0 || ^4.0"
-        , "symfony/debug": "^3.0 || ^4.0"
-        , "symfony/yaml": "^3.0 || ^4.0"
-        , "symfony/form": "^3.0 || ^4.0"
+          "symfony/console": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/framework-bundle": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/http-kernel": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/finder": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/debug": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/form": "^3.0 || ^4.0 || ^5.0"
         , "symfony/phpunit-bridge": "^4.4"
-        , "symfony/browser-kit": "^3.0 || ^4.0"
-        , "symfony/dom-crawler": "^3.0 || ^4.0"
-        , "symfony/validator": "^3.0 || ^4.0"
-        , "symfony/twig-bundle": "^3.0 || ^4.0"
-        , "symfony/twig-bridge": "^3.0 || ^4.0"
-        , "symfony/var-dumper": "^3.0 || ^4.0"
+        , "symfony/browser-kit": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/dom-crawler": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/validator": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/twig-bundle": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/twig-bridge": "^3.0 || ^4.0 || ^5.0"
+        , "symfony/var-dumper": "^3.0 || ^4.0 || ^5.0"
         , "twig/twig": "^1.26 || ^2.0"
         , "doctrine/annotations": "1.*"
     }
     , "conflict": { "hhvm": "*" }
     , "suggests": {
-          "symfony/console": "To use commands for seeding and migration. (^3.0|^4.0)"
-        , "symfony/event-dispatcher": "To auto initialize the Eloquent ORM. (^3.0|^4.0)"
+          "symfony/console": "To use commands for seeding and migration. (^3.0|^4.0|^5.0)"
+        , "symfony/event-dispatcher": "To auto initialize the Eloquent ORM. (^3.0|^4.0|^5.0)"
     }
 
     , "autoload": { "psr-4": { "WouterJ\\EloquentBundle\\": "src" } }

phpunit.xml.dist

@@ -13,7 +13,10 @@
     </filter>
 
     <listeners>
-        <listener class="WouterJ\EloquentBundle\FunctionalTestListener"/>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
     </listeners>
+
+    <extensions>
+        <extension class="WouterJ\EloquentBundle\FunctionalTestListener"/>
+    </extensions>
 </phpunit>

tests/FunctionalTestListener.php

@@ -11,26 +11,22 @@
 
 namespace WouterJ\EloquentBundle;
 
-use PHPUnit\Framework\Test;
-use PHPUnit\Framework\TestListener;
-use PHPUnit\Framework\TestListenerDefaultImplementation;
-use PHPUnit\Framework\TestSuite;
+use PHPUnit\Runner\BeforeFirstTestHook;
+use PHPUnit\Runner\BeforeTestHook;
 
 /**
  * Automatically creates the database that's
  * required for the functional tests.
  *
  * @author Wouter J <wouter@wouterj.nl>
  */
-class FunctionalTestListener implements TestListener
+class FunctionalTestListener implements BeforeFirstTestHook, BeforeTestHook
 {
-    use TestListenerDefaultImplementation;
-
     private static $started = false;
     private static $dbFile;
     private static $backupFile;
 
-    public function startTestSuite(TestSuite $suite): void
+    public function executeBeforeFirstTest(): void
     {
         if (!self::$started) {
             self::$started = true;
@@ -65,7 +61,7 @@ public function startTestSuite(TestSuite $suite): void
         }
     }
 
-    public function startTest(Test $test): void
+    public function executeBeforeTest(string $test): void
     {
         // reset to initial file
         copy(static::$backupFile, static::$dbFile);