Merge pull request #17 from gabriel-caruso/phpunit

Use PHPUnit\Framework\TestCase instead of PHPUnit_Framework_TestCase

composer.json

@@ -7,15 +7,15 @@
     "require": {
         "php": ">=5.5",
         "php-di/php-di": "~5.0",
-        "acclimate/container": "~1.0",
+        "acclimate/container": "~1.0 || ~2.0",
         "doctrine/annotations": "~1.0",
         "doctrine/cache": "~1.0"
     },
 
     "require-dev": {
         "squizlabs/php_codesniffer": "~2.0",
         "phpmd/phpmd" : "~2.0",
-        "phpunit/phpunit": "~4.8",
+        "phpunit/phpunit": "~4.8.35",
         "zendframework/zendframework": "^2.5"
     },
 

tests/DI/ZendFramework2/Service/CacheFactory/CacheFactoryTest.php

@@ -11,13 +11,14 @@
 use Doctrine\Common\Cache\FilesystemCache;
 use Doctrine\Common\Cache\RedisCache;
 use Zend\ServiceManager\ServiceManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class CacheFactoryTest
  * @author mfris
  * @package Test\DI\ZendFramework2\Service
  */
-class CacheFactoryTest extends \PHPUnit_Framework_TestCase
+class CacheFactoryTest extends TestCase
 {
 
     /**

tests/DI/ZendFramework2/Service/DIContainerFactoryTest.php

@@ -13,13 +13,14 @@
 use Test\DI\ZendFramework2\Helper\Config;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\ServiceManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class DIContainerFactoryTest
  * @author mfris
  * @package Test\DI\ZendFramework2\Service
  */
-class DIContainerFactoryTest extends \PHPUnit_Framework_TestCase
+class DIContainerFactoryTest extends TestCase
 {
 
     /**

tests/DI/ZendFramework2/Service/PHPDIAbstractFactoryTest.php

@@ -13,11 +13,12 @@
 use DI\ContainerBuilder;
 use DI\ZendFramework2\Service\PHPDIAbstractFactory;
 use Zend\ServiceManager\ServiceManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Matthieu Napoli <[email protected]>
  */
-class PHPDIAbstractFactoryTest extends \PHPUnit_Framework_TestCase
+class PHPDIAbstractFactoryTest extends TestCase
 {
     /**
      * @var Container

tests/IntegrationTest.php

@@ -14,11 +14,12 @@
 use DI\ZendFramework2\Service\PHPDIAbstractFactory;
 use Zend\Mvc\Service\ServiceManagerConfig;
 use Zend\ServiceManager\ServiceManager;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @author Matthieu Napoli <[email protected]>
  */
-class IntegrationTest extends \PHPUnit_Framework_TestCase
+class IntegrationTest extends TestCase
 {
     /**
      * @var Container