Update dependencies (#177)

* Updated dev dependencies

* Made tests compatible with PHPUnit 9

* Fixed broken tests

* Run tests on PHP 7.3 and 7.4

* Support symfony/finder 5

Author: Naktibalda

.travis.yml

@@ -4,6 +4,8 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 before_script:
   - stty cols 160

composer.json

@@ -16,12 +16,12 @@
         "php": ">=7.0.0",
         "goaop/framework": "^2.2.0",
         "phpunit/phpunit": "> 6.0.0",
-        "symfony/finder": "~2.4|~3.0|~4.0"
+        "symfony/finder": "~2.4|~3.0|~4.0|~5.0"
     },
     "require-dev": {
-        "codeception/base": "^2.4",
-        "codeception/verify": "~0.2",
-        "codeception/specify": "~0.3"
+        "codeception/codeception": "^4.0",
+        "codeception/verify": "^1.2",
+        "codeception/specify": "^1.0"
     },
     "license": "MIT"
 }

tests/unit/AccessDemoClassesTest.php

@@ -1,6 +1,8 @@
 <?php
 namespace demo;
 
+use PHPUnit\Framework\AssertionFailedError;
+
 class AccessDemoClassesTest extends \PHPUnit\Framework\TestCase
 {
     public function testUserModel()
@@ -9,11 +11,9 @@ public function testUserModel()
         $this->assertEquals('davert', $user->getName());
     }
 
-    /**
-     * @expectedException \PHPUnit\Framework\AssertionFailedError
-     */
     public function testUserService()
     {
+        $this->expectException(AssertionFailedError::class);
         $service = new UserService();
         $service->create(['name' => 'davert']);
     }

tests/unit/ClassProxyTest.php

@@ -35,7 +35,7 @@ public function testMegaClassValidations()
 
     public function testUndefinedClass()
     {
-        $this->setExpectedException('Exception');
+        $this->expectException('Exception');
         test::double('MyUndefinedClass');
     }
 

tests/unit/FunctionInjectorTest.php

@@ -3,6 +3,7 @@
 
 use AspectMock\Intercept\FunctionInjector;
 use AspectMock\Test as test;
+use PHPUnit\Framework\ExpectationFailedException;
 
 class FunctionInjectorTest extends \Codeception\TestCase\Test
 {
@@ -32,20 +33,20 @@ public function _before()
     public function testTemplate()
     {
         $php = $this->funcInjector->getPHP();
-        verify($php)->contains("function strlen()");
-        verify($php)->contains("return call_user_func_array('strlen', func_get_args());");
+        verify($php)->stringContainsString("function strlen()");
+        verify($php)->stringContainsString("return call_user_func_array('strlen', func_get_args());");
     }
 
     public function testReferencedParameterTemplate()
     {
         $php = $this->funcReferencedParameterInjector->getPHP();
-        verify($php)->contains("function preg_match(\$p0, \$p1, &\$p2=NULL, \$p3=NULL, \$p4=NULL)");
-        verify($php)->contains("case 5: \$args = [\$p0, \$p1, &\$p2, \$p3, \$p4]; break;");
-        verify($php)->contains("case 4: \$args = [\$p0, \$p1, &\$p2, \$p3]; break;");
-        verify($php)->contains("case 3: \$args = [\$p0, \$p1, &\$p2]; break;");
-        verify($php)->contains("case 2: \$args = [\$p0, \$p1]; break;");
-        verify($php)->contains("case 1: \$args = [\$p0]; break;");
-        verify($php)->contains("return call_user_func_array('preg_match', \$args);");
+        verify($php)->stringContainsString("function preg_match(\$p0, \$p1, &\$p2=NULL, \$p3=NULL, \$p4=NULL)");
+        verify($php)->stringContainsString("case 5: \$args = [\$p0, \$p1, &\$p2, \$p3, \$p4]; break;");
+        verify($php)->stringContainsString("case 4: \$args = [\$p0, \$p1, &\$p2, \$p3]; break;");
+        verify($php)->stringContainsString("case 3: \$args = [\$p0, \$p1, &\$p2]; break;");
+        verify($php)->stringContainsString("case 2: \$args = [\$p0, \$p1]; break;");
+        verify($php)->stringContainsString("case 1: \$args = [\$p0]; break;");
+        verify($php)->stringContainsString("return call_user_func_array('preg_match', \$args);");
     }
 
     public function testSave()
@@ -96,10 +97,10 @@ public function testVerifierFullyQualifiedNamespace()
 
     /**
      * @test
-     * @expectedException PHPUnit\Framework\ExpectationFailedException
      */
     public function testFailedVerification()
     {
+        $this->expectException(ExpectationFailedException::class);
         $func = test::func('demo', 'strlen', function() { return 10; });
         expect(strlen('hello'))->equals(10);
         $func->verifyNeverInvoked();

tests/unit/MockFailedTest.php

@@ -6,16 +6,17 @@
 use AspectMock\Proxy\ClassProxy;
 use AspectMock\Proxy\InstanceProxy;
 use \AspectMock\Core\Registry as double;
+use Codeception\PHPUnit\TestCase;
 
-class MockFailedTest extends \PHPUnit\Framework\TestCase 
+class MockFailedTest extends TestCase
 {
 
-    protected function setUp()
+    protected function _setUp()
     {
         $this->expectException('PHPUnit\Framework\ExpectationFailedException');
     }        
 
-    protected function tearDown()
+    protected function _tearDown()
     {
         double::clean();
     }

tests/unit/MockTest.php

@@ -3,12 +3,13 @@
 use \AspectMock\Core\Registry as double;
 use AspectMock\Proxy\ClassProxy;
 use AspectMock\Proxy\InstanceProxy;
+use Codeception\PHPUnit\TestCase;
 
-class MockTest extends \PHPUnit\Framework\TestCase
+class MockTest extends TestCase
 {
     use \Codeception\Specify;
 
-    protected function tearDown()
+    protected function _tearDown()
     {
         double::clean();
     }

tests/unit/StubTest.php

@@ -1,10 +1,11 @@
 <?php
 namespace demo;
 use \AspectMock\Core\Registry as double;
+use Codeception\PHPUnit\TestCase;
 
-class StubTest extends \PHPUnit\Framework\TestCase
+class StubTest extends TestCase
 {
-    protected function tearDown()
+    protected function _tearDown()
     {
         double::clean();
     }

tests/unit/VerifierTest.php

@@ -3,12 +3,13 @@
 use \AspectMock\Core\Registry as double;
 use AspectMock\Proxy\ClassProxy;
 use AspectMock\Proxy\InstanceProxy;
+use Codeception\PHPUnit\TestCase;
 
-class VerifierTest extends \PHPUnit\Framework\TestCase
+class VerifierTest extends TestCase
 {
     use \Codeception\Specify;
 
-    protected function tearDown()
+    protected function _tearDown()
     {
         double::clean();
     }

tests/unit/_bootstrap.php

@@ -1,4 +1,4 @@
 <?php
 // Here you can initialize variables that will for your tests
 
-Codeception\Specify\Config::setDeepClone(false);
+//Codeception\Specify\Config::setDeepClone(false);