Merge pull request #10 from teampickr/fix/8

Update to PHP 7.2 and upgrade Guzzle for Laravel 8 compat.

Author: Jonathan Martin

.travis.yml

@@ -1,12 +1,13 @@
 language: php
 php:
-  - '7.0'
-  - '7.1'
+  - '7.2'
+  - '7.3'
+  - '7.4'
 
 before_script: composer install
 script: ./vendor/bin/phpunit
 
 notifications:
   email:
     on_success: never
-    on_failure: always
+    on_failure: always

composer.json

@@ -10,12 +10,12 @@
     }
   ],
   "require": {
-    "php": ">7.0",
-    "guzzlehttp/guzzle": "^6.3"
+    "php": ">7.2",
+    "guzzlehttp/guzzle": "^7.0.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "6.0",
-    "vlucas/phpdotenv": "^2.4",
+    "phpunit/phpunit": "^8.5.0",
+    "vlucas/phpdotenv": "^5.2.0",
     "illuminate/support": ">5.4"
   },
   "suggest": {

tests/AbstractTestCase.php

@@ -23,14 +23,14 @@ abstract class AbstractTestCase extends TestCase
      */
     protected $container = [];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
         require __DIR__ . '/../vendor/autoload.php';
 
         if (file_exists(__DIR__ . '/../.env')) {
-            (new Dotenv(__DIR__ . '/../'))->load();
+            (Dotenv::createImmutable('/../'))->load();
         }
 
         $this->key = getenv('GOOGLE_MAPS_KEY');

tests/DistanceMatrixRequestTest.php

@@ -23,7 +23,7 @@ public function adds_language_to_request()
 
         $request = $this->container[0]['request'];
 
-        $this->assertContains("language=en-GB", $request->getUri()->getQuery());
+        $this->assertStringContainsString("language=en-GB", $request->getUri()->getQuery());
     }
 
     /** @test */
@@ -40,7 +40,7 @@ public function adds_arrival_time_to_request()
 
         $request = $this->container[0]['request'];
 
-        $this->assertContains("arrival_time=" . $date->getTimestamp(), $request->getUri()->getQuery());
+        $this->assertStringContainsString("arrival_time=" . $date->getTimestamp(), $request->getUri()->getQuery());
     }
 
     /** @test */
@@ -57,7 +57,7 @@ public function adds_departure_time_to_request()
 
         $request = $this->container[0]['request'];
 
-        $this->assertContains("departure_time=" . $date->getTimestamp(), $request->getUri()->getQuery());
+        $this->assertStringContainsString("departure_time=" . $date->getTimestamp(), $request->getUri()->getQuery());
     }
 
     /** @test */
@@ -72,7 +72,7 @@ public function adds_traffic_model_to_request()
 
         $request = $this->container[0]['request'];
 
-        $this->assertContains("traffic_model=optimistic", $request->getUri()->getQuery());
+        $this->assertStringContainsString("traffic_model=optimistic", $request->getUri()->getQuery());
     }
 
     /** @test */
@@ -87,7 +87,7 @@ public function adds_avoid_to_request()
 
         $request = $this->container[0]['request'];
 
-        $this->assertContains("avoid=highways", $request->getUri()->getQuery());
+        $this->assertStringContainsString("avoid=highways", $request->getUri()->getQuery());
     }
 
     /** @test */
@@ -103,7 +103,7 @@ public function adds_transit_mode_to_request()
 
         $request = $this->container[0]['request'];
 
-        $this->assertContains("transit_mode=" . urlencode("rail|bus"), $request->getUri()->getQuery());
+        $this->assertStringContainsString("transit_mode=" . urlencode("rail|bus"), $request->getUri()->getQuery());
     }
 
     /** @test */
@@ -119,8 +119,8 @@ public function adds_transit_routing_preference_request()
 
         $request = $this->container[0]['request'];
 
-        $this->assertContains("transit_mode=rail", $request->getUri()->getQuery());
-        $this->assertContains("transit_routing_preference=less_walking", $request->getUri()->getQuery());
+        $this->assertStringContainsString("transit_mode=rail", $request->getUri()->getQuery());
+        $this->assertStringContainsString("transit_routing_preference=less_walking", $request->getUri()->getQuery());
     }
 
     /** @test */
@@ -135,7 +135,7 @@ public function adds_units_to_request()
 
         $request = $this->container[0]['request'];
 
-        $this->assertContains("units=metric", $request->getUri()->getQuery());
+        $this->assertStringContainsString("units=metric", $request->getUri()->getQuery());
     }
 
     /** @test */
@@ -150,7 +150,7 @@ public function adds_region_to_request()
 
         $request = $this->container[0]['request'];
 
-        $this->assertContains("region=GB", $request->getUri()->getQuery());
+        $this->assertStringContainsString("region=GB", $request->getUri()->getQuery());
     }
 
     /** @test */
@@ -185,7 +185,7 @@ public function return_duration_in_traffic_request()
 
         $request = $this->container[0]['request'];
 
-        $this->assertContains("arrival_time=" . $date, $request->getUri()->getQuery());
+        $this->assertStringContainsString("arrival_time=" . $date, $request->getUri()->getQuery());
         $this->assertInstanceOf(DistanceMatrixResponse::class, $response);
         $this->assertTrue($response->successful());
         $this->assertNotNull($response->successful());

tests/PremiumLicenseTest.php

@@ -4,10 +4,8 @@
 
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\Psr7\Response;
-use PHPUnit\Framework\TestCase;
 use TeamPickr\DistanceMatrix\DistanceMatrix;
 use TeamPickr\DistanceMatrix\Licenses\PremiumLicense;
-use TeamPickr\DistanceMatrix\Licenses\StandardLicense;
 
 class PremiumLicenseTest extends AbstractTestCase
 {
@@ -26,7 +24,7 @@ public function can_make_premium_license()
 
         $request = $this->container[0]['request'];
 
-        $this->assertContains("signature=", $request->getUri()->getQuery());
-        $this->assertContains("client=" . getenv('GOOGLE_MAPS_CLIENT_ID'), $request->getUri()->getQuery());
+        $this->assertStringContainsString("signature=", $request->getUri()->getQuery());
+        $this->assertStringContainsString("client=" . getenv('GOOGLE_MAPS_CLIENT_ID'), $request->getUri()->getQuery());
     }
 }