Merge pull request #47 from kokspflanze/master

weierophinney · weierophinney · commit 75175ed1c829 · 2017-07-11T14:01:24.000-05:00
added phpunit 6
diff --git a/.travis.yml b/.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: matthew@weierophinney.net
@@ -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 --ignore-platform-reqs --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:
diff --git a/composer.json b/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.6",
+        "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",
diff --git a/src/Test/EventListenerIntrospectionTrait.php b/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;
 
diff --git a/test/EventManagerAwareTraitTest.php b/test/EventManagerAwareTraitTest.php
@@ -9,15 +9,17 @@
 
 namespace ZendTest\EventManager;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\EventManager\EventManager;
+use Zend\EventManager\EventManagerAwareTrait;
+use Zend\EventManager\EventManagerInterface;
 use ZendTest\EventManager\TestAsset\MockEventManagerAwareTrait;
 
 class EventManagerAwareTraitTest extends TestCase
 {
     public function testSetEventManager()
     {
-        $object = $this->getObjectForTrait('\Zend\EventManager\EventManagerAwareTrait');
+        $object = $this->getObjectForTrait(EventManagerAwareTrait::class);
 
         $this->assertAttributeEquals(null, 'events', $object);
 
@@ -30,9 +32,9 @@ public function testSetEventManager()
 
     public function testGetEventManager()
     {
-        $object = $this->getObjectForTrait('\Zend\EventManager\EventManagerAwareTrait');
+        $object = $this->getObjectForTrait(EventManagerAwareTrait::class);
 
-        $this->assertInstanceOf('\Zend\EventManager\EventManagerInterface', $object->getEventManager());
+        $this->assertInstanceOf(EventManagerInterface::class, $object->getEventManager());
 
         $eventManager = new EventManager;
 
diff --git a/test/EventManagerPriorityTest.php b/test/EventManagerPriorityTest.php
@@ -10,7 +10,7 @@
 namespace ZendTest\EventManager;
 
 use SplQueue;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Zend\EventManager\Event;
 use Zend\EventManager\EventManager;
 use Zend\EventManager\SharedEventManager;
diff --git a/test/EventManagerTest.php b/test/EventManagerTest.php
@@ -9,6 +9,7 @@
 
 namespace ZendTest\EventManager;
 
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use ReflectionProperty;
 use stdClass;
@@ -17,10 +18,11 @@
 use Zend\EventManager\EventManager;
 use Zend\EventManager\Exception;
 use Zend\EventManager\ListenerAggregateInterface;
+use Zend\EventManager\ResponseCollection;
 use Zend\EventManager\SharedEventManager;
 use Zend\EventManager\SharedEventManagerInterface;
 
-class EventManagerTest extends \PHPUnit_Framework_TestCase
+class EventManagerTest extends TestCase
 {
     public function setUp()
     {
@@ -124,7 +126,7 @@ public function testTriggerShouldReturnAllListenerReturnValues()
             return str_rot13($string);
         });
         $responses = $this->events->trigger('string.transform', $this, ['string' => ' foo ']);
-        $this->assertInstanceOf('Zend\EventManager\ResponseCollection', $responses);
+        $this->assertInstanceOf(ResponseCollection::class, $responses);
         $this->assertEquals(2, $responses->count());
         $this->assertEquals('foo', $responses->first());
         $this->assertEquals(\str_rot13(' foo '), $responses->last());
@@ -148,7 +150,7 @@ public function testTriggerUntilShouldReturnAsSoonAsCallbackReturnsTrue()
             $this,
             ['string' => 'foo', 'search' => 'f']
         );
-        $this->assertInstanceOf('Zend\EventManager\ResponseCollection', $responses);
+        $this->assertInstanceOf(ResponseCollection::class, $responses);
         $this->assertSame(0, $responses->last());
     }
 
@@ -191,7 +193,7 @@ public function testTriggerUntilShouldMarkResponseCollectionStoppedWhenCondition
         $responses = $this->events->triggerUntil(function ($result) {
             return ($result === 'found');
         }, 'foo.bar', $this);
-        $this->assertInstanceOf('Zend\EventManager\ResponseCollection', $responses);
+        $this->assertInstanceOf(ResponseCollection::class, $responses);
         $this->assertTrue($responses->stopped());
         $result = $responses->last();
         $this->assertEquals('found', $result);
@@ -210,7 +212,7 @@ public function testTriggerUntilShouldMarkResponseCollectionStoppedWhenCondition
         $responses = $this->events->triggerUntil(function ($result) {
             return ($result === 'found');
         }, 'foo.bar', $this);
-        $this->assertInstanceOf('Zend\EventManager\ResponseCollection', $responses);
+        $this->assertInstanceOf(ResponseCollection::class, $responses);
         $this->assertTrue($responses->stopped());
         $this->assertEquals('found', $responses->last());
     }
@@ -227,7 +229,7 @@ public function testResponseCollectionIsNotStoppedWhenNoCallbackMatchedByTrigger
         $responses = $this->events->triggerUntil(function ($result) {
             return ($result === 'never found');
         }, 'foo.bar', $this);
-        $this->assertInstanceOf('Zend\EventManager\ResponseCollection', $responses);
+        $this->assertInstanceOf(ResponseCollection::class, $responses);
         $this->assertFalse($responses->stopped());
         $this->assertEquals('zero', $responses->last());
     }
@@ -242,7 +244,7 @@ public function testCallingEventsStopPropagationMethodHaltsEventEmission()
         // @codingStandardsIgnoreEnd
 
         $responses = $this->events->trigger('foo.bar');
-        $this->assertInstanceOf('Zend\EventManager\ResponseCollection', $responses);
+        $this->assertInstanceOf(ResponseCollection::class, $responses);
         $this->assertTrue($responses->stopped());
         $this->assertEquals('nada', $responses->last());
         $this->assertTrue($responses->contains('bogus'));
@@ -479,7 +481,8 @@ public function testAttachRaisesExceptionForInvalidEventType($event)
     {
         $callback = function () {
         };
-        $this->setExpectedException(Exception\InvalidArgumentException::class, 'string');
+        $this->expectException(Exception\InvalidArgumentException::class);
+        $this->expectExceptionMessage('string');
         $this->events->attach($event, $callback);
     }
 
@@ -704,7 +707,8 @@ public function testPassingInvalidEventTypeToDetachRaisesException($event)
         $listener = function ($e) {
         };
 
-        $this->setExpectedException(Exception\InvalidArgumentException::class, 'string');
+        $this->expectException(Exception\InvalidArgumentException::class);
+        $this->expectExceptionMessage('string');
         $this->events->detach($listener, $event);
     }
 
@@ -750,7 +754,8 @@ public function eventsMissingNames()
      */
     public function testTriggeringAnEventWithAnEmptyNameRaisesAnException($event, $method, $callback)
     {
-        $this->setExpectedException(Exception\RuntimeException::class, 'missing a name');
+        $this->expectException(Exception\RuntimeException::class);
+        $this->expectExceptionMessage('missing a name');
         if ($callback) {
             $this->events->$method($callback, $event);
         } else {
diff --git a/test/EventTest.php b/test/EventTest.php
@@ -9,12 +9,14 @@
 
 namespace ZendTest\EventManager;
 
+use PHPUnit\Framework\TestCase;
 use Zend\EventManager\Event;
+use Zend\EventManager\Exception;
 
 /**
  * @group      Zend_Stdlib
  */
-class EventTest extends \PHPUnit_Framework_TestCase
+class EventTest extends TestCase
 {
 
     public function testConstructorWithArguments()
@@ -33,7 +35,7 @@ public function testConstructorWithArguments()
     public function testSetParamsWithInvalidParameter()
     {
         $event = new Event('foo');
-        $this->setExpectedException('Zend\EventManager\Exception\InvalidArgumentException');
+        $this->expectException(Exception\InvalidArgumentException::class);
         $event->setParams('test');
     }
 
diff --git a/test/FilterChainTest.php b/test/FilterChainTest.php
@@ -9,12 +9,14 @@
 
 namespace ZendTest\EventManager;
 
+use PHPUnit\Framework\TestCase;
+use Zend\EventManager\Filter\FilterIterator;
 use Zend\EventManager\FilterChain;
 
 /**
  * @group      Zend_Stdlib
  */
-class FilterChainTest extends \PHPUnit_Framework_TestCase
+class FilterChainTest extends TestCase
 {
     /**
      * @var FilterChain
@@ -136,7 +138,7 @@ public function filterTestCallback1($context, array $params)
 
     public function filterReceivalCallback($context, array $params, $chain)
     {
-        $this->assertInstanceOf('Zend\EventManager\Filter\FilterIterator', $chain);
+        $this->assertInstanceOf(FilterIterator::class, $chain);
     }
 
     public function testRunReturnsNullWhenChainIsEmpty()
diff --git a/test/FilterIteratorTest.php b/test/FilterIteratorTest.php
@@ -9,13 +9,14 @@
 
 namespace ZendTest\EventManager;
 
+use PHPUnit\Framework\TestCase;
 use Zend\EventManager\Exception\InvalidArgumentException;
 use Zend\EventManager\Filter\FilterIterator;
 
 /**
  * @group      Zend_Stdlib
  */
-class FilterIteratorTest extends \PHPUnit_Framework_TestCase
+class FilterIteratorTest extends TestCase
 {
 
     public function testNextReturnsNullOnEmptyChain()
@@ -103,7 +104,8 @@ public function invalidFilters()
     public function testInsertShouldRaiseExceptionOnNonCallableDatum($filter)
     {
         $iterator = new FilterIterator();
-        $this->setExpectedException(InvalidArgumentException::class, 'callables');
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('callables');
         $iterator->insert($filter, 1);
     }
 }
diff --git a/test/LazyEventListenerTest.php b/test/LazyEventListenerTest.php
@@ -29,7 +29,8 @@ public function testConstructorRaisesExceptionForMissingEvent()
             'listener' => 'listener',
             'method'   => 'method',
         ];
-        $this->setExpectedException(InvalidArgumentException::class, 'missing a valid "event"');
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('missing a valid "event"');
         new $class($struct, $this->container->reveal());
     }
 
@@ -44,7 +45,8 @@ public function testConstructorRaisesExceptionForInvalidEventType($event)
             'listener' => 'listener',
             'method'   => 'method',
         ];
-        $this->setExpectedException(InvalidArgumentException::class, 'missing a valid "event"');
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('missing a valid "event"');
         new $class($struct, $this->container->reveal());
     }
 
diff --git a/test/LazyListenerAggregateTest.php b/test/LazyListenerAggregateTest.php
@@ -10,7 +10,7 @@
 namespace ZendTest\EventManager;
 
 use Interop\Container\ContainerInterface;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use ReflectionProperty;
 use Zend\EventManager\EventInterface;
@@ -70,7 +70,8 @@ public function invalidListeners()
      */
     public function testPassingInvalidListenerTypesAtInstantiationRaisesException($listener)
     {
-        $this->setExpectedException(InvalidArgumentException::class, 'must be LazyEventListener instances');
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('must be LazyEventListener instances');
         new LazyListenerAggregate([$listener], $this->container->reveal());
     }
 
@@ -79,7 +80,8 @@ public function testPassingInvalidListenerTypesAtInstantiationRaisesException($l
      */
     public function testPassingInvalidListenersAtInstantiationRaisesException($listener)
     {
-        $this->setExpectedException(InvalidArgumentException::class, 'missing a valid');
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('missing a valid');
         new LazyListenerAggregate([$listener], $this->container->reveal());
     }
 
diff --git a/test/LazyListenerTest.php b/test/LazyListenerTest.php
@@ -10,7 +10,7 @@
 namespace ZendTest\EventManager;
 
 use Interop\Container\ContainerInterface;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use stdClass;
 use Zend\EventManager\EventInterface;
@@ -48,7 +48,8 @@ public function testConstructorRaisesExceptionForMissingListener()
             'event'  => 'event',
             'method' => 'method',
         ];
-        $this->setExpectedException(InvalidArgumentException::class, 'missing a valid "listener"');
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('missing a valid "listener"');
         new $class($struct, $this->container->reveal());
     }
 
@@ -63,7 +64,8 @@ public function testConstructorRaisesExceptionForInvalidListenerType($listener)
             'listener' => $listener,
             'method'   => 'method',
         ];
-        $this->setExpectedException(InvalidArgumentException::class, 'missing a valid "listener"');
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('missing a valid "listener"');
         new $class($struct, $this->container->reveal());
     }
 
@@ -74,7 +76,8 @@ public function testConstructorRaisesExceptionForMissingMethod()
             'event'    => 'event',
             'listener' => 'listener',
         ];
-        $this->setExpectedException(InvalidArgumentException::class, 'missing a valid "method"');
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('missing a valid "method"');
         new $class($struct, $this->container->reveal());
     }
 
@@ -89,7 +92,8 @@ public function testConstructorRaisesExceptionForInvalidMethodType($method)
             'listener' => 'listener',
             'method'   => $method,
         ];
-        $this->setExpectedException(InvalidArgumentException::class, 'missing a valid "method"');
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('missing a valid "method"');
         new $class($struct, $this->container->reveal());
     }
 
diff --git a/test/ListenerAggregateTraitTest.php b/test/ListenerAggregateTraitTest.php
@@ -9,7 +9,7 @@
 
 namespace ZendTest\EventManager;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Zend\EventManager\EventManagerInterface;
 
diff --git a/test/SharedEventManagerTest.php b/test/SharedEventManagerTest.php
diff --git a/test/SharedListenerIntegrationTest.php b/test/SharedListenerIntegrationTest.php
diff --git a/test/Test/EventListenerIntrospectionTraitTest.php b/test/Test/EventListenerIntrospectionTraitTest.php
diff --git a/test/_autoload.php b/test/_autoload.php

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,14 @@`
`9`	`9`
`10`	`10`	`namespace ZendTest\EventManager;`
`11`	`11`
	`12`	`+use PHPUnit\Framework\TestCase;`
`12`	`13`	`use Zend\EventManager\Event;`
	`14`	`+use Zend\EventManager\Exception;`
`13`	`15`
`14`	`16`	`/**`
`15`	`17`	`* @group Zend_Stdlib`
`16`	`18`	`*/`
`17`		`-class EventTest extends \PHPUnit_Framework_TestCase`
	`19`	`+class EventTest extends TestCase`
`18`	`20`	`{`
`19`	`21`
`20`	`22`	`public function testConstructorWithArguments()`
`@@ -33,7 +35,7 @@ public function testConstructorWithArguments()`
`33`	`35`	`public function testSetParamsWithInvalidParameter()`
`34`	`36`	`{`
`35`	`37`	`$event = new Event('foo');`
`36`		`- $this->setExpectedException('Zend\EventManager\Exception\InvalidArgumentException');`
	`38`	`+ $this->expectException(Exception\InvalidArgumentException::class);`
`37`	`39`	`$event->setParams('test');`
`38`	`40`	`}`
`39`	`41`
Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,14 @@`
`9`	`9`
`10`	`10`	`namespace ZendTest\EventManager;`
`11`	`11`
	`12`	`+use PHPUnit\Framework\TestCase;`
`12`	`13`	`use Zend\EventManager\Exception\InvalidArgumentException;`
`13`	`14`	`use Zend\EventManager\Filter\FilterIterator;`
`14`	`15`
`15`	`16`	`/**`
`16`	`17`	`* @group Zend_Stdlib`
`17`	`18`	`*/`
`18`		`-class FilterIteratorTest extends \PHPUnit_Framework_TestCase`
	`19`	`+class FilterIteratorTest extends TestCase`
`19`	`20`	`{`
`20`	`21`
`21`	`22`	`public function testNextReturnsNullOnEmptyChain()`
`@@ -103,7 +104,8 @@ public function invalidFilters()`
`103`	`104`	`public function testInsertShouldRaiseExceptionOnNonCallableDatum($filter)`
`104`	`105`	`{`
`105`	`106`	`$iterator = new FilterIterator();`
`106`		`- $this->setExpectedException(InvalidArgumentException::class, 'callables');`
	`107`	`+ $this->expectException(InvalidArgumentException::class);`
	`108`	`+ $this->expectExceptionMessage('callables');`
`107`	`109`	`$iterator->insert($filter, 1);`
`108`	`110`	`}`
`109`	`111`	`}`