#317 Use symfony/phpunit-bridge for testing

Btw stop testing on unmaintained Symfony versions (3.0 and 3.1)
lexik · Mar 29, 2017 · 6055e90 · 6055e90
2 parents 8b8a0f8 + e12d110
commit 6055e90
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 25 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,26 +2,15 @@ language: php
 
 sudo: false
 
-env:
-    global:
-        - COMPOSER_FLAGS="--prefer-dist"
-
 matrix:
   fast_finish: true
   include:
     - php: 5.5
       env: SYMFONY_VERSION=2.8.*
-    - php: 5.5
-      env: SYMFONY_VERSION=3.0.*
-    - php: 5.5
-      env: SYMFONY_VERSION=3.1.*
-    - php: 5.5
-      env: SYMFONY_VERSION=3.2.*
     - php: 5.6
+      env: SYMFONY_VERSION=3.2.*
     - php: 7.0
     - php: 7.1
-    - php: 7.1
-      env: COMPOSER_FLAGS="--prefer-lowest"
     - php: hhvm-stable
       sudo: required
       dist: trusty

diff --git a/Tests/Functional/Utils/CallableEventSubscriber.php b/Tests/Functional/Utils/CallableEventSubscriber.php
@@ -31,9 +31,7 @@ public static function getSubscribedEvents()
         $subscriberMap = [];
 
         foreach (self::$eventClassMap as $name => $className) {
-            if (self::hasListener($name)) {
-                $subscriberMap[$name] = 'handleEvent';
-            }
+            $subscriberMap[$name] = 'handleEvent';
         }
 
         return $subscriberMap;
@@ -55,6 +53,10 @@ public function handleEvent(Event $event)
 
         $listener = self::getListener($eventName);
 
+        if (!$listener) {
+            return;
+        }
+
         if ($listener instanceof \Closure) {
             return $listener($event);
         }

diff --git a/composer.json b/composer.json
@@ -45,7 +45,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8|^5.0",
-        "symfony/phpunit-bridge": "^2.8|^3.0",
+        "symfony/phpunit-bridge": "~3.2",
         "symfony/browser-kit": "^2.8|^3.0",
         "symfony/dom-crawler": "^2.8|^3.0",
         "symfony/yaml": "^2.8|^3.0",
@@ -70,10 +70,9 @@
     },
     "scripts": {
         "test": [
-            "vendor/bin/phpunit --testsuite unit",
-            "vendor/bin/phpunit --testsuite functional",
-            "ENCODER=lcobucci vendor/bin/phpunit --testsuite functional",
-            "PROVIDER=lexik_jwt vendor/bin/phpunit --testsuite functional"
+            "vendor/bin/simple-phpunit",
+            "ENCODER=lcobucci vendor/bin/simple-phpunit",
+            "PROVIDER=lexik_jwt vendor/bin/simple-phpunit"
         ]
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,12 +13,8 @@
         >
 
     <testsuites>
-        <testsuite name="unit">
+        <testsuite name="LexikJWTAuthenticationBundle Test Suite">
             <directory>./Tests/</directory>
-            <exclude>./Tests/Functional/</exclude>
-        </testsuite>
-        <testsuite name="functional">
-            <directory>./Tests/Functional/</directory>
         </testsuite>
     </testsuites>