[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)