Update dependencies for php8 compatibility (#103)

* Update dependencies for php8 * Updating travis for php 8 and support updated versions of php 7 * Updating dist to support php8 * Update atoum * Update code with new version of atoum * Updating dependencies for prefer-lowest * Update symfony config to avoid deprecate message * Update symdony dependency injection to avoid deprecate * Remove deprecate get class from reflection * Upgrade minimum json schema
ubirak · Mar 4, 2021 · 98dba54 · 98dba54
1 parent 1c0b3ce
commit 98dba54
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 25 deletions.
diff --git a/.atoum.php b/.atoum.php
@@ -1,5 +1,5 @@
 <?php
-use \mageekguy\atoum;
+use atoum\atoum;
 
 $runner->addTestsFromDirectory(__DIR__.'/tests/Units');
 

diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,13 @@
 language: php
-dist: trusty
+dist: bionic
 cache:
     directories:
         - vendor
 php:
-    - 5.6
-    - 7
-    - 7.1
+    - 7.2
+    - 7.3
+    - 7.4
+    - 8.0
     - nightly
 env:
     matrix:

diff --git a/composer.json b/composer.json
@@ -20,24 +20,26 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.6.0",
-        "behat/behat": "~3.0",
-        "atoum/atoum": "~1.0|~2.0|~3.0|3.0.x-dev",
-        "symfony/property-access": "~2.5|~3.0|~4.0",
-        "justinrainbow/json-schema": ">=3.0 <6.0",
+        "php": ">=7.2",
+        "behat/behat": "^3.8",
+        "atoum/atoum": "^4",
+        "symfony/property-access": "~4.0",
+        "justinrainbow/json-schema": ">=5.2.10 <6.0",
         "psr/http-message": "^1.0",
-        "php-http/discovery": "^1.0",
-        "php-http/client-common": "^1.2",
-        "php-http/message": "^1.3",
-        "tolerance/tolerance": "^0.4",
-        "mtdowling/jmespath.php": "^2.3"
+        "php-http/discovery": "^1.13",
+        "php-http/client-common": "^2.3",
+        "php-http/message": "^1.11",
+        "tolerance/tolerance": "^0.4.2",
+        "mtdowling/jmespath.php": "^2.3",
+        "symfony/config": "^4.4.12 | ~5.0",
+        "symfony/dependency-injection": "^4.4.12 | ~5.0"
     },
     "require-dev": {
         "silex/silex": "~2.0",
-        "symfony/process": "~2.1|~3.0",
+        "symfony/process": "~4.0",
         "guzzlehttp/psr7": "^1.3",
         "php-http/mock-client": "^1.0",
-        "php-http/guzzle6-adapter": "^1.1.1"
+        "php-http/guzzle7-adapter": "^0.1.1"
     },
     "config": {
         "optimize-autoloader": true,

diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
@@ -1,6 +1,6 @@
 <?php
 
-use mageekguy\atoum\asserter;
+use atoum\atoum\asserter;
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\SnippetAcceptingContext;
 use Behat\Gherkin\Node\PyStringNode;

diff --git a/features/send_request_until.feature b/features/send_request_until.feature
@@ -37,7 +37,7 @@ Feature: Send request until
             <?php
             use Behat\Behat\Context\Context;
             use Ubirak\RestApiBehatExtension\Rest\RestApiBrowser;
-            use mageekguy\atoum\asserter;
+            use atoum\atoum\asserter;
 
             class FeatureContext implements Context
             {
@@ -89,7 +89,7 @@ Feature: Send request until
             <?php
             use Behat\Behat\Context\Context;
             use Ubirak\RestApiBehatExtension\Rest\RestApiBrowser;
-            use mageekguy\atoum\asserter;
+            use atoum\atoum\asserter;
 
             class FeatureContext implements Context
             {

diff --git a/src/Json/JsonContext.php b/src/Json/JsonContext.php
@@ -2,7 +2,7 @@
 
 namespace Ubirak\RestApiBehatExtension\Json;
 
-use mageekguy\atoum\asserter\generator as asserter;
+use atoum\atoum\asserter\generator as asserter;
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\SnippetAcceptingContext;
 use Behat\Gherkin\Node\PyStringNode;

diff --git a/src/Json/JsonInspectorResolver.php b/src/Json/JsonInspectorResolver.php
@@ -22,7 +22,7 @@ public function resolveArguments(\ReflectionClass $classReflection, array $argum
 
         $parameters = $constructor->getParameters();
         foreach ($parameters as $parameter) {
-            if (null !== $parameter->getClass() && $parameter->getClass()->name === 'Ubirak\RestApiBehatExtension\Json\JsonInspector') {
+            if (null !== $parameter->getType() && ((string)$parameter->getType()) === 'Ubirak\RestApiBehatExtension\Json\JsonInspector') {
                 $arguments[$parameter->name] = $this->jsonInspector;
             }
         }

diff --git a/src/Rest/RestApiBrowserResolver.php b/src/Rest/RestApiBrowserResolver.php
@@ -22,7 +22,7 @@ public function resolveArguments(\ReflectionClass $classReflection, array $argum
 
         $parameters = $constructor->getParameters();
         foreach ($parameters as $parameter) {
-            if (null !== $parameter->getClass() && $parameter->getClass()->name === 'Ubirak\RestApiBehatExtension\Rest\RestApiBrowser') {
+            if (null !== $parameter->getType() && ((string)$parameter->getType()) === 'Ubirak\RestApiBehatExtension\Rest\RestApiBrowser') {
                 $arguments[$parameter->name] = $this->restApiBrowser;
             }
         }

diff --git a/src/RestApiContext.php b/src/RestApiContext.php
@@ -2,7 +2,7 @@
 
 namespace Ubirak\RestApiBehatExtension;
 
-use mageekguy\atoum\asserter;
+use atoum\atoum\asserter;
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\SnippetAcceptingContext;
 use Behat\Gherkin\Node\PyStringNode;
@@ -50,7 +50,7 @@ public function iSendARequestWithBody($method, $url, PyStringNode $body)
     /**
      * @When I send a POST request to :url as HTML form with body:
      */
-    public function iSendAPostRequestToAsHtmlFormWithBody($url, TableNode $body) 
+    public function iSendAPostRequestToAsHtmlFormWithBody($url, TableNode $body)
     {
         $formElements = [];
         foreach ($body as $element) {