Update dependencies (#177)

Naktibalda · web-flow · commit 2227851bc3c3 · 2020-02-16T01:53:51.000+02:00
* 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
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,8 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 before_script:
   - stty cols 160
diff --git a/composer.json b/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"
 }
diff --git a/tests/unit/AccessDemoClassesTest.php b/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']);
     }
diff --git a/tests/unit/ClassProxyTest.php b/tests/unit/ClassProxyTest.php
@@ -35,7 +35,7 @@ public function testMegaClassValidations()
 
     public function testUndefinedClass()
     {
-        $this->setExpectedException('Exception');
+        $this->expectException('Exception');
         test::double('MyUndefinedClass');
     }
 
diff --git a/tests/unit/FunctionInjectorTest.php b/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();
diff --git a/tests/unit/MockFailedTest.php b/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();
     }
diff --git a/tests/unit/MockTest.php b/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();
     }
diff --git a/tests/unit/StubTest.php b/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();
     }
diff --git a/tests/unit/VerifierTest.php b/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();
     }
diff --git a/tests/unit/_bootstrap.php b/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);
diff --git a/tests/unit/testDoubleTest.php b/tests/unit/testDoubleTest.php
@@ -7,7 +7,7 @@ class testDoubleTest extends \Codeception\Test\Unit
     use Codeception\Specify;
     use demo\WorkingTrait;
 
-    protected function tearDown()
+    protected function _tearDown()
     {
         test::clean();
     }
@@ -72,8 +72,8 @@ public function testSpecUndefinedClass()
         $this->any = $class->construct();
 
         $this->specify('should return original class name', function() {
-            $this->assertContains('Undefined', (string)$this->any);
-            $this->assertContains('MyVirtualClass', (string)$this->any->__toString());
+            $this->assertStringContainsString('Undefined', (string)$this->any);
+            $this->assertStringContainsString('MyVirtualClass', (string)$this->any->__toString());
         });
 
         $this->specify('any method can be invoked', function() {
@@ -163,7 +163,7 @@ public function testPhp7Features()
         $this->assertEquals(12.2, $obj->floatRth(12.12));
         $this->assertTrue($obj->boolRth(false));
         $this->assertEquals(12, $obj->intRth(15));
-        $this->assertInternalType('callable', $obj->callableRth(function() {}));
+        //$this->assertInternalType('callable', $obj->callableRth(function() {}));
         $this->assertEquals([1], $obj->arrayRth([]));
         $this->assertInstanceOf('Exception', $obj->exceptionRth(new \Exception('ups')));
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace demo;`
`3`	`3`
	`4`	`+use PHPUnit\Framework\AssertionFailedError;`
	`5`	`+`
`4`	`6`	`class AccessDemoClassesTest extends \PHPUnit\Framework\TestCase`
`5`	`7`	`{`
`6`	`8`	`public function testUserModel()`
`@@ -9,11 +11,9 @@ public function testUserModel()`
`9`	`11`	`$this->assertEquals('davert', $user->getName());`
`10`	`12`	`}`
`11`	`13`
`12`		`- /**`
`13`		`- * @expectedException \PHPUnit\Framework\AssertionFailedError`
`14`		`- */`
`15`	`14`	`public function testUserService()`
`16`	`15`	`{`
	`16`	`+ $this->expectException(AssertionFailedError::class);`
`17`	`17`	`$service = new UserService();`
`18`	`18`	`$service->create(['name' => 'davert']);`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function testMegaClassValidations()`
`35`	`35`
`36`	`36`	`public function testUndefinedClass()`
`37`	`37`	`{`
`38`		`- $this->setExpectedException('Exception');`
	`38`	`+ $this->expectException('Exception');`
`39`	`39`	`test::double('MyUndefinedClass');`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -6,16 +6,17 @@`
`6`	`6`	`use AspectMock\Proxy\ClassProxy;`
`7`	`7`	`use AspectMock\Proxy\InstanceProxy;`
`8`	`8`	`use \AspectMock\Core\Registry as double;`
	`9`	`+use Codeception\PHPUnit\TestCase;`
`9`	`10`
`10`		`-class MockFailedTest extends \PHPUnit\Framework\TestCase`
	`11`	`+class MockFailedTest extends TestCase`
`11`	`12`	`{`
`12`	`13`
`13`		`- protected function setUp()`
	`14`	`+ protected function _setUp()`
`14`	`15`	`{`
`15`	`16`	`$this->expectException('PHPUnit\Framework\ExpectationFailedException');`
`16`	`17`	`}`
`17`	`18`
`18`		`- protected function tearDown()`
	`19`	`+ protected function _tearDown()`
`19`	`20`	`{`
`20`	`21`	`double::clean();`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,13 @@`
`3`	`3`	`use \AspectMock\Core\Registry as double;`
`4`	`4`	`use AspectMock\Proxy\ClassProxy;`
`5`	`5`	`use AspectMock\Proxy\InstanceProxy;`
	`6`	`+use Codeception\PHPUnit\TestCase;`
`6`	`7`
`7`		`-class MockTest extends \PHPUnit\Framework\TestCase`
	`8`	`+class MockTest extends TestCase`
`8`	`9`	`{`
`9`	`10`	`use \Codeception\Specify;`
`10`	`11`
`11`		`- protected function tearDown()`
	`12`	`+ protected function _tearDown()`
`12`	`13`	`{`
`13`	`14`	`double::clean();`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace demo;`
`3`	`3`	`use \AspectMock\Core\Registry as double;`
	`4`	`+use Codeception\PHPUnit\TestCase;`
`4`	`5`
`5`		`-class StubTest extends \PHPUnit\Framework\TestCase`
	`6`	`+class StubTest extends TestCase`
`6`	`7`	`{`
`7`		`- protected function tearDown()`
	`8`	`+ protected function _tearDown()`
`8`	`9`	`{`
`9`	`10`	`double::clean();`
`10`	`11`	`}`