PHPUnit 6 added

composer changed to phpunit ^5.7 || ^6.0.6

Author: kokspflanze

composer.json

@@ -21,7 +21,7 @@
     "require-dev": {
         "ocramius/proxy-manager": "^1.0 || ^2.0",
         "phpbench/phpbench": "^0.10.0",
-        "phpunit/phpunit": "^5.2.10",
+        "phpunit/phpunit": "^5.7 || ^6.0.6",
         "mikey179/vfsStream": "^1.6",
         "zendframework/zend-coding-standard": "~1.0.0"
     },

test/AbstractFactory/ConfigAbstractFactoryTest.php

@@ -15,7 +15,7 @@
 use ZendTest\ServiceManager\TestAsset\SecondComplexDependencyObject;
 use ZendTest\ServiceManager\TestAsset\SimpleDependencyObject;
 
-class ConfigAbstractFactoryTest extends \PHPUnit_Framework_TestCase
+class ConfigAbstractFactoryTest extends \PHPUnit\Framework\TestCase
 {
 
     public function testCanCreateReturnsTrueIfDependencyNotArrays()

test/AbstractFactory/ReflectionBasedAbstractFactoryTest.php

@@ -8,7 +8,7 @@
 namespace ZendTest\ServiceManager\AbstractFactory;
 
 use Interop\Container\ContainerInterface;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase as TestCase;
 use Zend\ServiceManager\AbstractFactory\ReflectionBasedAbstractFactory;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 
@@ -55,26 +55,22 @@ public function testFactoryRaisesExceptionWhenUnableToResolveATypeHintedService(
         $this->container->has('config')->willReturn(false);
         $factory = new ReflectionBasedAbstractFactory();
         $this->expectException(ServiceNotFoundException::class);
-        $this->expectExceptionMessage(
-            sprintf(
-                'Unable to create service "%s"; unable to resolve parameter "sample" using type hint "%s"',
-                TestAsset\ClassWithTypeHintedConstructorParameter::class,
-                TestAsset\SampleInterface::class
-            )
-        );
+        $this->expectExceptionMessage(sprintf(
+            'Unable to create service "%s"; unable to resolve parameter "sample" using type hint "%s"',
+            TestAsset\ClassWithTypeHintedConstructorParameter::class,
+            TestAsset\SampleInterface::class
+        ));
         $factory($this->container->reveal(), TestAsset\ClassWithTypeHintedConstructorParameter::class);
     }
 
     public function testFactoryRaisesExceptionForScalarParameters()
     {
         $factory = new ReflectionBasedAbstractFactory();
         $this->expectException(ServiceNotFoundException::class);
-        $this->expectExceptionMessage(
-            sprintf(
-                'Unable to create service "%s"; unable to resolve parameter "foo" to a class, interface, or array type',
-                TestAsset\ClassWithScalarParameters::class
-            )
-        );
+        $this->expectExceptionMessage(sprintf(
+            'Unable to create service "%s"; unable to resolve parameter "foo" to a class, interface, or array type',
+            TestAsset\ClassWithScalarParameters::class
+        ));
         $instance = $factory($this->container->reveal(), TestAsset\ClassWithScalarParameters::class);
     }
 

test/AbstractPluginManagerTest.php

@@ -8,7 +8,7 @@
 namespace ZendTest\ServiceManager;
 
 use Interop\Container\ContainerInterface;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase as TestCase;
 use stdClass;
 use Zend\ServiceManager\ConfigInterface;
 use Zend\ServiceManager\Exception\InvalidArgumentException;
@@ -181,7 +181,8 @@ function ($container, $name, $callback) {
     public function testGetRaisesExceptionWhenNoFactoryIsResolved()
     {
         $pluginManager = $this->createContainer();
-        $this->expectException(ServiceNotFoundException::class, get_class($pluginManager));
+        $this->expectException(ServiceNotFoundException::class);
+        $this->expectExceptionMessage(get_class($pluginManager));
         $pluginManager->get('Some\Unknown\Service');
     }
 

test/ConfigTest.php

@@ -7,7 +7,7 @@
 
 namespace ZendTest\ServiceManager;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase as TestCase;
 use Zend\ServiceManager\Config;
 use Zend\ServiceManager\ServiceManager;
 

test/ExamplePluginManagerTest.php

@@ -7,7 +7,7 @@
 
 namespace ZendTest\ServiceManager;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase as TestCase;
 use Zend\ServiceManager\ServiceManager;
 use Zend\ServiceManager\Test\CommonPluginManagerTrait;
 use ZendTest\ServiceManager\TestAsset\InvokableObject;

test/Exception/CyclicAliasExceptionTest.php

@@ -7,7 +7,7 @@
 
 namespace ZendTest\ServiceManager\Exception;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase as TestCase;
 use Zend\ServiceManager\Exception\CyclicAliasException;
 
 /**

test/Factory/InvokableFactoryTest.php

@@ -8,7 +8,7 @@
 namespace ZendTest\ServiceManager\Factory;
 
 use Interop\Container\ContainerInterface;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase as TestCase;
 use Zend\ServiceManager\Factory\InvokableFactory;
 use ZendTest\ServiceManager\TestAsset\InvokableObject;
 

test/LazyServiceIntegrationTest.php

@@ -7,7 +7,7 @@
 
 namespace ZendTest\ServiceManager;
 
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase as TestCase;
 use ProxyManager\Autoloader\AutoloaderInterface;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;

test/Proxy/LazyServiceFactoryTest.php

@@ -9,7 +9,7 @@
 
 use Interop\Container\ContainerInterface;
 use PHPUnit_Framework_MockObject_MockObject as MockObject;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase as TestCase;
 use ProxyManager\Factory\LazyLoadingValueHolderFactory;
 use ProxyManager\Proxy\LazyLoadingInterface;
 use ProxyManager\Proxy\VirtualProxyInterface;