Moving aliasing to the base provider

Author: stygiansabyss

src/Syntax/Core/CoreServiceProvider.php

@@ -29,11 +29,9 @@ public function boot()
 	public function register()
 	{
 		$this->shareWithApp();
-		// $this->registerAlias();
 		$this->loadConfig();
 		$this->registerViews();
-		// $this->activateProfiler();
-		// $this->registerProfilerRouting();
+		$this->registerAliases();
 	}
 
 	/**
@@ -70,6 +68,60 @@ protected function registerViews()
 		$this->app['view']->addNamespace('core', __DIR__.'/../../../views');
 	}
 
+	/**
+	 * Register aliases
+	 *
+	 * @return void
+	 */
+	protected function registerAliases()
+	{
+		$aliases = [
+			'HTML'                        => 'Syntax\Core\HTML',
+			'View'                        => 'Syntax\Core\View\ViewFacade',
+			'Mobile'                      => 'Syntax\Core\Utility\Facades\Mobile',
+			'CoreView'                    => 'Syntax\Core\Utility\Facades\CoreView',
+			'CoreImage'                   => 'Syntax\Core\Utility\Facades\CoreImage',
+			'Crud'                        => 'Syntax\Core\Utility\Facades\Crud',
+			'Wizard'                      => 'Syntax\Core\Utility\Facades\Wizard',
+			'LeftTabs'                    => 'Syntax\Core\Utility\Facades\LeftTabs',
+			'LeftTab'                     => 'Syntax\Core\Utility\Facades\LeftTab',
+			'bForm'                       => 'Syntax\Core\Utility\Facades\bForm',
+			'Ajax'                        => 'Syntax\Core\Utility\Facades\Ajax',
+			'Post'                        => 'Syntax\Core\Utility\Facades\Post',
+			'BBCode'                      => 'Syntax\Core\Utility\Facades\BBCode',
+			'SocketIOClient'              => 'ElephantIO\Client',
+			'Github'                      => 'Github\Client',
+			'User'                        => 'Syntax\Core\User',
+			'Message'                     => 'Syntax\Core\Message',
+			'Message_Folder'              => 'Syntax\Core\Message_Folder',
+			'Message_Folder_Message'      => 'Syntax\Core\Message_Folder_Message',
+			'Message_Type'                => 'Syntax\Core\Message_Type',
+			'Message_User_Delete'         => 'Syntax\Core\Message_User_Delete',
+			'Message_User_Read'           => 'Syntax\Core\Message_User_Read',
+			'User_Preference'             => 'Syntax\Core\User_Preference',
+			'User_Preference_User'        => 'Syntax\Core\User_Preference_User',
+			'User_Permission_Action'      => 'Syntax\Core\User_Permission_Action',
+			'User_Permission_Action_Role' => 'Syntax\Core\User_Permission_Action_Role',
+			'User_Permission_Role'        => 'Syntax\Core\User_Permission_Role',
+			'User_Permission_Role_User'   => 'Syntax\Core\User_Permission_Role_User',
+			'Seed'                        => 'Syntax\Core\Seed',
+			'Migration'                   => 'Syntax\Core\Migration',
+			'Control_Exception'           => 'Syntax\Core\Control_Exception',
+		];
+
+		$appAliases = \Config::get('core::nonCoreAliases');
+
+		foreach ($aliases as $alias => $class) {
+			if (!is_null($appAliases)) {
+				if (!in_array($alias, $appAliases)) {
+					\Illuminate\Foundation\AliasLoader::getInstance()->alias($alias, $class);
+				}
+			} else {
+				\Illuminate\Foundation\AliasLoader::getInstance()->alias($alias, $class);
+			}
+		}
+	}
+
 	/**
 	 * Get the services provided by the provider.
 	 *

src/services/Utility/AliasServiceProvider.php

@@ -9,6 +9,7 @@
 use Config;
 use App;
 use Session;
+use File;
 use Github;
 use Github\HttpClient\CachedHttpClient;