Merge pull request #16 from liam-wiltshire/svenluijten-patch-1

Svenluijten patch 1

Author: liam-wiltshire

src/Concerns/AutoloadsRelationships.php

@@ -91,12 +91,16 @@ private function logAutoload(string $relationship)
         $this->getLogDriver();
 
         $file = $stack['file'];
-        $lineNo = $stack['line'];
-
-        $blade = $this->getBlade($file);
-
-        $this->logDriver->info("[LARAVEL-JIT-LOADER] Relationship ". static::class."::{$relationship} was JIT-loaded."
-            ." Called in {$file} on line {$lineNo}" . ($blade ? " view: {$blade})" : ""));
+        
+        $this->logDriver->info(
+            '[LARAVEL-JIT-LOADER] Relationship '.static::class.'::'.$relationship.' was JIT-loaded.',
+            [
+                'relationship' => static::class.'::'.$relationship,
+                'file' => $file,
+                'line' => $stack['line'],
+                'view' => $this->getBlade($file),
+            ]
+        );
     }
 
     /**

tests/Concerns/AutoloadsRelationshipsTest.php

@@ -51,13 +51,19 @@ public function testGetRelationshipFromMethodUnderThresholdDoesAutoLoad()
 
     public function testGetRelationshipFromMethodUnderThresholdDoesAutoLoadWithLogging()
     {
-        $message = "[LARAVEL-JIT-LOADER] Relationship " . TraitModel::class . "::myRelationship was JIT-loaded. Called in " . __FILE__ . " on line " . (__LINE__ + 12);
+        $message = "[LARAVEL-JIT-LOADER] Relationship " . TraitModel::class . "::myRelationship was JIT-loaded.";
+        $context = [
+            'relationship' => TraitModel::class.'::myRelationship',
+            'file' => __FILE__,
+            'line' => __LINE__ + 14,
+            'view' => false,
+        ];
 
         $driver = $this->getMockBuilder(LoggerInterface::class)->getMock();
         $driver
             ->expects($this->atLeastOnce())
             ->method('info')
-            ->with($message)
+            ->with($message, $context)
             ->willReturn(true);
 
         $models = TraitModel::all();