[8.x] Avoid renaming collections and macroable (#33108)

Avoid renaming collections and macros

Author: GrahamCampbell

composer.json

@@ -102,7 +102,8 @@
             "src/Illuminate/Support/helpers.php"
         ],
         "psr-4": {
-            "Illuminate\\": "src/Illuminate/"
+            "Illuminate\\": "src/Illuminate/",
+            "Illuminate\\Support\\": ["src/Illuminate/Macroable/", "src/Illuminate/Collections/"]
         }
     },
     "autoload-dev": {

src/Illuminate/Auth/Access/Gate.php

@@ -3,9 +3,9 @@
 namespace Illuminate\Auth\Access;
 
 use Exception;
-use Illuminate\Collections\Arr;
 use Illuminate\Contracts\Auth\Access\Gate as GateContract;
 use Illuminate\Contracts\Container\Container;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
 use ReflectionClass;

src/Illuminate/Auth/Passwords/PasswordBroker.php

@@ -3,10 +3,10 @@
 namespace Illuminate\Auth\Passwords;
 
 use Closure;
-use Illuminate\Collections\Arr;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Contracts\Auth\PasswordBroker as PasswordBrokerContract;
 use Illuminate\Contracts\Auth\UserProvider;
+use Illuminate\Support\Arr;
 use UnexpectedValueException;
 
 class PasswordBroker implements PasswordBrokerContract

src/Illuminate/Auth/RequestGuard.php

@@ -5,7 +5,7 @@
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Http\Request;
-use Illuminate\Macroable\Macroable;
+use Illuminate\Support\Traits\Macroable;
 
 class RequestGuard implements Guard
 {

src/Illuminate/Auth/SessionGuard.php

@@ -17,9 +17,9 @@
 use Illuminate\Contracts\Cookie\QueueingFactory as CookieJar;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Session\Session;
-use Illuminate\Macroable\Macroable;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
+use Illuminate\Support\Traits\Macroable;
 use RuntimeException;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;

src/Illuminate/Broadcasting/BroadcastEvent.php

@@ -3,10 +3,10 @@
 namespace Illuminate\Broadcasting;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Collections\Arr;
 use Illuminate\Contracts\Broadcasting\Broadcaster;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 use ReflectionClass;
 use ReflectionProperty;
 

src/Illuminate/Broadcasting/Broadcasters/Broadcaster.php

@@ -3,11 +3,11 @@
 namespace Illuminate\Broadcasting\Broadcasters;
 
 use Exception;
-use Illuminate\Collections\Arr;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Broadcasting\Broadcaster as BroadcasterContract;
 use Illuminate\Contracts\Routing\BindingRegistrar;
 use Illuminate\Contracts\Routing\UrlRoutable;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Reflector;
 use Illuminate\Support\Str;
 use ReflectionClass;

src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php

@@ -3,7 +3,7 @@
 namespace Illuminate\Broadcasting\Broadcasters;
 
 use Illuminate\Broadcasting\BroadcastException;
-use Illuminate\Collections\Arr;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Pusher\Pusher;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;

src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php

@@ -2,8 +2,8 @@
 
 namespace Illuminate\Broadcasting\Broadcasters;
 
-use Illuminate\Collections\Arr;
 use Illuminate\Contracts\Redis\Factory as Redis;
+use Illuminate\Support\Arr;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 class RedisBroadcaster extends Broadcaster

src/Illuminate/Bus/Batch.php

@@ -3,10 +3,10 @@
 namespace Illuminate\Bus;
 
 use Carbon\CarbonImmutable;
-use Illuminate\Collections\Arr;
-use Illuminate\Collections\Collection;
 use Illuminate\Contracts\Queue\Factory as QueueFactory;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use JsonSerializable;
 
 class Batch implements Arrayable, JsonSerializable
@@ -152,7 +152,7 @@ public function fresh()
     /**
      * Add additional jobs to the batch.
      *
-     * @param  \Illuminate\Collections\Collection|array  $jobs
+     * @param  \Illuminate\Support\Collection|array  $jobs
      * @return self
      */
     public function add($jobs)

src/Illuminate/Bus/Dispatcher.php

@@ -3,14 +3,14 @@
 namespace Illuminate\Bus;
 
 use Closure;
-use Illuminate\Collections\Collection;
 use Illuminate\Contracts\Bus\QueueingDispatcher;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Queue\Queue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Pipeline\Pipeline;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\Jobs\SyncJob;
+use Illuminate\Support\Collection;
 use RuntimeException;
 
 class Dispatcher implements QueueingDispatcher
@@ -141,7 +141,7 @@ public function findBatch(string $batchId)
     /**
      * Create a new batch of queueable jobs.
      *
-     * @param  \Illuminate\Collections\Collection|array  $jobs
+     * @param  \Illuminate\Support\Collection|array  $jobs
      * @return \Illuminate\Bus\PendingBatch
      */
     public function batch($jobs)

src/Illuminate/Bus/PendingBatch.php

@@ -3,10 +3,10 @@
 namespace Illuminate\Bus;
 
 use Closure;
-use Illuminate\Collections\Arr;
-use Illuminate\Collections\Collection;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Queue\SerializableClosure;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
 use Throwable;
 
 class PendingBatch
@@ -21,7 +21,7 @@ class PendingBatch
     /**
      * The jobs that belong to the batch.
      *
-     * @var \Illuminate\Collections\Collection
+     * @var \Illuminate\Support\Collection
      */
     public $jobs;
 
@@ -36,7 +36,7 @@ class PendingBatch
      * Create a new pending batch instance.
      *
      * @param  \Illuminate\Contracts\Container\Container  $container
-     * @param  \Illuminate\Collections\Collection  $jobs
+     * @param  \Illuminate\Support\Collection  $jobs
      * @return void
      */
     public function __construct(Container $container, Collection $jobs)

src/Illuminate/Bus/Queueable.php

@@ -3,8 +3,8 @@
 namespace Illuminate\Bus;
 
 use Closure;
-use Illuminate\Collections\Arr;
 use Illuminate\Queue\CallQueuedClosure;
+use Illuminate\Support\Arr;
 use RuntimeException;
 
 trait Queueable

src/Illuminate/Cache/CacheManager.php

@@ -4,10 +4,10 @@
 
 use Aws\DynamoDb\DynamoDbClient;
 use Closure;
-use Illuminate\Collections\Arr;
 use Illuminate\Contracts\Cache\Factory as FactoryContract;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
+use Illuminate\Support\Arr;
 use InvalidArgumentException;
 
 /**

src/Illuminate/Cache/Repository.php

@@ -13,9 +13,9 @@
 use Illuminate\Contracts\Cache\Repository as CacheContract;
 use Illuminate\Contracts\Cache\Store;
 use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Macroable\Macroable;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\InteractsWithTime;
+use Illuminate\Support\Traits\Macroable;
 
 /**
  * @mixin \Illuminate\Contracts\Cache\Store

src/Illuminate/Collections/Arr.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Illuminate\Collections;
+namespace Illuminate\Support;
 
 use ArrayAccess;
-use Illuminate\Macroable\Macroable;
+use Illuminate\Support\Traits\Macroable;
 use InvalidArgumentException;
 
 class Arr

src/Illuminate/Collections/Collection.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace Illuminate\Collections;
+namespace Illuminate\Support;
 
 use ArrayAccess;
 use ArrayIterator;
-use Illuminate\Macroable\Macroable;
+use Illuminate\Support\Traits\EnumeratesValues;
+use Illuminate\Support\Traits\Macroable;
 use stdClass;
 
 class Collection implements ArrayAccess, Enumerable
@@ -62,7 +63,7 @@ public function all()
     /**
      * Get a lazy collection for the items in this collection.
      *
-     * @return \Illuminate\Collections\LazyCollection
+     * @return \Illuminate\Support\LazyCollection
      */
     public function lazy()
     {
@@ -325,7 +326,7 @@ protected function duplicateComparator($strict)
     /**
      * Get all items except for those with the specified keys.
      *
-     * @param  \Illuminate\Collections\Collection|mixed  $keys
+     * @param  \Illuminate\Support\Collection|mixed  $keys
      * @return static
      */
     public function except($keys)
@@ -1321,7 +1322,7 @@ public function add($item)
     /**
      * Get a base Support collection instance from this collection.
      *
-     * @return \Illuminate\Collections\Collection
+     * @return \Illuminate\Support\Collection
      */
     public function toBase()
     {

src/Illuminate/Collections/Enumerable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Illuminate\Collections;
+namespace Illuminate\Support;
 
 use Countable;
 use Illuminate\Contracts\Support\Arrayable;
@@ -897,7 +897,7 @@ public function countBy($callback = null);
     /**
      * Collect the values into a collection.
      *
-     * @return \Illuminate\Collections\Collection
+     * @return \Illuminate\Support\Collection
      */
     public function collect();
 

src/Illuminate/Collections/HigherOrderCollectionProxy.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Illuminate\Collections;
+namespace Illuminate\Support;
 
 /**
- * @mixin \Illuminate\Collections\Enumerable
+ * @mixin \Illuminate\Support\Enumerable
  */
 class HigherOrderCollectionProxy
 {
     /**
      * The collection being operated on.
      *
-     * @var \Illuminate\Collections\Enumerable
+     * @var \Illuminate\Support\Enumerable
      */
     protected $collection;
 
@@ -24,7 +24,7 @@ class HigherOrderCollectionProxy
     /**
      * Create a new proxy instance.
      *
-     * @param  \Illuminate\Collections\Enumerable  $collection
+     * @param  \Illuminate\Support\Enumerable  $collection
      * @param  string  $method
      * @return void
      */

src/Illuminate/Collections/HigherOrderWhenProxy.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Illuminate\Collections;
+namespace Illuminate\Support;
 
 /**
- * @mixin \Illuminate\Collections\Enumerable
+ * @mixin \Illuminate\Support\Enumerable
  */
 class HigherOrderWhenProxy
 {
     /**
      * The collection being operated on.
      *
-     * @var \Illuminate\Collections\Enumerable
+     * @var \Illuminate\Support\Enumerable
      */
     protected $collection;
 
@@ -24,7 +24,7 @@ class HigherOrderWhenProxy
     /**
      * Create a new proxy instance.
      *
-     * @param  \Illuminate\Collections\Enumerable  $collection
+     * @param  \Illuminate\Support\Enumerable  $collection
      * @param  bool  $condition
      * @return void
      */

src/Illuminate/Collections/LazyCollection.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace Illuminate\Collections;
+namespace Illuminate\Support;
 
 use ArrayIterator;
 use Closure;
-use Illuminate\Macroable\Macroable;
+use Illuminate\Support\Traits\EnumeratesValues;
+use Illuminate\Support\Traits\Macroable;
 use IteratorAggregate;
 use stdClass;
 

src/Illuminate/Collections/EnumeratesValues.php src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -1,12 +1,17 @@
 <?php
 
-namespace Illuminate\Collections;
+namespace Illuminate\Support\Traits;
 
 use CachingIterator;
 use Closure;
 use Exception;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Jsonable;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Enumerable;
+use Illuminate\Support\HigherOrderCollectionProxy;
+use Illuminate\Support\HigherOrderWhenProxy;
 use JsonSerializable;
 use Symfony\Component\VarDumper\VarDumper;
 use Traversable;
@@ -740,7 +745,7 @@ public function until($value)
     /**
      * Collect the values into a collection.
      *
-     * @return \Illuminate\Collections\Collection
+     * @return \Illuminate\Support\Collection
      */
     public function collect()
     {

src/Illuminate/Collections/Util.php

@@ -1,9 +1,12 @@
 <?php
 
-namespace Illuminate\Collections;
+namespace Illuminate\Support;
 
 use Closure;
 
+/**
+ * @internal
+ */
 class Util
 {
     /**