Merge pull request #45 from Vinelab/laravel-9

Support Laravel 9

Author: KinaneD

.travis.yml

@@ -1,4 +1,7 @@
 language: php
 php:
   - 7.1
+  - 7.4
+  - 8.0
+  - 8.1
 before_script: composer install

composer.json

@@ -17,16 +17,16 @@
     }
   ],
   "require": {
-    "php": "^7.1.3|^8.0.0",
-    "illuminate/bus": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
-    "illuminate/console": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
-    "illuminate/contracts": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
-    "illuminate/http": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
-    "illuminate/log": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
-    "illuminate/container": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
-    "illuminate/queue": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
-    "illuminate/routing": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
-    "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0",
+    "php": "^7.1.3|^8.0.0|^8.1.0",
+    "illuminate/bus": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0",
+    "illuminate/console": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0",
+    "illuminate/contracts": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0",
+    "illuminate/http": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0",
+    "illuminate/log": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0",
+    "illuminate/container": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0",
+    "illuminate/queue": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0",
+    "illuminate/routing": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0",
+    "illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0|^8.0|^9.0",
     "openzipkin/zipkin": "~2.0.2|~3.0",
     "psr/http-message": "~1.0",
     "ramsey/uuid": "~3.0|~4.0"
@@ -36,7 +36,7 @@
     "guzzlehttp/psr7": "~1.0|~2.0",
     "mockery/mockery": "~1.0",
     "php-amqplib/php-amqplib": "~2.8|~3.0",
-    "phpunit/phpunit": "~7.0|~8.0",
+    "phpunit/phpunit": "~7.0|~8.0|~9.0",
     "vinelab/http": "~1.5",
     "lucid-arch/laravel-foundation": "^7.0|^8.0",
     "lucidarch/lucid": "^1.0"

tests/Zipkin/TraceRequestsTest.php

@@ -48,7 +48,7 @@ public function trace_http_requests()
         $reporter->shouldHaveReceived('report')->with(Mockery::on(function ($spans) {
             $span = $this->shiftSpan($spans);
 
-            $this->assertRegExp('/^POST \/?shipments\/{id}$/', $span->getName());
+            $this->assertMatchesRegularExpression('/^POST \/?shipments\/{id}$/', $span->getName());
             $this->assertEquals('http', Arr::get($span->getTags(), 'type'));
             $this->assertEquals('POST', Arr::get($span->getTags(), 'request_method'));
             $this->assertEquals('shipments/3242', Arr::get($span->getTags(), 'request_path'));

tests/Zipkin/TracerTest.php

@@ -130,6 +130,7 @@ public function control_span_duration()
 
         $reporter->shouldHaveReceived('report')->with(Mockery::on(function ($spans) {
             $duration = $this->shiftSpan($spans)->getDuration();
+
             $this->assertTrue($duration > 0);
             return true;
         }));
@@ -151,7 +152,7 @@ public function control_span_relationships()
         $reporter->shouldHaveReceived('report')->with(Mockery::on(function ($spans) {
             $span = $this->shiftSpan($spans);
 
-            $this->assertRegExp($this->getRegexpForUUID(), Arr::get($span->getTags(), 'uuid'));
+            $this->assertMatchesRegularExpression($this->getRegexpForUUID(), Arr::get($span->getTags(), 'uuid'));
             $this->assertNotNull($span->getSpanId());
             $this->assertNull($span->getParentId());
 
@@ -340,9 +341,9 @@ public function propagate_vinelab_http()
 
         $request = $tracer->inject([], Formats::VINELAB_HTTP);
 
-        $this->assertRegExp('/x-b3-traceid: \w/', Arr::get($request, 'headers.0', ''));
-        $this->assertRegExp('/x-b3-spanid: \w/', Arr::get($request, 'headers.1', ''));
-        $this->assertRegExp('/x-b3-sampled: \d/', Arr::get($request, 'headers.2', ''));
+        $this->assertMatchesRegularExpression('/x-b3-traceid: \w/', Arr::get($request, 'headers.0', ''));
+        $this->assertMatchesRegularExpression('/x-b3-spanid: \w/', Arr::get($request, 'headers.1', ''));
+        $this->assertMatchesRegularExpression('/x-b3-sampled: \d/', Arr::get($request, 'headers.2', ''));
     }
 
     /**