Merge pull request #50 from rollun-com/develop

Develop
rollun-lc · Dec 16, 2017 · 9533d3c · 9533d3c
2 parents 2da7bde + 710c4c3
commit 9533d3c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/src/Installer/src/InstallerCommand.php b/src/Installer/src/InstallerCommand.php
@@ -45,7 +45,7 @@ public function __construct()
 			"-l",
 			InputOption::VALUE_OPTIONAL,
 			"Output language.",
-			null
+			"en"
 		);
 
 		//TODO: remove this. see isDebug (OutputInterface or --verbose options)
@@ -66,10 +66,12 @@ public function __construct()
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
 		try {
-			$rootInstaller = new RootInstaller($this->getComposer(), $this->getIO());
+            $isDebug =(bool)($input->getOption("debug") || $input->getOption("verbose"));
+            define("isDebug", $isDebug);
+
+            $rootInstaller = new RootInstaller($this->getComposer(), $this->getIO());
+
 			$lang = $input->getOption("lang");
-			$isDebug =(bool)($input->getOption("debug") || $input->getOption("verbose"));
-			define("isDebug", $isDebug);
 			switch ($input->getArgument("type"))
 			{
 				case self::CMD_ARG_INSTALL:

diff --git a/src/Installer/src/InstallerCommandProvider.php b/src/Installer/src/InstallerCommandProvider.php
@@ -14,15 +14,6 @@
 use Composer\Plugin\Capable;
 use Composer\Plugin\PluginInterface;
 
-/**
- * @deprecated
- */
-if(file_exists('vendor/webimpress/http-middleware-compatibility/autoload/http-middleware.php')) {
-    require_once 'vendor/webimpress/http-middleware-compatibility/autoload/http-middleware.php';
-}
-if(file_exists('config/env_configurator.php')) {
-    require_once 'config/env_configurator.php';
-}
 
 class InstallerCommandProvider implements CommandProvider, PluginInterface, Capable
 {
@@ -48,7 +39,21 @@ public function activate(Composer $composer, IOInterface $io)
 		$this->composer = $composer;
 		$this->io = $io;
 
-		//TODO: remove this gilt. Need for support back compatibility.
+        if(file_exists('config/env_configurator.php')) {
+            require_once 'config/env_configurator.php';
+            trigger_error("This functional is deprecated. You may use config for this. For more info read https://github.com/rollun-com/all-standards", E_USER_DEPRECATED);
+        }
+
+		//generate autoloader. load all class.
+        $localRepository = $composer->getRepositoryManager()->getLocalRepository();
+        $packageMap = $composer->getAutoloadGenerator()->buildPackageMap(
+            $composer->getInstallationManager(),
+            $composer->getPackage(),
+            $localRepository->getPackages()
+        );
+        $autoload = $composer->getAutoloadGenerator()->parseAutoloads($packageMap, $composer->getPackage());
+        $loader = $composer->getAutoloadGenerator()->createLoader($autoload);
+        spl_autoload_register([$loader, "loadClass"]);
     }
 
 	/**

diff --git a/src/Installer/src/RootInstaller.php b/src/Installer/src/RootInstaller.php
@@ -64,9 +64,11 @@ private function reloadContainer()
 
         //define new env constant.
         $config = $this->container->get("config");
-        foreach ($config['env_config'] as $envName => $envValue) {
-            if(!defined($envName)) {
-                define($envName, $envValue);
+        if(isset($config['env_config'])) {
+            foreach ($config['env_config'] as $envName => $envValue) {
+                if(!defined($envName)) {
+                    define($envName, $envValue);
+                }
             }
         }
     }