Merge pull request #57 from understand/feature/laravel-9-php-8-1

Laravel 9 and PHP8.1 support

Author: mauricius

.github/workflows/run-test.yml

@@ -3,13 +3,16 @@ name: run-tests
 jobs:
   php-tests:
     runs-on: ubuntu-latest
+    continue-on-error: true
 
     strategy:
       matrix:
-        php: [8.0, 7.4, 7.3, 7.2]
-        laravel: [8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*]
+        php: [8.1, 8.0, 7.4, 7.3, 7.2]
+        laravel: [9.*, 8.*, 7.*, 6.*, 5.8.*, 5.7.*, 5.6.*, 5.5.*]
 
         include:
+          - laravel: 9.*
+            testbench: 7.*
           - laravel: 8.*
             testbench: 6.*
           - laravel: 7.*
@@ -26,20 +29,38 @@ jobs:
             testbench: 3.5.*
 
         exclude:
-          - laravel: 8.*
-            php: 7.2
-          - laravel: 5.8.*
-            php: 8.0
-          - laravel: 5.7.*
-            php: 8.0
-          - laravel: 5.6.*
-            php: 8.0
-          - laravel: 5.5.*
-            php: 8.0
-          - laravel: 5.5.*
-            php: 7.4
+          - php: 7.2
+            laravel: 9.*
+          - php: 7.3
+            laravel: 9.*
+          - php: 7.4
+            laravel: 9.*
+          - php: 7.2
+            laravel: 8.*
+          - php: 8.1
+            laravel: 7.*
+          - php: 8.1
+            laravel: 6.*
+          - php: 8.1
+            laravel: 5.8.*
+          - php: 8.0
+            laravel: 5.8.*
+          - php: 8.1
+            laravel: 5.7.*
+          - php: 8.0
+            laravel: 5.7.*
+          - php: 8.1
+            laravel: 5.6.*
+          - php: 8.0
+            laravel: 5.6.*
+          - php: 8.1
+            laravel: 5.5.*
+          - php: 8.0
+            laravel: 5.5.*
+          - php: 7.4
+            laravel: 5.5.*
 
-    name: P${{ matrix.php }} - L${{ matrix.laravel }}
+    name: P${{ matrix.php }} - L${{ matrix.laravel }} - T${{ matrix.testbench }}
 
     steps:
       - name: Checkout code
@@ -54,8 +75,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-            composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
-            composer update --prefer-dist --no-interaction
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --prefer-dist --no-interaction
 
       - name: Execute tests
         run: vendor/bin/phpunit

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "understand/understand-laravel",
-    "description": "Laravel 5, 6, 7 and 8 service provider for Understand.io",
-    "keywords": ["laravel", "understand.io", "understand", "logs", "laravel 5", "Laravel 6"],
+    "description": "Laravel 5, 6, 7, 8 and 9 service provider for Understand.io",
+    "keywords": ["laravel", "understand.io", "understand", "logs"],
     "license": "MIT",
     "authors": [
         {
@@ -10,14 +10,15 @@
         }
     ],
     "require": {
-        "php": "^5.5 || ^7.0 || ^8.0",
+        "php": "^5.5 || ^7.0 || ^8.0 || ^8.1",
         "ext-curl": "*",
-        "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0"
+        "illuminate/support": "^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0 || ^9.0",
         "orchestra/testbench": "3.* || 4.* || 5.* || 6.*",
-        "mockery/mockery": "^1.2"
+        "mockery/mockery": "^1.2",
+        "ext-json": "*"
     },
     "autoload": {
 		"psr-0": {
@@ -26,7 +27,7 @@
     },
     "extra": {
         "component": "package",
-        "frameworks": ["Laravel 5", "Laravel 6", "Laravel 7", "Laravel 8"],
+        "frameworks": ["Laravel 5", "Laravel 6", "Laravel 7", "Laravel 8", "Laravel 9"],
         "branch-alias": {
 			"dev-master": "2.0-dev"
 		},

src/Understand/UnderstandLaravel5/Handlers/BaseHandler.php

@@ -98,6 +98,10 @@ protected function getEndpoint()
      */
     protected function parseResponse($response)
     {
+        if (is_null($response)) {
+            return [];
+        }
+
         return json_decode($response, true);
     }
 }

src/Understand/UnderstandLaravel5/UnderstandLaravel5ServiceProvider.php

@@ -298,18 +298,18 @@ protected function resolveHandler($app)
 
         throw new \ErrorException('understand-laravel handler misconfiguration:' . $handlerType);
     }
-    
+
     /**
      * Detect Laravel version
-     * 
+     *
      * @param array $versions
      * @return type
      */
     protected function detectLaravelVersion(array $versions)
     {
         return Str::startsWith(Application::VERSION, $versions);
     }
-    
+
     /**
      * Listen Laravel logs and queue events
      *
@@ -329,7 +329,7 @@ protected function listenLaravelEvents()
         {
             // starting from L5.4 MessageLogged event class was introduced
             // https://github.com/laravel/framework/commit/57c82d095c356a0fe0f9381536afec768cdcc072
-            $this->app['events']->listen('Illuminate\Log\Events\MessageLogged', function($log) 
+            $this->app['events']->listen('Illuminate\Log\Events\MessageLogged', function($log)
             {
 
                 $this->handleEvent($log->level, $log->message, $log->context);
@@ -401,7 +401,7 @@ protected function listenQueryEvents()
 
     /**
      * Handle a new log event
-     * 
+     *
      * @param string $level
      * @param mixed $message
      * @param array $context

tests/EventListenerTest.php

@@ -144,7 +144,7 @@ public function testIgnoredLogsConfig()
 
         $this->assertSame($called, 2);
     }
-    
+
     /**
      * Test error handler logging
      */
@@ -168,18 +168,18 @@ public function testErrorHandlerExceptionLogging()
         $handler = new CallbackHandler($callback);
 
         $this->app['understand.logger'] = new Logger($fieldProvider, $handler, false);
-        
+
         $this->app->singleton('Illuminate\Contracts\Debug\ExceptionHandler', 'Illuminate\Foundation\Exceptions\Handler');
-            
+
         $exception = new \RuntimeException('Test');
         $this->app['Illuminate\Foundation\Exceptions\Handler']->report($exception);
-        
+
         $this->assertSame($called, 1);
     }
-        
+
     /**
      * Test message tag
-     * 
+     *
      * @return void
      */
     public function testExceptionLogTag()
@@ -199,28 +199,28 @@ public function testExceptionLogTag()
         $handler = new CallbackHandler($callback);
 
         $this->app['understand.logger'] = new Logger($fieldProvider, $handler, false);
-        
+
         $exception = new \RuntimeException('Test');
         $this->app['Psr\Log\LoggerInterface']->error($exception);
 
         $this->assertSame($called, 1);
         $this->assertTrue($exceptionLogTag);
     }
-    
+
     /**
      * Test token provider values
-     * 
+     *
      * @return void
      */
     public function testTokenProviderValue()
     {
         $token = $this->app['understand.tokenProvider']->getToken();
         $token2 = $this->app['understand.tokenProvider']->getToken();
-            
+
         $this->assertNotEmpty($token2);
         $this->assertSame($token2, $token);
     }
-    
+
     /**
      * @return void
      */
@@ -250,7 +250,7 @@ public function testLoggerMessageInteger()
         $this->assertSame($called, 1);
         $this->assertTrue($messageSame);
     }
-    
+
     /**
      * @return void
      */
@@ -265,8 +265,10 @@ public function testLoggerMessageBoolean()
             $called++;
             $decoded = json_decode($data, true);
 
-            // `false` should be casted to `0`
-            $messageSame = '0' === $decoded['message'];
+            // `false` should be casted to `0` in L<9
+            // `false` should be casted to `` in L9
+            $messageSame = in_array($decoded['message'], ['', '0'], true);
+
             $laravelLogTag = in_array('exception_log', $decoded['tags'], true);
         };
 

tests/ExceptionEncoderTest.php

@@ -101,7 +101,7 @@ protected function assertIncompleteClassStackTrace($exception, $index)
         $encoder = new Understand\UnderstandLaravel5\ExceptionEncoder();
         $stackTraceArray = $encoder->stackTraceToArray($exception->getTrace());
 
-        if (Str::startsWith(phpversion(), ['7.4', '8.0'])) {
+        if (Str::startsWith(phpversion(), ['7.4', '8.0', '8.1'])) {
             // As of PHP 7.4 Exception::getTrace()
             // no longer contains "args" keys by default
             $this->assertSame([], $stackTraceArray[$index]['args']);