[8.x] Octane Prep

src/Illuminate/Auth/Access/Gate.php

@@ -800,4 +800,17 @@ public function policies()
     {
         return $this->policies;
     }
+
+    /**
+     * Set the container instance used by the gate.
+     *
+     * @param  \Illuminate\Contracts\Container\Container  $container
+     * @return $this
+     */
+    public function setContainer(Container $container)
+    {
+        $this->container = $container;
+
+        return $this;
+    }
 }

src/Illuminate/Auth/AuthManager.php

@@ -295,6 +295,31 @@ public function hasResolvedGuards()
         return count($this->guards) > 0;
     }
 
+    /**
+     * Forget all of the resolved guard instances.
+     *
+     * @return $this
+     */
+    public function forgetGuards()
+    {
+        $this->guards = [];
+
+        return $this;
+    }
+
+    /**
+     * Set the application instance used by the manager.
+     *
+     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     * @return $this
+     */
+    public function setApplication($app)
+    {
+        $this->app = $app;
+
+        return $this;
+    }
+
     /**
      * Dynamically call the default driver instance.
      *

src/Illuminate/Auth/AuthServiceProvider.php

@@ -35,11 +35,6 @@ public function register()
     protected function registerAuthenticator()
     {
         $this->app->singleton('auth', function ($app) {
-            // Once the authentication service has actually been requested by the developer
-            // we will set a variable in the application indicating such. This helps us
-            // know that we need to set any queued cookies in the after event later.
-            $app['auth.loaded'] = true;
-
             return new AuthManager($app);
         });
 
@@ -55,11 +50,9 @@ protected function registerAuthenticator()
      */
     protected function registerUserResolver()
     {
-        $this->app->bind(
-            AuthenticatableContract::class, function ($app) {
-                return call_user_func($app['auth']->userResolver());
-            }
-        );
+        $this->app->bind(AuthenticatableContract::class, function ($app) {
+            return call_user_func($app['auth']->userResolver());
+        });
     }
 
     /**
@@ -83,15 +76,13 @@ protected function registerAccessGate()
      */
     protected function registerRequirePassword()
     {
-        $this->app->bind(
-            RequirePassword::class, function ($app) {
-                return new RequirePassword(
-                    $app[ResponseFactory::class],
-                    $app[UrlGenerator::class],
-                    $app['config']->get('auth.password_timeout')
-                );
-            }
-        );
+        $this->app->bind(RequirePassword::class, function ($app) {
+            return new RequirePassword(
+                $app[ResponseFactory::class],
+                $app[UrlGenerator::class],
+                $app['config']->get('auth.password_timeout')
+            );
+        });
     }
 
     /**
@@ -116,11 +107,8 @@ protected function registerRequestRebindHandler()
     protected function registerEventRebindHandler()
     {
         $this->app->rebinding('events', function ($app, $dispatcher) {
-            if (! $app->resolved('auth')) {
-                return;
-            }
-
-            if ($app['auth']->hasResolvedGuards() === false) {
+            if (! $app->resolved('auth') ||
+                $app['auth']->hasResolvedGuards() === false) {
                 return;
             }
 

src/Illuminate/Broadcasting/BroadcastManager.php

@@ -334,6 +334,41 @@ public function extend($driver, Closure $callback)
         return $this;
     }
 
+    /**
+     * Get the application instance used by the manager.
+     *
+     * @return \Illuminate\Contracts\Foundation\Application
+     */
+    public function getApplication()
+    {
+        return $this->app;
+    }
+
+    /**
+     * Set the application instance used by the manager.
+     *
+     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     * @return $this
+     */
+    public function setApplication($app)
+    {
+        $this->app = $app;
+
+        return $this;
+    }
+
+    /**
+     * Forget all of the resolved driver instances.
+     *
+     * @return $this
+     */
+    public function forgetDrivers()
+    {
+        $this->drivers = [];
+
+        return $this;
+    }
+
     /**
      * Dynamically call the default driver instance.
      *

src/Illuminate/Cookie/CookieJar.php

@@ -214,4 +214,16 @@ public function getQueuedCookies()
     {
         return Arr::flatten($this->queued);
     }
+
+    /**
+     * Flush the cookies which have been queued for the next request.
+     *
+     * @return $this
+     */
+    public function flushQueuedCookies()
+    {
+        $this->queued = [];
+
+        return $this;
+    }
 }

src/Illuminate/Foundation/Http/Kernel.php

@@ -445,4 +445,17 @@ public function getApplication()
     {
         return $this->app;
     }
+
+    /**
+     * Set the Laravel application instance.
+     *
+     * @param  \Illuminate\Contracts\Foundation\Application
+     * @return $this
+     */
+    public function setApplication(Application $app)
+    {
+        $this->app = $app;
+
+        return $this;
+    }
 }

src/Illuminate/Mail/MailManager.php

@@ -472,6 +472,41 @@ public function extend($driver, Closure $callback)
         return $this;
     }
 
+    /**
+     * Get the application instance used by the manager.
+     *
+     * @return \Illuminate\Contracts\Foundation\Application
+     */
+    public function getApplication()
+    {
+        return $this->app;
+    }
+
+    /**
+     * Set the application instance used by the manager.
+     *
+     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     * @return $this
+     */
+    public function setApplication($app)
+    {
+        $this->app = $app;
+
+        return $this;
+    }
+
+    /**
+     * Forget all of the resolved mailer instances.
+     *
+     * @return $this
+     */
+    public function forgetMailers()
+    {
+        $this->mailers = [];
+
+        return $this;
+    }
+
     /**
      * Dynamically call the default driver instance.
      *

src/Illuminate/Pagination/PaginationServiceProvider.php

@@ -29,26 +29,6 @@ public function boot()
      */
     public function register()
     {
-        Paginator::viewFactoryResolver(function () {
-            return $this->app['view'];
-        });
-
-        Paginator::currentPathResolver(function () {
-            return $this->app['request']->url();
-        });
-
-        Paginator::currentPageResolver(function ($pageName = 'page') {
-            $page = $this->app['request']->input($pageName);
-
-            if (filter_var($page, FILTER_VALIDATE_INT) !== false && (int) $page >= 1) {
-                return (int) $page;
-            }
-
-            return 1;
-        });
-
-        Paginator::queryStringResolver(function () {
-            return $this->app['request']->query();
-        });
+        PaginationState::resolveUsing($this->app);
     }
 }

src/Illuminate/Pagination/PaginationState.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Illuminate\Pagination;
+
+class PaginationState
+{
+    /**
+     * Bind the pagination state resolvers using the given application container as a base.
+     *
+     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     * @return void
+     */
+    public static function resolveUsing($app)
+    {
+        Paginator::viewFactoryResolver(function () use ($app) {
+            return $app['view'];
+        });
+
+        Paginator::currentPathResolver(function () use ($app) {
+            return $app['request']->url();
+        });
+
+        Paginator::currentPageResolver(function ($pageName = 'page') use ($app) {
+            $page = $app['request']->input($pageName);
+
+            if (filter_var($page, FILTER_VALIDATE_INT) !== false && (int) $page >= 1) {
+                return (int) $page;
+            }
+
+            return 1;
+        });
+
+        Paginator::queryStringResolver(function () use ($app) {
+            return $app['request']->query();
+        });
+    }
+}

src/Illuminate/Pipeline/Hub.php

@@ -71,4 +71,27 @@ public function pipe($object, $pipeline = null)
             $this->pipelines[$pipeline], new Pipeline($this->container), $object
         );
     }
+
+    /**
+     * Get the container instance used by the hub.
+     *
+     * @return \Illuminate\Contracts\Container\Container
+     */
+    public function getContainer()
+    {
+        return $this->container;
+    }
+
+    /**
+     * Set the container instance used by the hub.
+     *
+     * @param  \Illuminate\Contracts\Container\Container  $container
+     * @return $this
+     */
+    public function setContainer(Container $container)
+    {
+        $this->container = $container;
+
+        return $this;
+    }
 }

src/Illuminate/Queue/Queue.php

@@ -369,6 +369,16 @@ public function setConnectionName($name)
         return $this;
     }
 
+    /**
+     * Get the container instance being used by the connection.
+     *
+     * @return \Illuminate\Container\Container
+     */
+    public function getContainer()
+    {
+        return $this->container;
+    }
+
     /**
      * Set the IoC container instance.
      *

src/Illuminate/Queue/QueueManager.php

@@ -246,6 +246,33 @@ public function getName($connection = null)
         return $connection ?: $this->getDefaultDriver();
     }
 
+    /**
+     * Get the application instance used by the manager.
+     *
+     * @return \Illuminate\Contracts\Foundation\Application
+     */
+    public function getApplication()
+    {
+        return $this->app;
+    }
+
+    /**
+     * Set the application instance used by the manager.
+     *
+     * @param  \Illuminate\Contracts\Foundation\Application  $app
+     * @return $this
+     */
+    public function setApplication($app)
+    {
+        $this->app = $app;
+
+        foreach ($this->connections as $connection) {
+            $connection->setContainer($app);
+        }
+
+        return $this;
+    }
+
     /**
      * Dynamically pass calls to the default connection.
      *