Simplify package.

Signed-off-by: crynobone <crynobone@gmail.com>
orchestral · Nov 5, 2014 · 1523656 · 1523656
1 parent fbde958
commit 1523656
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 25 deletions.
diff --git a/src/Installation/Installation.php b/src/Installation/Installation.php
@@ -30,7 +30,7 @@ public function __construct($app)
      */
     public function bootInstallerFiles()
     {
-        $paths = array('path.database', 'path');
+        $paths = ['path.database', 'path'];
 
         foreach ($paths as $path) {
             $file = rtrim($this->app[$path], '/').'/orchestra/installer.php';
@@ -64,12 +64,12 @@ public function migrate()
     public function createAdmin($input, $allowMultiple = true)
     {
         // Grab input fields and define the rules for user validations.
-        $rules = array(
-            'email'     => array('required', 'email'),
-            'password'  => array('required'),
-            'fullname'  => array('required'),
-            'site_name' => array('required'),
-        );
+        $rules = [
+            'email'     => ['required', 'email'],
+            'password'  => ['required'],
+            'fullname'  => ['required'],
+            'site_name' => ['required'],
+        ];
 
         $validation = $this->app['validator']->make($input, $rules);
 
@@ -110,26 +110,26 @@ protected function runApplicationSetup($input)
         // configuration.
         $user    = $this->createUser($input);
         $memory  = $this->app['orchestra.memory']->make();
-        $actions = array('Manage Orchestra', 'Manage Users');
+        $actions = ['Manage Orchestra', 'Manage Users'];
         $admin   = $this->app['config']->get('orchestra/foundation::roles.admin', 1);
         $roles   = $this->app['orchestra.role']->newQuery()->lists('name', 'id');
-        $theme   = array(
+        $theme   = [
             'frontend' => 'default',
             'backend'  => 'default',
-        );
+        ];
 
         // Attach Administrator role to the newly created administrator.
-        $user->roles()->sync(array($admin));
+        $user->roles()->sync([$admin]);
 
         // Add some basic configuration for Orchestra Platform, including
         // email configuration.
         $memory->put('site.name', $input['site_name']);
         $memory->put('site.theme', $theme);
         $memory->put('email', $this->app['config']->get('mail'));
-        $memory->put('email.from', array(
+        $memory->put('email.from', [
             'name'    => $input['site_name'],
             'address' => $input['email']
-        ));
+        ]);
 
         // We should also create a basic ACL for Orchestra Platform, since
         // the basic roles is create using Fluent Query Builder we need
@@ -141,7 +141,7 @@ protected function runApplicationSetup($input)
         $acl->roles()->attach(array_values($roles));
         $acl->allow($roles[$admin], $actions);
 
-        $this->app['events']->fire('orchestra.install: acl', array($acl));
+        $this->app['events']->fire('orchestra.install: acl', [$acl]);
     }
 
     /**
@@ -155,14 +155,14 @@ protected function createUser($input)
         User::unguard();
         $user = $this->app['orchestra.user']->newInstance();
 
-        $user->fill(array(
+        $user->fill([
             'email'    => $input['email'],
             'password' => $input['password'],
             'fullname' => $input['fullname'],
             'status'   => 0,
-        ));
+        ]);
 
-        $this->app['events']->fire('orchestra.install: user', array($user, $input));
+        $this->app['events']->fire('orchestra.install: user', [$user, $input]);
 
         $user->save();
 

diff --git a/src/Installation/InstallerServiceProvider.php b/src/Installation/InstallerServiceProvider.php
@@ -1,6 +1,6 @@
 <?php namespace Orchestra\Installation;
 
-use Illuminate\Support\ServiceProvider;
+use Orchestra\Support\Providers\ServiceProvider;
 
 class InstallerServiceProvider extends ServiceProvider
 {
@@ -29,7 +29,7 @@ public function boot()
     {
         $path = realpath(__DIR__.'/../');
 
-        $this->package('orchestra/installer', 'orchestra/installer', $path);
+        $this->addViewComponent('orchestra/installer', 'orchestra/installer', $path.'/view');
 
         require "{$path}/routes.php";
     }

diff --git a/src/Installation/Processor/Installer.php b/src/Installation/Processor/Installer.php
@@ -53,13 +53,13 @@ public function index($listener)
         // If the auth status is false, installation shouldn't be possible.
         (true === $authentication) || $installable = false;
 
-        $data = array(
+        $data = [
             'database'       => $database,
             'auth'           => $auth,
             'authentication' => $authentication,
             'installable'    => $installable,
             'checklist'      => $requirement->getChecklist(),
-        );
+        ];
 
         return $listener->indexSucceed($data);
     }
@@ -85,9 +85,9 @@ public function prepare($listener)
      */
     public function create($listener)
     {
-        return $listener->createSucceed(array(
+        return $listener->createSucceed([
             'siteName' => 'Orchestra Platform',
-        ));
+        ]);
     }
 
     /**
@@ -125,7 +125,7 @@ public function done($listener)
     protected function getRunningConfiguration()
     {
         $driver   = Config::get('database.default', 'mysql');
-        $database = Config::get("database.connections.{$driver}", array());
+        $database = Config::get("database.connections.{$driver}", []);
         $auth     = Config::get('auth');
 
         // For security, we shouldn't expose database connection to anyone,
@@ -136,7 +136,7 @@ protected function getRunningConfiguration()
 
         $authentication = $this->isAuthenticationInstallable($auth);
 
-        return array($database, $auth, $authentication);
+        return [$database, $auth, $authentication];
     }
 
     /**