Merge branch '2.1' into 2.2

orchestral · May 18, 2014 · 45f972c · 45f972c
2 parents 92d021c + fda0372
commit 45f972c
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/Extension/Dispatcher.php b/src/Extension/Dispatcher.php
@@ -19,7 +19,7 @@ class Dispatcher implements DispatcherInterface
      *
      * @var \Illuminate\Events\Dispatcher
      */
-    protected $event;
+    protected $dispatcher;
 
     /**
      * Filesystem instance.
@@ -53,23 +53,23 @@ class Dispatcher implements DispatcherInterface
      * Construct a new Application instance.
      *
      * @param  \Illuminate\Config\Repository        $config
-     * @param  \Illuminate\Events\Dispatcher        $event
+     * @param  \Illuminate\Events\Dispatcher        $dispatcher
      * @param  \Illuminate\Filesystem\Filesystem    $files
      * @param  Finder                               $finder
      * @param  ProviderRepository                   $provider
      */
     public function __construct(
         Repository $config,
-        EventDispatcher $event,
+        EventDispatcher $dispatcher,
         Filesystem $files,
         Finder $finder,
         ProviderRepository $provider
     ) {
-        $this->config   = $config;
-        $this->event    = $event;
-        $this->files    = $files;
-        $this->finder   = $finder;
-        $this->provider = $provider;
+        $this->config     = $config;
+        $this->dispatcher = $dispatcher;
+        $this->files      = $files;
+        $this->finder     = $finder;
+        $this->provider   = $provider;
     }
 
     /**
@@ -184,7 +184,7 @@ public function finish($name, $options)
      */
     protected function fireEvent($name, $options, $type = 'started')
     {
-        $this->event->fire("extension.{$type}", array($name, $options));
-        $this->event->fire("extension.{$type}: {$name}", array($options));
+        $this->dispatcher->fire("extension.{$type}", array($name, $options));
+        $this->dispatcher->fire("extension.{$type}: {$name}", array($options));
     }
 }