WIP: Updates to Behat ~3.3, PHPUnit ^8.5 || ^9.0

composer.json

@@ -13,17 +13,19 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "behat/behat": "~3.3.0",
+        "behat/behat": "~3.3",
         "guzzlehttp/guzzle": "~6.0",
         "justinrainbow/json-schema": "~4.1|~5.0",
         "seromenho/xml-validator": "~v1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.4"
+        "phpunit/phpunit": "^8.5 || ^9.0"
     },
     "autoload": {
-        "psr-0": {
-            "Arachne\\": "src/"
+        "psr-4": {
+            "Arachne\\": "src/Arachne/",
+            "Arachne\\Mocks\\": "tests/Arachne/Mocks/",
+            "Arachne\\Tests\\": "tests/Arachne/Tests/"
         }
     }
-}
+}

tests/Arachne/Tests/Context/ArachneContextTest.php

@@ -15,13 +15,14 @@
 use Arachne\Context\ArachneContext;
 use Arachne\Mocks\Factory;
 use Arachne\Mocks\Http\Client;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ArachneContextTest
  * @package Arachne\Tests\FileSystem
  * @author Wojtek Gancarczyk <[email protected]>
  */
-class ArachneContextTest extends \PHPUnit_Framework_TestCase
+class ArachneContextTest extends TestCase
 {
     /**
      * @var ArachneContext
@@ -33,7 +34,7 @@ class ArachneContextTest extends \PHPUnit_Framework_TestCase
      */
     private $client;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->client = Factory::createHttpClient();
         $this->context = new ArachneContext;
@@ -42,7 +43,8 @@ public function setUp()
 
     public function testFailIfHttpClientWasNotSet()
     {
-        $this->setExpectedException('RuntimeException', 'Http client was not set');
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Http client was not set');
         $context = new ArachneContext;
         $context->iSendTheRequest();
     }
@@ -84,10 +86,8 @@ public function testTheStatusCodeShouldBe()
 
     public function testFailTheStatusCodeShouldBeIfTheStatusCodeIsInvalid()
     {
-        $this->setExpectedException(
-            '\Arachne\Exception\InvalidStatusCode',
-            'Resource returned status code 200, status code 400 expected.'
-        );
+        $this->expectException(\Arachne\Exception\InvalidStatusCode::class);
+        $this->expectExceptionMessage('Resource returned status code 200, status code 400 expected.');
         $this->context->iSendTheRequest();
         $this->context->theStatusCodeShouldBe(400);
     }

tests/Arachne/Tests/Context/Initializer/ArachneInitializerTest.php

@@ -14,20 +14,21 @@
 use Arachne\Auth\DummyProvider;
 use Arachne\Context\Initializer\ArachneInitializer;
 use Arachne\Mocks;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ArachneInitializerTest
  * @package Arachne\Tests\Context\Initilizer
  * @author Wojtek Gancarczyk <[email protected]>
  */
-class ArachneInitializerTest extends \PHPUnit_Framework_TestCase
+class ArachneInitializerTest extends TestCase
 {
     /**
      * @var ArachneInitializer
      */
     private $initializer;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->initializer = new ArachneInitializer(
             Mocks\Factory::createValidationProvider(),

tests/Arachne/Tests/FileSystem/FileLocatorTest.php

@@ -13,27 +13,29 @@
 
 use Arachne\FileSystem\FileLocator;
 use Arachne\Mocks\Factory;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class FileLocatorTest
  * @package Arachne\Tests\FileSystem
  * @author Wojtek Gancarczyk <[email protected]>
  */
-class FileLocatorTest extends \PHPUnit_Framework_TestCase
+class FileLocatorTest extends TestCase
 {
     /**
      * @var FileLocator
      */
     private $fileLocator;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->fileLocator = Factory::createFileLocator();
     }
 
     public function testFailOnNotExistingConfigurationValue()
     {
-        $this->setExpectedException('RuntimeException', '`request_file_dir` missing in the configuration');
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('`request_file_dir` missing in the configuration');
         $fileLocator = new FileLocator(array());
         $fileLocator->locateRequestFile('not', 'existing');
     }
@@ -51,7 +53,8 @@ public function testLocateSchemaFile()
 
     public function testFailLocatingNotExistingSchemaFile()
     {
-        $this->setExpectedException('RuntimeException', 'Schema file not.existing cannot be found');
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Schema file not.existing cannot be found');
         $this->fileLocator->locateSchemaFile('not', 'existing');
     }
 
@@ -68,7 +71,8 @@ public function testLocateRequestFile()
 
     public function testFailLocatingNotExistingRequestFile()
     {
-        $this->setExpectedException('RuntimeException', 'Request file not.existing cannot be found');
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Request file not.existing cannot be found');
         $this->fileLocator->locateRequestFile('not', 'existing');
     }
 
@@ -85,7 +89,8 @@ public function testLocateResponseFile()
 
     public function testFailLocatingNotExistingResponseFile()
     {
-        $this->setExpectedException('RuntimeException', 'Response file not.existing cannot be found');
+        $this->expectException(\RuntimeException::class);
+        $this->expectExceptionMessage('Response file not.existing cannot be found');
         $this->fileLocator->locateResponseFile('not', 'existing');
     }
 }

tests/Arachne/Tests/Http/Client/GuzzleTest.php

@@ -16,13 +16,14 @@
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class GuzzleTest
  * @package Arachne\Tests\Http\Client
  * @author Wojtek Gancarczyk <[email protected]>
  */
-class GuzzleTest extends \PHPUnit_Framework_TestCase
+class GuzzleTest extends TestCase
 {
     public function testDoNotFailIfResponseCodeIs404()
     {

tests/Arachne/Tests/ServiceContainer/ArachneExtensionTest.php

@@ -12,14 +12,15 @@
 namespace Arachne\Tests\ServiceContainer;
 
 use Arachne\ServiceContainer\ArachneExtension;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 /**
  * Class ArachneExtensionTest
  * @package Arachne\Tests\ServiceContainer
  * @author Wojtek Gancarczyk <[email protected]>
  */
-class ArachneExtensionTest extends \PHPUnit_Framework_TestCase
+class ArachneExtensionTest extends TestCase
 {
     public function testDoNotFailIfAuthProviderNotSetUp()
     {
@@ -30,6 +31,7 @@ public function testDoNotFailIfAuthProviderNotSetUp()
         $containerBuilder = new ContainerBuilder;
         $extension = new ArachneExtension;
         $extension->load($containerBuilder, $config);
+        $containerBuilder->registerExtension($extension);
         $containerBuilder->compile();
         $this->assertSame(
             'Arachne\Context\Initializer\ArachneInitializer',

tests/Arachne/Tests/Validation/Schema/JsonSchemaTest.php

@@ -12,13 +12,14 @@
 namespace Arachne\Tests\Validation\Schema;
 
 use Arachne\Validation\Schema\JsonSchema;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class JsonSchemaTest
  * @package Arachne\Tests\Validation\Schema
  * @author Wojtek Gancarczyk <[email protected]>
  */
-class JsonSchemaTest extends \PHPUnit_Framework_TestCase
+class JsonSchemaTest extends TestCase
 {
     public function testDoesNotFailOnValidSchema()
     {
@@ -31,7 +32,8 @@ public function testDoesNotFailOnValidSchema()
 
     public function testFailsOnInvalidSchema()
     {
-        $this->setExpectedException(\Arachne\Exception\InvalidJson::class, 'The property lastName is required');
+        $this->expectException(\Arachne\Exception\InvalidJson::class);
+        $this->expectExceptionMessage('The property lastName is required');
         $validator = new JsonSchema;
         $validator->validateAgainstSchema(
             file_get_contents(implode(DIRECTORY_SEPARATOR, [FIXTURES_DIR, 'responses', 'test-invalid.json'])),

tests/Arachne/Tests/Validation/Schema/XmlSchemaTest.php

@@ -12,13 +12,14 @@
 namespace Arachne\Tests\Validation\Schema;
 
 use Arachne\Validation\Schema\XmlSchema;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class XmlSchemaTest
  * @package Arachne\Tests\Validation\Schema
  * @author Wojtek Gancarczyk <[email protected]>
  */
-class XmlSchemaTest extends \PHPUnit_Framework_TestCase
+class XmlSchemaTest extends TestCase
 {
     public function testDoesNotFailOnValidSchema()
     {
@@ -31,10 +32,8 @@ public function testDoesNotFailOnValidSchema()
 
     public function testFailsOnInvalidSchema()
     {
-        $this->setExpectedException(
-          \Arachne\Exception\InvalidXml::class,
-          "Element 'invalid': This element is not expected. Expected is ( child_string )."
-        );
+        $this->expectException(\Arachne\Exception\InvalidXml::class);
+        $this->expectExceptionMessage("Element 'invalid': This element is not expected. Expected is ( child_string ).");
         $validator = new XmlSchema;
         $validator->validateAgainstSchema(
             file_get_contents(implode(DIRECTORY_SEPARATOR, [FIXTURES_DIR, 'responses', 'test-invalid.xml'])),