From d4290e179e6aa0fabf95c1b2cf6284202dac9a88 Mon Sep 17 00:00:00 2001
From: Lucas Michot <lucas.michot@shopify.com>
Date: Mon, 20 Apr 2020 11:03:59 +0200
Subject: [PATCH] Fix typed properties issues.

---
 src/ExtractTags.php | 55 ++++++++++++++++++++++-----------------------
 src/FormatModel.php |  2 +-
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/ExtractTags.php b/src/ExtractTags.php
index 47deeb09d..2078acfc7 100644
--- a/src/ExtractTags.php
+++ b/src/ExtractTags.php
@@ -3,12 +3,11 @@
 namespace Laravel\Telescope;
 
 use Illuminate\Broadcasting\BroadcastEvent;
-use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Events\CallQueuedListener;
 use Illuminate\Mail\SendQueuedMailable;
 use Illuminate\Notifications\SendQueuedNotifications;
-use Illuminate\Support\Arr;
 use ReflectionClass;
 use stdClass;
 
@@ -48,6 +47,22 @@ public static function fromJob($job)
         })->all();
     }
 
+    /**
+     * Resolve the value.
+     *
+     * @param  mixed  $value
+     * @return \Illuminate\Support\Collection|null
+     */
+    protected static function resolveValue($value)
+    {
+        switch (true) {
+            case $value instanceof Model:
+                return collect([$value]);
+            case $value instanceof Collection:
+                return $value->flatten();
+        }
+    }
+
     /**
      * Determine the tags for the given array.
      *
@@ -56,15 +71,9 @@ public static function fromJob($job)
      */
     public static function fromArray(array $data)
     {
-        $models = collect($data)->map(function ($value) {
-            if ($value instanceof Model) {
-                return [$value];
-            } elseif ($value instanceof EloquentCollection) {
-                return $value->flatten();
-            }
-        })->collapse()->filter();
-
-        return $models->map(function ($model) {
+        return collect($data)->map(function ($value) {
+            return static::resolveValue($value);
+        })->collapse()->filter()->map(function ($model) {
             return FormatModel::given($model);
         })->all();
     }
@@ -101,7 +110,7 @@ protected static function tagsForListener($job)
      * Determine tags for the given job.
      *
      * @param  array  $targets
-     * @return mixed
+     * @return array
      */
     protected static function explicitTags(array $targets)
     {
@@ -140,25 +149,15 @@ protected static function targetsFor($job)
      */
     protected static function modelsFor(array $targets)
     {
-        $models = [];
-
-        foreach ($targets as $target) {
-            $models[] = collect(
-                (new ReflectionClass($target))->getProperties()
-            )->map(function ($property) use ($target) {
+        return collect($targets)->map(function ($target) {
+            return collect((new ReflectionClass($target))->getProperties())->map(function ($property) use ($target) {
                 $property->setAccessible(true);
 
-                $value = $property->getValue($target);
-
-                if ($value instanceof Model) {
-                    return [$value];
-                } elseif ($value instanceof EloquentCollection) {
-                    return $value->flatten();
+                if (PHP_VERSION_ID < 70400 || ! is_object($target) || $property->isInitialized($target)) {
+                    return static::resolveValue($property->getValue($target));
                 }
-            })->collapse()->filter()->all();
-        }
-
-        return collect(Arr::collapse($models))->unique();
+            })->collapse()->filter();
+        })->collapse()->unique();
     }
 
     /**
diff --git a/src/FormatModel.php b/src/FormatModel.php
index b38c45310..aecfcb476 100644
--- a/src/FormatModel.php
+++ b/src/FormatModel.php
@@ -10,7 +10,7 @@ class FormatModel
      * Format the given model to a readable string.
      *
      * @param  \Illuminate\Database\Eloquent\Model  $model
-     * @return array
+     * @return string
      */
     public static function given($model)
     {