move source code to 'src' directory

yiisoft · Feb 16, 2018 · 01883a8 · 01883a8
1 parent 2ee6efe
commit 01883a8
Show file tree

Hide file tree

Showing 64 changed files with 22 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ php:
 - 5.6
 - 7.0
 - 7.1
+- 7.2
 
 matrix:
   include:
@@ -43,7 +44,7 @@ before_script:
     fi
 
 script:
-  - phpunit --verbose $PHPUNIT_FLAGS
+  - phpunit $PHPUNIT_FLAGS
 
 after_script:
   - |

diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
     },
     "autoload": {
         "psr-4": {
-            "yii\\gii\\": ""
+            "yii\\gii\\": "src"
         }
     },
     "extra": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <phpunit bootstrap="./tests/bootstrap.php"
 		colors="true"
+		verbose="true"
 		convertErrorsToExceptions="true"
 		convertNoticesToExceptions="true"
 		convertWarningsToExceptions="true"

diff --git a/CodeFile.php → src/CodeFile.php b/CodeFile.php → src/CodeFile.php
diff --git a/Generator.php → src/Generator.php b/Generator.php → src/Generator.php
diff --git a/GiiAsset.php → src/GiiAsset.php b/GiiAsset.php → src/GiiAsset.php
diff --git a/Module.php → src/Module.php b/Module.php → src/Module.php
@@ -174,7 +174,7 @@ protected function coreGenerators()
      */
     protected function defaultVersion()
     {
-        $packageInfo = Json::decode(file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'composer.json'));
+        $packageInfo = Json::decode(file_get_contents(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'composer.json'));
         $extensionName = $packageInfo['name'];
         if (isset(Yii::$app->extensions[$extensionName])) {
             return Yii::$app->extensions[$extensionName]['version'];

diff --git a/TypeAheadAsset.php → src/TypeAheadAsset.php b/TypeAheadAsset.php → src/TypeAheadAsset.php
diff --git a/assets/gii.js → src/assets/gii.js b/assets/gii.js → src/assets/gii.js
diff --git a/assets/logo.png → src/assets/logo.png b/assets/logo.png → src/assets/logo.png
diff --git a/assets/main.css → src/assets/main.css b/assets/main.css → src/assets/main.css
diff --git a/components/ActiveField.php → src/components/ActiveField.php b/components/ActiveField.php → src/components/ActiveField.php
diff --git a/components/DiffRendererHtmlInline.php → src/components/DiffRendererHtmlInline.php b/components/DiffRendererHtmlInline.php → src/components/DiffRendererHtmlInline.php
diff --git a/console/GenerateAction.php → src/console/GenerateAction.php b/console/GenerateAction.php → src/console/GenerateAction.php
diff --git a/console/GenerateController.php → src/console/GenerateController.php b/console/GenerateController.php → src/console/GenerateController.php
diff --git a/controllers/DefaultController.php → src/controllers/DefaultController.php b/controllers/DefaultController.php → src/controllers/DefaultController.php
diff --git a/generators/controller/Generator.php → src/generators/controller/Generator.php b/generators/controller/Generator.php → src/generators/controller/Generator.php
diff --git a/generators/controller/default/controller.php → ...erators/controller/default/controller.php b/generators/controller/default/controller.php → ...erators/controller/default/controller.php
diff --git a/generators/controller/default/view.php → src/generators/controller/default/view.php b/generators/controller/default/view.php → src/generators/controller/default/view.php
diff --git a/generators/controller/form.php → src/generators/controller/form.php b/generators/controller/form.php → src/generators/controller/form.php
diff --git a/generators/crud/Generator.php → src/generators/crud/Generator.php b/generators/crud/Generator.php → src/generators/crud/Generator.php
diff --git a/generators/crud/default/controller.php → src/generators/crud/default/controller.php b/generators/crud/default/controller.php → src/generators/crud/default/controller.php
diff --git a/generators/crud/default/search.php → src/generators/crud/default/search.php b/generators/crud/default/search.php → src/generators/crud/default/search.php
diff --git a/generators/crud/default/views/_form.php → src/generators/crud/default/views/_form.php b/generators/crud/default/views/_form.php → src/generators/crud/default/views/_form.php
diff --git a/generators/crud/default/views/_search.php → ...generators/crud/default/views/_search.php b/generators/crud/default/views/_search.php → ...generators/crud/default/views/_search.php
diff --git a/generators/crud/default/views/create.php → src/generators/crud/default/views/create.php b/generators/crud/default/views/create.php → src/generators/crud/default/views/create.php
diff --git a/generators/crud/default/views/index.php → src/generators/crud/default/views/index.php b/generators/crud/default/views/index.php → src/generators/crud/default/views/index.php
diff --git a/generators/crud/default/views/update.php → src/generators/crud/default/views/update.php b/generators/crud/default/views/update.php → src/generators/crud/default/views/update.php
diff --git a/generators/crud/default/views/view.php → src/generators/crud/default/views/view.php b/generators/crud/default/views/view.php → src/generators/crud/default/views/view.php
diff --git a/generators/crud/form.php → src/generators/crud/form.php b/generators/crud/form.php → src/generators/crud/form.php
diff --git a/generators/extension/Generator.php → src/generators/extension/Generator.php b/generators/extension/Generator.php → src/generators/extension/Generator.php
diff --git a/...ors/extension/default/AutoloadExample.php → ...ors/extension/default/AutoloadExample.php b/...ors/extension/default/AutoloadExample.php → ...ors/extension/default/AutoloadExample.php
diff --git a/generators/extension/default/README.md → src/generators/extension/default/README.md b/generators/extension/default/README.md → src/generators/extension/default/README.md
diff --git a/generators/extension/default/composer.json → ...enerators/extension/default/composer.json b/generators/extension/default/composer.json → ...enerators/extension/default/composer.json
diff --git a/generators/extension/form.php → src/generators/extension/form.php b/generators/extension/form.php → src/generators/extension/form.php
diff --git a/generators/form/Generator.php → src/generators/form/Generator.php b/generators/form/Generator.php → src/generators/form/Generator.php
diff --git a/generators/form/default/action.php → src/generators/form/default/action.php b/generators/form/default/action.php → src/generators/form/default/action.php
diff --git a/generators/form/default/form.php → src/generators/form/default/form.php b/generators/form/default/form.php → src/generators/form/default/form.php
diff --git a/generators/form/form.php → src/generators/form/form.php b/generators/form/form.php → src/generators/form/form.php
diff --git a/generators/model/Generator.php → src/generators/model/Generator.php b/generators/model/Generator.php → src/generators/model/Generator.php
diff --git a/generators/model/default/model.php → src/generators/model/default/model.php b/generators/model/default/model.php → src/generators/model/default/model.php
diff --git a/generators/model/default/query.php → src/generators/model/default/query.php b/generators/model/default/query.php → src/generators/model/default/query.php
diff --git a/generators/model/form.php → src/generators/model/form.php b/generators/model/form.php → src/generators/model/form.php
diff --git a/generators/module/Generator.php → src/generators/module/Generator.php b/generators/module/Generator.php → src/generators/module/Generator.php
diff --git a/generators/module/default/controller.php → src/generators/module/default/controller.php b/generators/module/default/controller.php → src/generators/module/default/controller.php
diff --git a/generators/module/default/module.php → src/generators/module/default/module.php b/generators/module/default/module.php → src/generators/module/default/module.php
diff --git a/generators/module/default/view.php → src/generators/module/default/view.php b/generators/module/default/view.php → src/generators/module/default/view.php
diff --git a/generators/module/form.php → src/generators/module/form.php b/generators/module/form.php → src/generators/module/form.php
diff --git a/views/default/diff.php → src/views/default/diff.php b/views/default/diff.php → src/views/default/diff.php
diff --git a/views/default/index.php → src/views/default/index.php b/views/default/index.php → src/views/default/index.php
diff --git a/views/default/view.php → src/views/default/view.php b/views/default/view.php → src/views/default/view.php
diff --git a/views/default/view/files.php → src/views/default/view/files.php b/views/default/view/files.php → src/views/default/view/files.php
diff --git a/views/default/view/results.php → src/views/default/view/results.php b/views/default/view/results.php → src/views/default/view/results.php
diff --git a/views/layouts/generator.php → src/views/layouts/generator.php b/views/layouts/generator.php → src/views/layouts/generator.php
diff --git a/views/layouts/main.php → src/views/layouts/main.php b/views/layouts/main.php → src/views/layouts/main.php
diff --git a/tests/GeneratorsTest.php b/tests/GeneratorsTest.php
@@ -1,5 +1,6 @@
 <?php
-namespace yiiunit\extensions\gii;
+
+namespace yiiunit\gii;
 
 use yii\gii\CodeFile;
 use yii\gii\generators\controller\Generator as ControllerGenerator;
@@ -80,7 +81,7 @@ public function testFormGenerator()
     {
         $generator = new FormGenerator();
         $generator->template = 'default';
-        $generator->modelClass = 'yiiunit\extensions\gii\Profile';
+        $generator->modelClass = 'yiiunit\gii\Profile';
         $generator->viewName = 'profile';
         $generator->viewPath = '@app/runtime';
 
@@ -94,7 +95,7 @@ public function testCRUDGenerator()
     {
         $generator = new CRUDGenerator();
         $generator->template = 'default';
-        $generator->modelClass = 'yiiunit\extensions\gii\Profile';
+        $generator->modelClass = 'yiiunit\gii\Profile';
         $generator->controllerClass = 'app\TestController';
 
         $valid = $generator->validate();

diff --git a/tests/GiiTestCase.php b/tests/GiiTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\extensions\gii;
+namespace yiiunit\gii;
 
 use Yii;
 use yii\helpers\FileHelper;

diff --git a/tests/ModuleTest.php b/tests/ModuleTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\extensions\gii;
+namespace yiiunit\gii;
 
 use Yii;
 use yii\gii\Module;

diff --git a/tests/Profile.php b/tests/Profile.php
@@ -1,8 +1,6 @@
 <?php
 
-
-namespace yiiunit\extensions\gii;
-
+namespace yiiunit\gii;
 
 use yii\db\ActiveRecord;
 

diff --git a/tests/SchemaTest.php b/tests/SchemaTest.php
@@ -1,8 +1,10 @@
 <?php
-namespace yiiunit\extensions\gii;
+
+namespace yiiunit\gii;
 
 use yii\gii\generators\model\Generator as ModelGenerator;
 use Yii;
+
 /**
  * SchemaTest checks that Gii model generator supports multiple schemas
  * @group gii

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\extensions\gii;
+namespace yiiunit\gii;
 
 use yii\di\Container;
 use yii\helpers\ArrayHelper;

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -11,7 +11,7 @@
 require_once(__DIR__ . '/../vendor/autoload.php');
 require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
 
-Yii::setAlias('@yiiunit/extensions/gii', __DIR__);
-Yii::setAlias('@yii/gii', dirname(__DIR__));
+Yii::setAlias('@yiiunit/gii', __DIR__);
+Yii::setAlias('@yii/gii', dirname(__DIR__) . '/src');
 
 require_once(__DIR__ . '/compatibility.php');
diff --git a/tests/generators/CrudGeneratorTest.php b/tests/generators/CrudGeneratorTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace yiiunit\extensions\gii\generators;
+namespace yiiunit\gii\generators;
 
 use yii\db\ColumnSchema;
 use yii\gii\generators\crud\Generator;
-use yiiunit\extensions\gii\TestCase;
+use yiiunit\gii\TestCase;
 
 class CrudGeneratorTest extends TestCase
 {

diff --git a/tests/generators/ModelGeneratorTest.php b/tests/generators/ModelGeneratorTest.php
@@ -1,8 +1,8 @@
 <?php
-namespace yiiunit\extensions\gii\generators;
+namespace yiiunit\gii\generators;
 
 use yii\gii\generators\model\Generator as ModelGenerator;
-use yiiunit\extensions\gii\GiiTestCase;
+use yiiunit\gii\GiiTestCase;
 
 /**
  * ModelGeneratorTest checks that Gii model generator produces valid results
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ php: @@
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
     matrix:
       include:
@@ Expand Down Expand Up / @@ -43,7 +44,7 @@ before_script: @@
         fi
     script:
-      - phpunit --verbose $PHPUNIT_FLAGS
+      - phpunit $PHPUNIT_FLAGS
     after_script:
       - |
@@ Expand Down @@