Pre-release 4.2.99 → master — task 4.1 SCC-1 container swap

composer.json

@@ -15,6 +15,7 @@
         "filp/whoops": "~2.11",
         "illuminate/collections": "^13",
         "illuminate/conditionable": "^13",
+        "illuminate/container": "^13",
         "illuminate/contracts": "^13",
         "illuminate/macroable": "^13",
         "illuminate/reflection": "^13",
@@ -46,7 +47,6 @@
         "illuminate/cache": "self.version",
         "illuminate/config": "self.version",
         "illuminate/console": "self.version",
-        "illuminate/container": "self.version",
         "illuminate/cookie": "self.version",
         "illuminate/database": "self.version",
         "illuminate/encryption": "self.version",

src/Illuminate/Auth/AuthServiceProvider.php

@@ -18,7 +18,7 @@ class AuthServiceProvider extends ServiceProvider {
 	 */
 	public function register()
 	{
-		$this->app->bindShared('auth', function($app)
+		$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

src/Illuminate/Auth/Reminders/ReminderServiceProvider.php

@@ -36,7 +36,7 @@ public function register()
 	 */
 	protected function registerPasswordBroker()
 	{
-		$this->app->bindShared('auth.reminder', function($app)
+		$this->app->singleton('auth.reminder', function($app)
 		{
 			// The reminder repository is responsible for storing the user e-mail addresses
 			// and password reset tokens. It will be used to verify the tokens are valid
@@ -65,7 +65,7 @@ protected function registerPasswordBroker()
 	 */
 	protected function registerReminderRepository()
 	{
-		$this->app->bindShared('auth.reminder.repository', function($app)
+		$this->app->singleton('auth.reminder.repository', function($app)
 		{
 			$connection = $app['db']->connection();
 
@@ -89,17 +89,17 @@ protected function registerReminderRepository()
 	 */
 	protected function registerCommands()
 	{
-		$this->app->bindShared('command.auth.reminders', function($app)
+		$this->app->singleton('command.auth.reminders', function($app)
 		{
 			return new RemindersTableCommand($app['files']);
 		});
 
-		$this->app->bindShared('command.auth.reminders.clear', function()
+		$this->app->singleton('command.auth.reminders.clear', function()
 		{
 			return new ClearRemindersCommand;
 		});
 
-		$this->app->bindShared('command.auth.reminders.controller', function($app)
+		$this->app->singleton('command.auth.reminders.controller', function($app)
 		{
 			return new RemindersControllerCommand($app['files']);
 		});

src/Illuminate/Cache/CacheServiceProvider.php

@@ -18,17 +18,17 @@ class CacheServiceProvider extends ServiceProvider {
 	 */
 	public function register()
 	{
-		$this->app->bindShared('cache', function($app)
+		$this->app->singleton('cache', function($app)
 		{
 			return new CacheManager($app);
 		});
 
-		$this->app->bindShared('cache.store', function($app)
+		$this->app->singleton('cache.store', function($app)
 		{
 			return $app['cache']->driver();
 		});
 
-		$this->app->bindShared('memcached.connector', function()
+		$this->app->singleton('memcached.connector', function()
 		{
 			return new MemcachedConnector;
 		});
@@ -43,12 +43,12 @@ public function register()
 	 */
 	public function registerCommands()
 	{
-		$this->app->bindShared('command.cache.clear', function($app)
+		$this->app->singleton('command.cache.clear', function($app)
 		{
 			return new Console\ClearCommand($app['cache'], $app['files']);
 		});
 
-		$this->app->bindShared('command.cache.table', function($app)
+		$this->app->singleton('command.cache.table', function($app)
 		{
 			return new Console\CacheTableCommand($app['files']);
 		});

src/Illuminate/CachedRouting/RoutingServiceProvider.php

@@ -56,7 +56,7 @@ public function register()
      */
     protected function registerRouter()
     {
-        $this->app['router'] = $this->app->share(
+        $this->app->singleton('router', 
             function ($app) {
                 $router = new Router($app['events'], $app);