Merge pull request #28 from understand/bugfix/context-exception-support

add support for 5.7 context->exception, test improvements

Author: aivis

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - hhvm
 
 before_script:

composer.json

@@ -15,9 +15,9 @@
         "illuminate/support": "~5.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.7",
+        "phpunit/phpunit": "~6.0",
         "mockery/mockery": "^0.9.4",
-        "orchestra/testbench": "^3.4"
+        "orchestra/testbench": "^3.5"
     },
     "autoload": {
 		"psr-0": {

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Package Test Suite">

src/Understand/UnderstandLaravel5/UnderstandLaravel5ServiceProvider.php

@@ -303,7 +303,7 @@ protected function handleEvent($level, $message, $context)
             $this->app['understand.eventLogger']->logEvent($level, $message, $context);
         }
         // `\Log::notice`, `\Log::warning`, `\Log::error`, `\Log::critical`, `\Log::alert`, `\Log::emergency` and `\Exception`, `\Throwable`
-        else if ($this->detectLaravelVersion(['5.6']) && isset($context['exception']) && ($context['exception'] instanceof Exception || $context['exception'] instanceof Throwable))
+        else if ($this->detectLaravelVersion(['5.6', '5.7']) && isset($context['exception']) && ($context['exception'] instanceof Exception || $context['exception'] instanceof Throwable))
         {
             $exception = $context['exception'];
             unset($context['exception']);

tests/EventListenerTest.php

@@ -93,6 +93,8 @@ public function testErrorHandlerExceptionLogging()
             $called++;
             $decoded = json_decode($data, true);
 
+            $this->assertEquals('EventListenerTest', $decoded['stack'][0]['class']);
+
             $laravelLogTag = in_array('exception_log', $decoded['tags'], true);
         };
 
@@ -103,7 +105,7 @@ public function testErrorHandlerExceptionLogging()
 
         $this->app->singleton('Illuminate\Contracts\Debug\ExceptionHandler', 'Illuminate\Foundation\Exceptions\Handler');
 
-        $exception = new \RuntimeException();
+        $exception = new \RuntimeException('Test');
         $this->app['Illuminate\Foundation\Exceptions\Handler']->report($exception);
 
         $this->assertSame($called, 1);

tests/ExceptionEncoderTest.php

@@ -1,6 +1,8 @@
 <?php
 
-class ExceptionEncoderTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class ExceptionEncoderTest extends TestCase
 {
     public function testExceptionObjectResult()
     {
@@ -98,7 +100,14 @@ protected function assertIncompleteClassStackTrace($exception, $index)
         $encoder = new Understand\UnderstandLaravel5\ExceptionEncoder();
         $stackTraceArray = $encoder->stackTraceToArray($exception->getTrace());
 
-        $this->assertSame('object(__PHP_Incomplete_Class)', $stackTraceArray[$index]['args'][0]);
+        if (starts_with(phpversion(), '7.2'))
+        {
+            $this->assertSame('__PHP_Incomplete_Class', $stackTraceArray[$index]['args'][0]);
+        }
+        else
+        {
+            $this->assertSame('object(__PHP_Incomplete_Class)', $stackTraceArray[$index]['args'][0]);
+        }
     }
 
     public function testStackTraceLimit()

tests/TestFileReaderTest.php

@@ -1,8 +1,9 @@
 <?php
 
 use Understand\UnderstandLaravel5\ExceptionEncoder;
+use PHPUnit\Framework\TestCase;
 
-class TestFileReaderTest extends PHPUnit_Framework_TestCase
+class TestFileReaderTest extends TestCase
 {
     public function testCodeReader()
     {

tests/TokenProviderTest.php

@@ -1,6 +1,8 @@
 <?php
 
-class TokenProviderTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class TokenProviderTest extends TestCase
 {
     public function testRandomToken()
     {