fix: more useful output of Illuminate\Support\Collection objects in tinker

Closes #6102

Merge request studip/studip!4640

2 files changed, 19 insertions, 3 deletions

diff --git a/cli/Commands/Base/Tinker.php b/cli/Commands/Base/Tinker.php
index fff86dc..b8161e8 100644
--- a/cli/Commands/Base/Tinker.php
+++ b/cli/Commands/Base/Tinker.php
@@ -2,6 +2,7 @@
 
 namespace Studip\Cli\Commands\Base;
 
+use Illuminate\Support\Collection;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -30,7 +31,8 @@ class Tinker extends Command
         $config->setUpdateCheck(Checker::NEVER);
         $config->setDefaultIncludes([__DIR__ . '/../../studip_cli_env.inc.php']);
         $config->addCasters([
-            SimpleCollection::class => TinkerCaster::class . '::castCollection',
+            Collection::class => TinkerCaster::class . '::castCollection',
+            SimpleCollection::class => TinkerCaster::class . '::castSimpleCollection',
             SimpleORMap::class => TinkerCaster::class . '::castModel',
         ]);
 
diff --git a/cli/Commands/Base/TinkerCaster.php b/cli/Commands/Base/TinkerCaster.php
index 9683ee2..168de58 100644
--- a/cli/Commands/Base/TinkerCaster.php
+++ b/cli/Commands/Base/TinkerCaster.php
@@ -2,6 +2,7 @@
 
 namespace Studip\Cli\Commands\Base;
 
+use Illuminate\Support\Collection;
 use SimpleCollection;
 use SimpleORMap;
 use Symfony\Component\VarDumper\Caster\Caster;
@@ -14,10 +15,10 @@ class TinkerCaster
      * @param  SimpleCollection  $collection
      * @return array
      */
-    public static function castCollection(SimpleCollection $collection)
+    public static function castCollection(Collection $collection)
     {
         return [
-            Caster::PREFIX_VIRTUAL . 'all' => [...$collection],
+            Caster::PREFIX_VIRTUAL . 'all' => $collection->all(),
         ];
     }
 
@@ -33,4 +34,17 @@ class TinkerCaster
             Caster::PREFIX_VIRTUAL . 'attributes' => $model->toArray(),
         ];
     }
+
+    /**
+     * Get an array representing the properties of a collection.
+     *
+     * @param  SimpleCollection  $collection
+     * @return array
+     */
+    public static function castSimpleCollection(SimpleCollection $collection)
+    {
+        return [
+            Caster::PREFIX_VIRTUAL . 'all' => [...$collection],
+        ];
+    }
 }