Cleaning up the foundation application.

src/Illuminate/Foundation/Application.php

@@ -559,20 +559,13 @@ public function register($provider, $options = [], $force = false)
         // application instance automatically for the developer. This is simply
         // a more convenient way of specifying your service provider classes.
         if (is_string($provider)) {
-            $provider = $this->resolveProviderClass($provider);
+            $provider = $this->resolveProvider($provider);
         }
 
         if (method_exists($provider, 'register')) {
             $provider->register();
         }
 
-        // Once we have registered the service we will iterate through the options
-        // and set each of them on the application so they will be available on
-        // the actual loading of the service objects and for developer usage.
-        foreach ($options as $key => $value) {
-            $this[$key] = $value;
-        }
-
         $this->markAsRegistered($provider);
 
         // If the application has already booted, we will call this boot method on
@@ -606,7 +599,7 @@ public function getProvider($provider)
      * @param  string  $provider
      * @return \Illuminate\Support\ServiceProvider
      */
-    public function resolveProviderClass($provider)
+    public function resolveProvider($provider)
     {
         return new $provider($this);
     }
@@ -619,11 +612,9 @@ public function resolveProviderClass($provider)
      */
     protected function markAsRegistered($provider)
     {
-        $this['events']->fire($class = get_class($provider), [$provider]);
-
         $this->serviceProviders[] = $provider;
 
-        $this->loadedProviders[$class] = true;
+        $this->loadedProviders[get_class($provider)] = true;
     }
 
     /**
@@ -1051,7 +1042,7 @@ public function setLocale($locale)
 
         $this['translator']->setLocale($locale);
 
-        $this['events']->fire('locale.changed', [$locale]);
+        $this['events']->fire(new Events\LocaleUpdated($locale));
     }
 
     /**

src/Illuminate/Foundation/Events/LocaleUpdated.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Illuminate\Foundation\Events;
+
+class LocaleUpdated
+{
+    /**
+     * The new locale.
+     *
+     * @var string
+     */
+    public $locale;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  string  $locale
+     * @return void
+     */
+    public function __construct($locale)
+    {
+        $this->locale = $locale;
+    }
+}

tests/Foundation/FoundationApplicationTest.php

@@ -18,7 +18,7 @@ public function testSetLocaleSetsLocaleAndFiresLocaleChangedEvent()
         $app['translator'] = $trans = m::mock('StdClass');
         $trans->shouldReceive('setLocale')->once()->with('foo');
         $app['events'] = $events = m::mock('StdClass');
-        $events->shouldReceive('fire')->once()->with('locale.changed', ['foo']);
+        $events->shouldReceive('fire')->once()->with(m::type('Illuminate\Foundation\Events\LocaleUpdated'));
 
         $app->setLocale('foo');
     }

tests/Foundation/FoundationProviderRepositoryTest.php

@@ -17,9 +17,8 @@ public function testServicesAreRegisteredWhenManifestIsNotRecompiled()
         $repo->shouldReceive('loadManifest')->once()->andReturn(['eager' => ['foo'], 'deferred' => ['deferred'], 'providers' => ['providers'], 'when' => []]);
         $repo->shouldReceive('shouldRecompile')->once()->andReturn(false);
         $provider = m::mock('Illuminate\Support\ServiceProvider');
-        $repo->shouldReceive('createProvider')->once()->with('foo')->andReturn($provider);
 
-        $app->shouldReceive('register')->once()->with($provider);
+        $app->shouldReceive('register')->once()->with('foo');
         $app->shouldReceive('runningInConsole')->andReturn(false);
         $app->shouldReceive('addDeferredServices')->once()->with(['deferred']);
 
@@ -48,10 +47,7 @@ public function testManifestIsProperlyRecompiled()
             return $manifest;
         });
 
-        // bar mock should be registered with the application since it's eager
-        $repo->shouldReceive('createProvider')->once()->with('bar')->andReturn($barMock);
-
-        $app->shouldReceive('register')->once()->with($barMock);
+        $app->shouldReceive('register')->once()->with('bar');
         $app->shouldReceive('runningInConsole')->andReturn(false);
         $app->shouldReceive('addDeferredServices')->once()->with(['foo.provides1' => 'foo', 'foo.provides2' => 'foo']);