add PropertyCollection

src/PropertyCollection.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace Leuverink\PropertyAttribute;
+
+use Iterator;
+use ArrayAccess;
+use ArrayIterator;
+use IteratorAggregate;
+use Livewire\Component;
+
+class PropertyCollection implements ArrayAccess, IteratorAggregate
+{
+    final public function __construct(
+        private readonly Component $component,
+        private array $items = []
+    ) {}
+
+    public static function make(Component $component, $items = [])
+    {
+        return new static($component, (array) $items);
+    }
+
+    /*
+    |--------------------------------------------------------------------------
+    | Collection methods
+    |--------------------------------------------------------------------------
+    */
+    public function toArray(): array
+    {
+        return $this->items;
+    }
+
+    public function keys(): array
+    {
+        return array_keys($this->items);
+    }
+
+    public function values(): array
+    {
+        return array_values($this->items);
+    }
+
+    public function each(callable $callback): self
+    {
+        foreach ($this as $key => $item) {
+            if ($callback($item, $key) === false) {
+                break;
+            }
+        }
+
+        return $this;
+    }
+
+    /*
+    |--------------------------------------------------------------------------
+    | ArrayAccess/Iterator methods
+    |--------------------------------------------------------------------------
+    */
+    public function offsetExists($offset): bool
+    {
+        return isset($this->items[$offset]);
+    }
+
+    public function offsetGet($offset): mixed
+    {
+        return $this->items[$offset];
+    }
+
+    public function offsetSet($offset, $value): void
+    {
+        if (is_null($offset)) {
+            $this->items[] = $value;
+
+            return;
+        }
+
+        $this->items[$offset] = $value;
+    }
+
+    public function offsetUnset($offset): void
+    {
+        unset($this->items[$offset]);
+    }
+
+    public function getIterator(): ArrayIterator
+    {
+        return new ArrayIterator($this->items);
+    }
+}

src/ServiceProvider.php

@@ -19,7 +19,7 @@ public function register()
 
     protected function registerGroupMacro()
     {
-        Component::macro('group', function (string|array $groups) {
+        Component::macro('group', function (string|array $groups): PropertyCollection {
             /** @var Component $this */
             return group($this, $groups);
         });

src/helpers.php

@@ -5,7 +5,7 @@
 use ReflectionClass;
 use Livewire\Component;
 
-function group(Component $component, string|array $groups)
+function group(Component $component, string|array $groups): PropertyCollection
 {
     $groups = (array) $groups;
 
@@ -27,5 +27,5 @@ function group(Component $component, string|array $groups)
         }
     }
 
-    return $result;
+    return new PropertyCollection($component, $result);
 }

tests/Unit/MacroTest.php

@@ -55,7 +55,9 @@
 
     $iterations = 0;
 
-    group($component, 'a')->each(fn () => $iterations++);
+    group($component, 'a')->each(function () use (&$iterations) {
+        $iterations++;
+    });
 
     expect($iterations)->toBe(2);
 });
@@ -70,10 +72,12 @@
         public $bar = 2;
     };
 
-    expect(group($component, 'a'))
+    $result = group($component, 'a')
         ->each(function () {
             // Don't have to do anything here
-        })
+        });
+
+    expect($result)
         ->values()
         ->toBeArray()
         ->toContain(1, 2);