Merge pull request #27 from tzurbaev/patch-1

Catch `\Throwable` before `\Exception`

Author: aivis

src/Understand/UnderstandLaravel5/ExceptionEncoder.php

@@ -216,6 +216,8 @@ public function getCode($relativePath, $line, $linesAround = 6)
 
             return $codeLines;
         }
+        catch (\Throwable $e)
+        {}
         catch (\Exception $e)
         {}
     }

src/Understand/UnderstandLaravel5/FieldProvider.php

@@ -431,6 +431,8 @@ protected function getUserId()
                 return $userId;
             }
         }
+        catch (\Throwable $e)
+        {}
         catch (\Exception $e)
         {}
 
@@ -441,6 +443,8 @@ protected function getUserId()
                 return $user->id;
             }
         }
+        catch (\Throwable $e)
+        {}
         catch (\Exception $e)
         {}
 
@@ -451,6 +455,8 @@ protected function getUserId()
                 return $user->id;
             }
         }
+        catch (\Throwable $e)
+        {}
         catch (\Exception $e)
         {}
     }

src/Understand/UnderstandLaravel5/Logger.php

@@ -153,6 +153,10 @@ protected function send(array $event)
         {
             return $this->handler->handle($event);
         }
+        catch (\Throwable $e)
+        {
+            return false;
+        }
         catch (\Exception $ex)
         {
             return false;

tests/FieldProviderTest.php

@@ -29,7 +29,7 @@ public function testExtend()
 
         $this->assertSame($value, $fieldProvider->{$method}());
     }
-    
+
     public function testLaravelAuth()
     {
         $userId = 23452345;
@@ -71,6 +71,18 @@ public function testSentryGetUser()
         $this->assertSame($user->id, $currentUserId);
     }
 
+    public function testFieldProviderThrowsAnException()
+    {
+        $loader = AliasLoader::getInstance();
+        $loader->alias('Sentry', '\Illuminate\Support\Facades\Auth');
+
+        \Illuminate\Support\Facades\Auth::shouldReceive('getUser')->andThrow('Exception');
+
+        $currentUserId = $this->app['understand.fieldProvider']->getUserId();
+
+        $this->assertNull($currentUserId);
+    }
+
     public function testQueryCount()
     {
         $this->app['understand.dataCollector']->set('sql_queries', range(1, 1000));