updated phpunit 5.7 fallback

Alias Assert is redundant
update travis configuration
swap order of phpunit version

Author: kokspflanze

.travis.yml

@@ -15,6 +15,8 @@ cache:
 
 env:
   global:
+    - COMPOSER_ARGS="--no-interaction --prefer-source"
+    - LEGACY_DEPS="phpunit/phpunit"
     - SITE_URL: https://zendframework.github.io/zend-eventmanager
     - GH_USER_NAME: "Matthew Weier O'Phinney"
     - GH_USER_EMAIL: [email protected]
@@ -46,7 +48,8 @@ before_install:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
 
 install:
-  - travis_retry composer install --no-interaction --prefer-source
+  - travis_retry composer install $COMPOSER_ARGS
+  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - composer info -i
 
 script:

composer.json

@@ -26,13 +26,16 @@
         "psr-4": {
             "ZendTest\\EventManager\\": "test/",
             "ZendBench\\EventManager\\": "benchmarks/"
-        }
+        },
+        "files": [
+             "test/_autoload.php"
+        ]
     },
     "require": {
         "php": "^5.6 || ^7.0"
     },
     "require-dev": {
-        "phpunit/PHPUnit": "^5.7.14 || ^6.0.7",
+        "phpunit/PHPUnit": "^6.0.7 || ^5.7.14",
         "athletic/athletic": "^0.1",
         "zendframework/zend-stdlib": "^2.7.3 || ^3.0",
         "container-interop/container-interop": "^1.1.0",

src/Test/EventListenerIntrospectionTrait.php

@@ -9,7 +9,7 @@
 
 namespace Zend\EventManager\Test;
 
-use PHPUnit\Framework\Assert as Assert;
+use PHPUnit\Framework\Assert;
 use ReflectionProperty;
 use Zend\EventManager\EventManager;
 

test/Test/EventListenerIntrospectionTraitTest.php

@@ -10,7 +10,6 @@
 namespace ZendTest\EventManager\Test;
 
 use PHPUnit\Framework\ExpectationFailedException;
-use PHPUnit_Framework_ExpectationFailedException as PHPUnit57ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
 use Traversable;
 use Zend\EventManager\EventManager;
@@ -194,13 +193,6 @@ public function testAssertListenerAtPriorityFailsWhenListenerIsNotFound()
                     $arguments['event'],
                     $arguments['priority']
                 ), $e->getMessage(), sprintf('Assertion failure message was unexpected: %s', $e->getMessage()));
-            // for PHPUnit 5.7
-            } catch (PHPUnit57ExpectationFailedException $e) {
-                $this->assertContains(sprintf(
-                    'Listener not found for event "%s" and priority %d',
-                    $arguments['event'],
-                    $arguments['priority']
-                ), $e->getMessage(), sprintf('Assertion failure message was unexpected: %s', $e->getMessage()));
             }
         }
     }

test/_autoload.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-component-installer for the canonical source repository
+ * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-component-installer/blob/master/LICENSE.md New BSD License
+ */
+
+use PHPUnit\Framework\ExpectationFailedException;
+
+class_alias('PHPUnit_Framework_ExpectationFailedException', ExpectationFailedException::class);