Ensure protected/private lastCompiled can be accessed by ScoutViewEng…

…ineDecorator
scoutapp · Aug 24, 2023 · 5a91348 · 5a91348
1 parent b688956
commit 5a91348
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/src/Laravel/View/Engine/ScoutViewEngineDecorator.php b/src/Laravel/View/Engine/ScoutViewEngineDecorator.php
@@ -4,6 +4,7 @@
 
 namespace Scoutapm\Laravel\View\Engine;
 
+use Closure;
 use Illuminate\Contracts\View\Engine;
 use Illuminate\View\Compilers\CompilerInterface;
 use Illuminate\View\Factory;
@@ -57,9 +58,15 @@ public function __construct(Engine $engine, ScoutApmAgent $agent, Factory $viewF
 
         /**
          * @psalm-suppress MixedAssignment
-         * @psalm-suppress NoInterfaceProperties
+         * @psalm-suppress PossiblyInvalidFunctionCall
          */
-        $this->lastCompiled = &$engine->lastCompiled;
+        $this->lastCompiled = & Closure::bind(
+            function & () {
+                return $this->lastCompiled;
+            },
+            $engine,
+            $engine
+        )->__invoke();
     }
 
     /**

diff --git a/tests/Unit/Laravel/View/Engine/EngineImplementationWithGetCompilerMethod.php b/tests/Unit/Laravel/View/Engine/EngineImplementationWithGetCompilerMethod.php
@@ -9,12 +9,21 @@
 
 class EngineImplementationWithGetCompilerMethod implements Engine
 {
+    /** @var list<non-empty-string> */
+    protected $lastCompiled = [];
+
     /** @inheritDoc */
     public function get($path, array $data = [])
     {
         return '';
     }
 
+    /** @param list<non-empty-string> $newValue */
+    public function setLastCompiled(array $newValue): void
+    {
+        $this->lastCompiled = $newValue;
+    }
+
     public function getCompiler(): CompilerInterface
     {
         return new class implements CompilerInterface {

diff --git a/tests/Unit/Laravel/View/Engine/ScoutViewEngineDecoratorTest.php b/tests/Unit/Laravel/View/Engine/ScoutViewEngineDecoratorTest.php
@@ -211,24 +211,17 @@ public function testSpatieLaravelIgnitionCompatibility(): void
     /** @throws ReflectionException */
     public function testDecoratorLastCompiledPropertyReferencesCompilerEngineLastCompiledPropertyWhenUsingReflection(): void
     {
-        /**
-         * @noinspection PhpPossiblePolymorphicInvocationInspection
-         * @psalm-suppress NoInterfaceProperties
-         */
-        $this->realEngine->lastCompiled = ['a', 'b'];
+        $realEngine = new EngineImplementationWithGetCompilerMethod();
+        $realEngine->setLastCompiled(['a', 'b']);
 
-        $this->viewEngineDecorator = new ScoutViewEngineDecorator($this->realEngine, $this->agent, $this->viewFactory);
+        $this->viewEngineDecorator = new ScoutViewEngineDecorator($realEngine, $this->agent, $this->viewFactory);
 
         $prop = new ReflectionProperty($this->viewEngineDecorator, 'lastCompiled');
         $prop->setAccessible(true);
         self::assertSame(['a', 'b'], $prop->getValue($this->viewEngineDecorator));
 
-        /**
-         * @noinspection PhpPossiblePolymorphicInvocationInspection
-         * @psalm-suppress NoInterfaceProperties
-         */
-        $this->realEngine->lastCompiled = ['a', 'b', 'c'];
-
+        // Make sure the value can be changed at runtime, and the decorator's value is also changed
+        $realEngine->setLastCompiled(['a', 'b', 'c']);
         self::assertSame(['a', 'b', 'c'], $prop->getValue($this->viewEngineDecorator));
     }
 }