Merge pull request #13 from PolishSymfonyCommunity/php-update

Update dependencies

Author: jakzal

.gitignore

@@ -1,3 +1,4 @@
+.phpunit.result.cache
 phpunit.xml
 vendor
 composer.lock

.travis.yml

@@ -1,14 +1,15 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
+  - 7.2
+  - 7.3
+  - 7.4
 
-before_script:
-  - wget -nc http://getcomposer.org/composer.phar
-  - php composer.phar install
+install:
+  - composer install
 
-script: phpunit --coverage-text
+script:
+  - ./vendor/bin/phpunit --coverage-text
 
 notifications:
   email:

composer.json

@@ -16,11 +16,14 @@
         }
     ],
     "require": {
-        "php":                          ">=5.3.2",
-        "symfony/dependency-injection": ">=2.0.0",
-        "mockery/mockery":              ">=0.7.0"
+        "php":                          "^7.2",
+        "symfony/dependency-injection": "^5.0",
+        "mockery/mockery":              "^1.3"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^8.4"
     },
     "autoload": {
-        "psr-0": { "PSS\\SymfonyMockerContainer": "src/" }
+        "psr-4": { "PSS\\SymfonyMockerContainer\\": "src/" }
     }
 }

phpunit.xml.dist

@@ -4,15 +4,15 @@
 
     <testsuites>
         <testsuite name="SymfonyMockerContainer test suite">
-            <directory suffix="Test.php">./src/PSS/SymfonyMockerContainer/Tests</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
             <directory>./src</directory>
             <exclude>
-                <directory>./src/PSS/SymfonyMockerContainer/Tests</directory>
+                <directory>./tests</directory>
                 <directory>./vendor</directory>
             </exclude>
         </whitelist>

…/DependencyInjection/MockerContainer.php …/DependencyInjection/MockerContainer.phpsrc/PSS/SymfonyMockerContainer/DependencyInjection/MockerContainer.php renamed to src/DependencyInjection/MockerContainer.php src/PSS/SymfonyMockerContainer/DependencyInjection/MockerContainer.php renamed to src/DependencyInjection/MockerContainer.php

@@ -3,8 +3,9 @@
 namespace PSS\SymfonyMockerContainer\Tests\DependencyInjection;
 
 use PSS\SymfonyMockerContainer\DependencyInjection\MockerContainer;
+use PHPUnit\Framework\TestCase;
 
-class MockerContainerTest extends \PHPUnit_Framework_TestCase
+class MockerContainerTest extends TestCase
 {
     /**
      * @var \PSS\SymfonyMockerContainer\DependencyInjection\MockerContainer $container
@@ -16,7 +17,7 @@ class MockerContainerTest extends \PHPUnit_Framework_TestCase
      */
     private $services = array();
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->container = new MockerContainer();
         $this->services = array('test.service_1' => null, 'test.service_2' => null, 'test.service_3' => null);
@@ -34,7 +35,7 @@ public function setUp()
      * As the mocks are never cleared during the execution
      * we have to do it manually.
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         $reflection = new \ReflectionClass('PSS\SymfonyMockerContainer\DependencyInjection\MockerContainer');
         $property = $reflection->getProperty('mockedServices');
@@ -61,12 +62,10 @@ public function testThatServiceCanBeMocked()
         $this->assertSame($mock, $this->container->get('test.service_1'));
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Cannot mock a non-existent service: "test.new_service"
-     */
     public function testThatServiceCannotBeMockedIfItDoesNotExist()
     {
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Cannot mock a non-existent service: "test.new_service"');
         $this->container->mock('test.new_service', 'stdClass');
     }