renamed console <- controllers

hiqdev · May 8, 2017 · 0621edb · 0621edb
1 parent 54b8af9
commit 0621edb
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 17 deletions.
diff --git a/src/base/Controller.php b/src/base/Controller.php
@@ -10,7 +10,7 @@
 
 namespace hidev\base;
 
-use hidev\controllers\CommonBehavior;
+use hidev\console\CommonBehavior;
 
 /**
  * Basic controller.

diff --git a/src/base/Starter.php b/src/base/Starter.php
@@ -74,6 +74,7 @@ public function startProject()
         $this->loadEnv();
         $this->loadGoals();
         $this->addAliases();
+        $this->addAutoloader();
         $this->requireAll();
         $this->includeAll();
         $this->moreConfig();
@@ -104,7 +105,7 @@ public function getConfig()
         if (!empty($config['controllerMap'])) {
             foreach ($config['controllerMap'] as &$def) {
                 if (is_array($def) && empty($def['class'])) {
-                    $def['class'] = \hidev\controllers\CommonController::class;
+                    $def['class'] = \hidev\console\CommonController::class;
                 }
             }
         }
@@ -207,6 +208,16 @@ private function hasAlias($alias, $exact = true)
         return $pos === false ? isset(Yii::$aliases[$alias]) : isset(Yii::$aliases[substr($alias, 0, $pos)][$alias]);
     }
 
+    public function addAutoloader()
+    {
+        $autoloader = './vendor/autoload.php';
+        if (file_exists($autoloader)) {
+            spl_autoload_unregister(['Yii', 'autoload']);
+            require $autoloader;
+            spl_autoload_register(['Yii', 'autoload'], true, true);
+        }
+    }
+
     /**
      * - install configured plugins and register their app config
      * - install project dependencies and register

diff --git a/src/config/basis.php b/src/config/basis.php
@@ -20,7 +20,7 @@
     'basePath'              => dirname(__DIR__),
     'vendorPath'            => HIDEV_VENDOR_DIR,
     'runtimePath'           => $runtimePath,
-    'controllerNamespace'   => 'hidev\\controllers',
+    'controllerNamespace'   => 'hidev\\console',
     'defaultRoute'          => 'default',
     'bootstrap'             => ['log'],
     'components'            => [
@@ -92,17 +92,17 @@
     ],
     'controllerMap' => [
         '--version' => [
-            'class' => \hidev\controllers\VersionController::class,
+            'class' => \hidev\console\VersionController::class,
             'own' => true,
         ],
         '.gitignore' => [
-            'class' => \hidev\controllers\GitignoreController::class,
+            'class' => \hidev\console\GitignoreController::class,
         ],
         'github' => [
-            'class' => \hidev\controllers\GithubController::class,
+            'class' => \hidev\console\GithubController::class,
         ],
         'dump' => [
-            'class' => \hidev\controllers\DumpController::class,
+            'class' => \hidev\console\DumpController::class,
         ],
     ],
     'container' => [

diff --git a/src/controllers/CommonBehavior.php → src/console/CommonBehavior.php b/src/controllers/CommonBehavior.php → src/console/CommonBehavior.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\controllers;
+namespace hidev\console;
 
 use hidev\base\Controller;
 use Yii;

diff --git a/src/controllers/CommonController.php → src/console/CommonController.php b/src/controllers/CommonController.php → src/console/CommonController.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\controllers;
+namespace hidev\console;
 
 use Yii;
 

diff --git a/src/controllers/DumpController.php → src/console/DumpController.php b/src/controllers/DumpController.php → src/console/DumpController.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\controllers;
+namespace hidev\console;
 
 use Symfony\Component\Yaml\Yaml;
 use Yii;

diff --git a/src/controllers/GitController.php → src/console/GitController.php b/src/controllers/GitController.php → src/console/GitController.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\controllers;
+namespace hidev\console;
 
 /**
  * Git.

diff --git a/src/controllers/GithubController.php → src/console/GithubController.php b/src/controllers/GithubController.php → src/console/GithubController.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\controllers;
+namespace hidev\console;
 
 use yii\helpers\Json;
 

diff --git a/src/controllers/GitignoreController.php → src/console/GitignoreController.php b/src/controllers/GitignoreController.php → src/console/GitignoreController.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\controllers;
+namespace hidev\console;
 
 /**
  * `.gitignore` file generation.

diff --git a/src/controllers/InitController.php → src/console/InitController.php b/src/controllers/InitController.php → src/console/InitController.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\controllers;
+namespace hidev\console;
 
 use Exception;
 use hidev\base\File;

diff --git a/src/controllers/SvnignoreController.php → src/console/SvnignoreController.php b/src/controllers/SvnignoreController.php → src/console/SvnignoreController.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\controllers;
+namespace hidev\console;
 
 /**
  * Controller for svn:ignore.

diff --git a/src/controllers/VcsignoreController.php → src/console/VcsignoreController.php b/src/controllers/VcsignoreController.php → src/console/VcsignoreController.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\controllers;
+namespace hidev\console;
 
 /**
  * VCS ignore file generation.

diff --git a/src/controllers/VersionController.php → src/console/VersionController.php b/src/controllers/VersionController.php → src/console/VersionController.php
@@ -8,7 +8,7 @@
  * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
  */
 
-namespace hidev\controllers;
+namespace hidev\console;
 
 /**
  * Version management.
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
      * @copyright Copyright (c) 2015-2017, HiQDev (http://hiqdev.com/)
      */
-    namespace hidev\controllers;
+    namespace hidev\console;
     /**
      * Git.
@@ Expand Down @@