Fix php 7.4 tagged model typed props

src/Tags.php

@@ -9,6 +9,7 @@
 use Illuminate\Mail\SendQueuedMailable;
 use Illuminate\Notifications\SendQueuedNotifications;
 use ReflectionClass;
+use ReflectionProperty;
 use stdClass;
 
 class Tags
@@ -107,7 +108,7 @@ public static function modelsFor(array $targets)
             $models[] = collect((new ReflectionClass($target))->getProperties())->map(function ($property) use ($target) {
                 $property->setAccessible(true);
 
-                $value = $property->getValue($target);
+                $value = static::getValue($property, $target);
 
                 if ($value instanceof Model) {
                     return [$value];
@@ -120,6 +121,17 @@ public static function modelsFor(array $targets)
         return collect($models)->collapse()->unique();
     }
 
+    protected static function getValue(ReflectionProperty $property, $target)
+    {
+        if (method_exists($property, 'isInitialized')) {
+            if (! $property->isInitialized($target)) {
+                return;
+            }
+        }
+
+        return $property->getValue($target);
+    }
+
     /**
      * Extract the listener from a queued job.
      *

tests/Unit/Fixtures/FakeListenerWithProperties.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Laravel\Horizon\Tests\Unit\Fixtures;
+
+use Illuminate\Contracts\Events\Dispatcher;
+
+class FakeListenerWithProperties
+{
+    /**
+     * @var Dispatcher
+     */
+    protected $dispatcher;
+
+    /**
+     * @var FakeEventWithModel
+     */
+    protected $fakeModel;
+
+    public function __construct(Dispatcher $dispatcher)
+    {
+        $this->dispatcher = $dispatcher;
+    }
+
+    public function handle(FakeEventWithModel $fakeEventWithModel): void
+    {
+        $this->fakeModel = $fakeEventWithModel->model;
+    }
+}

tests/Unit/Fixtures/FakeListenerWithTypedProperties.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Laravel\Horizon\Tests\Unit\Fixtures;
+
+use Illuminate\Contracts\Events\Dispatcher;
+
+class FakeListenerWithTypedProperties
+{
+    protected Dispatcher $dispatcher;
+
+    protected FakeEventWithModel $fakeModel;
+
+    public function __construct(Dispatcher $dispatcher)
+    {
+        $this->dispatcher = $dispatcher;
+    }
+
+    public function handle(FakeEventWithModel $fakeEventWithModel): void
+    {
+        $this->fakeModel = $fakeEventWithModel->model;
+    }
+}

tests/Unit/RedisPayloadTest.php

@@ -15,6 +15,8 @@
 use Laravel\Horizon\Tests\Unit\Fixtures\FakeJobWithEloquentModel;
 use Laravel\Horizon\Tests\Unit\Fixtures\FakeJobWithTagsMethod;
 use Laravel\Horizon\Tests\Unit\Fixtures\FakeListener;
+use Laravel\Horizon\Tests\Unit\Fixtures\FakeListenerWithProperties;
+use Laravel\Horizon\Tests\Unit\Fixtures\FakeListenerWithTypedProperties;
 use Laravel\Horizon\Tests\Unit\Fixtures\FakeModel;
 use Laravel\Horizon\Tests\UnitTest;
 use Mockery;
@@ -94,6 +96,31 @@ public function test_tags_are_correctly_extracted_for_listeners()
         ], $JobPayload->decoded['tags']);
     }
 
+    public function test_tags_are_correctly_determined_for_listeners()
+    {
+        $JobPayload = new JobPayload(json_encode(['id' => 1]));
+
+        $job = new CallQueuedListener(FakeListenerWithProperties::class, 'handle', [new FakeEventWithModel(42)]);
+
+        $JobPayload->prepare($job);
+
+        $this->assertEquals([FakeModel::class.':42'], $JobPayload->decoded['tags']);
+    }
+
+    /**
+     * @requires PHP 7.4
+     */
+    public function test_tags_are_correctly_determined_for_listeners_with_property_types()
+    {
+        $JobPayload = new JobPayload(json_encode(['id' => 1]));
+
+        $job = new CallQueuedListener(FakeListenerWithTypedProperties::class, 'handle', [new FakeEventWithModel(21)]);
+
+        $JobPayload->prepare($job);
+
+        $this->assertEquals([FakeModel::class.':21'], $JobPayload->decoded['tags']);
+    }
+
     public function test_listener_and_event_tags_can_merge_auto_tag_events()
     {
         $JobPayload = new JobPayload(json_encode(['id' => 1]));