Fix providing macros for non Laravel app

the-pulli · Dec 19, 2023 · d4c1e97 · d4c1e97
1 parent 956bb02
commit d4c1e97
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/CollectionMacroServiceProvider.php b/src/CollectionMacroServiceProvider.php
@@ -7,23 +7,17 @@
 if (class_exists('\Illuminate\Support\ServiceProvider')) {
  class CollectionMacroServiceProvider extends \Illuminate\Support\ServiceProvider
  {
+ use HasMacros;
+
  public function register(): void
  {
  Collection::make(self::macros())
  ->reject(fn ($class, $macro) => Collection::hasMacro($macro))
  ->each(fn ($class, $macro) => Collection::macro($macro, app($class)()));
  }
-
- public static function macros(): array
- {
- return [
- 'mapToCollection' => \Pulli\CollectionMacros\Macros\MapToCollection::class,
- 'mapToCollectionFrom' => \Pulli\CollectionMacros\Macros\MapToCollectionFrom::class,
- 'recursiveToArray' => \Pulli\CollectionMacros\Macros\RecursiveToArray::class,
- 'recursiveToArrayFrom' => \Pulli\CollectionMacros\Macros\RecursiveToArrayFrom::class,
- ];
- }
  }
 } else {
- class CollectionMacroServiceProvider {}
+ class CollectionMacroServiceProvider {
+ use HasMacros;
+ }
 }
diff --git a/src/HasMacros.php b/src/HasMacros.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Pulli\CollectionMacros;
+
+trait HasMacros
+{
+ public static function macros(): array
+ {
+ return [
+ 'mapToCollection' => \Pulli\CollectionMacros\Macros\MapToCollection::class,
+ 'mapToCollectionFrom' => \Pulli\CollectionMacros\Macros\MapToCollectionFrom::class,
+ 'recursiveToArray' => \Pulli\CollectionMacros\Macros\RecursiveToArray::class,
+ 'recursiveToArrayFrom' => \Pulli\CollectionMacros\Macros\RecursiveToArrayFrom::class,
+ ];
+ }
+}