Merge pull request #36 from bizley/list-parameters-2.x

List parameters 2.x
bizley · Oct 11, 2018 · 62fadeb · 62fadeb
2 parents 0b79e48 + ebf0fa3
commit 62fadeb
Show file tree

Hide file tree

Showing 91 changed files with 161 additions and 151 deletions.
diff --git a/README.md b/README.md
@@ -15,23 +15,23 @@ Add the package to your composer.json:
 
     {
         "require": {
-            "bizley/migration": "~3.0.0"
+            "bizley/migration": "^3.0"
         }
     }
 
-and run `composer update` or alternatively run `composer require bizley/migration:~3.0.0`
+and run `composer update` or alternatively run `composer require bizley/migration:^3.0`
 
 ## Installation for PHP < 7.1
 
 Add the package to your composer.json:
 
     {
         "require": {
-            "bizley/migration": "~2.3.0"
+            "bizley/migration": "^2.3"
         }
     }
 
-and run `composer update` or alternatively run `composer require bizley/migration:~2.3.0`
+and run `composer update` or alternatively run `composer require bizley/migration:^2.3`
 
 ## Configuration
 

diff --git a/composer.json b/composer.json
@@ -1,34 +1,41 @@
 {
-    "name": "bizley/migration",
-    "description": "Migration generator for Yii 2.",
-    "type": "yii2-extension",
-    "keywords": ["yii2", "migration", "migrate", "generator", "console"],
-    "license": "Apache-2.0",
-    "authors": [
-        {
-            "name": "Pawel Bizley Brzozowski",
-            "email": "pawel@positive.codes"
-        }
-    ],
-    "support": {
-        "source": "https://github.com/bizley/yii2-migration"
-    },
-    "require": {
-        "ext-mbstring": "*",
-        "php": ">=5.4.0 <7.1.0",
-        "yiisoft/yii2": ">=2.0.11 <2.1.0"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~4.8.36",
-        "roave/security-advisories": "dev-master"
-    },
-    "autoload": {
-        "psr-4": {"bizley\\migration\\": ""}
-    },
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://asset-packagist.org"
-        }
-    ]
+  "name": "bizley/migration",
+  "description": "Migration generator for Yii 2.",
+  "type": "yii2-extension",
+  "keywords": ["yii2", "migration", "migrate", "generator", "console"],
+  "license": "Apache-2.0",
+  "authors": [
+    {
+      "name": "Pawel Bizley Brzozowski",
+      "email": "pawel@positive.codes"
+    }
+  ],
+  "support": {
+    "source": "https://github.com/bizley/yii2-migration"
+  },
+  "require": {
+    "ext-mbstring": "*",
+    "php": ">=5.4.0 <7.1.0",
+    "yiisoft/yii2": ">=2.0.11 <2.1.0"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~4.8.36",
+    "roave/security-advisories": "dev-master"
+  },
+  "autoload": {
+    "psr-4": {
+      "bizley\\migration\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "bizley\\tests\\": "tests/"
+    }
+  },
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://asset-packagist.org"
+    }
+  ]
 }
diff --git a/Generator.php → src/Generator.php b/Generator.php → src/Generator.php
@@ -108,7 +108,7 @@ public function getTableSchema()
     protected function getTablePrimaryKey()
     {
         $data = [];
-        if (method_exists($this->db->schema, 'getTablePrimaryKey')) {
+        if (method_exists($this->db->schema, 'getTablePrimaryKey')) { // requires Yii 2.0.13
             /* @var $constraint \yii\db\Constraint */
             $constraint = $this->db->schema->getTablePrimaryKey($this->tableName, true);
             if ($constraint) {
@@ -129,7 +129,7 @@ protected function getTablePrimaryKey()
 
     /**
      * Returns columns structure.
-     * @param $indexes TableIndex[]
+     * @param TableIndex[] $indexes
      * @return TableColumn[]
      * @throws InvalidConfigException
      */
@@ -173,7 +173,7 @@ protected function getTableColumns($indexes = [])
     protected function getTableForeignKeys()
     {
         $data = [];
-        if (method_exists($this->db->schema, 'getTableForeignKeys')) {
+        if (method_exists($this->db->schema, 'getTableForeignKeys')) { // requires Yii 2.0.13
             $fks = $this->db->schema->getTableForeignKeys($this->tableName, true);
             /* @var $fk \yii\db\ForeignKeyConstraint */
             foreach ($fks as $fk) {
@@ -212,7 +212,7 @@ protected function getTableForeignKeys()
     protected function getTableIndexes()
     {
         $data = [];
-        if (method_exists($this->db->schema, 'getTableIndexes')) {
+        if (method_exists($this->db->schema, 'getTableIndexes')) { // requires Yii 2.0.13
             $idxs = $this->db->schema->getTableIndexes($this->tableName, true);
             /* @var $idx \yii\db\IndexConstraint */
             foreach ($idxs as $idx) {

diff --git a/Updater.php → src/Updater.php b/Updater.php → src/Updater.php
diff --git a/controllers/MigrationController.php → src/controllers/MigrationController.php b/controllers/MigrationController.php → src/controllers/MigrationController.php
@@ -4,8 +4,6 @@
 
 use bizley\migration\Generator;
 use bizley\migration\Updater;
-use Closure;
-use Exception;
 use Yii;
 use yii\base\Action;
 use yii\base\InvalidConfigException;
@@ -22,13 +20,13 @@
  * Generates migration file based on the existing database table and previous migrations.
  *
  * @author Paweł Bizley Brzozowski
- * @version 2.3.2
+ * @version 2.3.3
  * @license Apache 2.0
  * https://github.com/bizley/yii2-migration
  */
 class MigrationController extends Controller
 {
-    protected $version = '2.3.2';
+    protected $version = '2.3.3';
 
     /**
      * @var string Default command action.
@@ -48,7 +46,6 @@ class MigrationController extends Controller
      * Migration namespace should be resolvable as a path alias if prefixed with @, e.g. if you specify the namespace
      * 'app\migrations', the code Yii::getAlias('@app/migrations') should be able to return the file path to
      * the directory this namespace refers to.
-     * Namespaced migrations have been added in Yii 2.0.10.
      * Alias -n
      * @since 1.1
      */
@@ -76,9 +73,8 @@ class MigrationController extends Controller
     public $useTablePrefix = 1;
 
     /**
-     * @var Connection|array|string DB connection object or the application component ID of the DB connection to use
-     * when creating migrations.
-     * Starting from Yii 2.0.3, this can also be a configuration array for creating the object.
+     * @var Connection|array|string DB connection object, configuration array, or the application component ID of
+     * the DB connection to use when generating migrations.
      */
     public $db = 'db';
 
@@ -91,7 +87,7 @@ class MigrationController extends Controller
     public $migrationTable = '{{%migration}}';
 
     /**
-     * @var bool|string|int Whether to only display changes instead of create update migration.
+     * @var bool|string|int Whether to only display changes instead of creating update migration.
      * Alias -s
      * @since 2.0
      */
@@ -100,8 +96,8 @@ class MigrationController extends Controller
     /**
      * @var bool|string|int Whether to use general column schema instead of database specific.
      * Alias -g
-     * Since 2.3.0 this property is 1 by default.
      * @since 2.0
+     * Since 2.3.0 this property is 1 by default.
      */
     public $generalSchema = 1;
 
@@ -124,8 +120,8 @@ class MigrationController extends Controller
      */
     public function options($actionID)
     {
-        $options = parent::options($actionID);
-        $createOptions = ['migrationPath', 'migrationNamespace', 'db', 'generalSchema', 'templateFile', 'useTablePrefix', 'fixHistory', 'migrationTable'];
+        $options = array_merge(parent::options($actionID), ['db']);
+        $createOptions = ['migrationPath', 'migrationNamespace', 'generalSchema', 'templateFile', 'useTablePrefix', 'fixHistory', 'migrationTable'];
         $updateOptions = ['showOnly', 'templateFileUpdate', 'skipMigrations'];
         switch ($actionID) {
             case 'create':

diff --git a/dummy/Migration.php → src/dummy/Migration.php b/dummy/Migration.php → src/dummy/Migration.php
diff --git a/table/TableChange.php → src/table/TableChange.php b/table/TableChange.php → src/table/TableChange.php
diff --git a/table/TableColumn.php → src/table/TableColumn.php b/table/TableColumn.php → src/table/TableColumn.php
@@ -90,7 +90,7 @@ public function getLength()
 
     /**
      * Sets length of the column.
-     * @param $value
+     * @param int|string $value
      */
     public function setLength($value)
     {
@@ -225,7 +225,7 @@ public function prepareSchemaAppend($table, $primaryKey, $autoIncrement)
 
     /**
      * Escapes single quotes.
-     * @param $value
+     * @param string $value
      * @return mixed
      */
     public function escapeQuotes($value)
@@ -235,7 +235,7 @@ public function escapeQuotes($value)
 
     /**
      * Removes information of primary key in append property.
-     * @param $schema
+     * @param string $schema
      * @return null|string
      */
     public function removePKAppend($schema)

diff --git a/table/TableColumnBigInt.php → src/table/TableColumnBigInt.php b/table/TableColumnBigInt.php → src/table/TableColumnBigInt.php
diff --git a/table/TableColumnBigPK.php → src/table/TableColumnBigPK.php b/table/TableColumnBigPK.php → src/table/TableColumnBigPK.php
diff --git a/table/TableColumnBigUPK.php → src/table/TableColumnBigUPK.php b/table/TableColumnBigUPK.php → src/table/TableColumnBigUPK.php
diff --git a/table/TableColumnBinary.php → src/table/TableColumnBinary.php b/table/TableColumnBinary.php → src/table/TableColumnBinary.php
diff --git a/table/TableColumnBoolean.php → src/table/TableColumnBoolean.php b/table/TableColumnBoolean.php → src/table/TableColumnBoolean.php
diff --git a/table/TableColumnChar.php → src/table/TableColumnChar.php b/table/TableColumnChar.php → src/table/TableColumnChar.php
diff --git a/table/TableColumnDate.php → src/table/TableColumnDate.php b/table/TableColumnDate.php → src/table/TableColumnDate.php
diff --git a/table/TableColumnDateTime.php → src/table/TableColumnDateTime.php b/table/TableColumnDateTime.php → src/table/TableColumnDateTime.php
@@ -19,7 +19,7 @@ public function getLength()
 
     /**
      * Sets length of the column.
-     * @param $value
+     * @param int|string $value
      */
     public function setLength($value)
     {

diff --git a/table/TableColumnDecimal.php → src/table/TableColumnDecimal.php b/table/TableColumnDecimal.php → src/table/TableColumnDecimal.php
@@ -19,7 +19,7 @@ public function getLength()
 
     /**
      * Sets length of the column.
-     * @param $value
+     * @param array|int|string $value
      */
     public function setLength($value)
     {

diff --git a/table/TableColumnDouble.php → src/table/TableColumnDouble.php b/table/TableColumnDouble.php → src/table/TableColumnDouble.php
@@ -19,7 +19,7 @@ public function getLength()
 
     /**
      * Sets length of the column.
-     * @param $value
+     * @param int|string $value
      */
     public function setLength($value)
     {

diff --git a/table/TableColumnFactory.php → src/table/TableColumnFactory.php b/table/TableColumnFactory.php → src/table/TableColumnFactory.php
diff --git a/table/TableColumnFloat.php → src/table/TableColumnFloat.php b/table/TableColumnFloat.php → src/table/TableColumnFloat.php
@@ -19,7 +19,7 @@ public function getLength()
 
     /**
      * Sets length of the column.
-     * @param $value
+     * @param int|string $value
      */
     public function setLength($value)
     {

diff --git a/table/TableColumnInt.php → src/table/TableColumnInt.php b/table/TableColumnInt.php → src/table/TableColumnInt.php
diff --git a/table/TableColumnJson.php → src/table/TableColumnJson.php b/table/TableColumnJson.php → src/table/TableColumnJson.php
diff --git a/table/TableColumnMoney.php → src/table/TableColumnMoney.php b/table/TableColumnMoney.php → src/table/TableColumnMoney.php
@@ -19,7 +19,7 @@ public function getLength()
 
     /**
      * Sets length of the column.
-     * @param $value
+     * @param array|int|string $value
      */
     public function setLength($value)
     {

diff --git a/table/TableColumnPK.php → src/table/TableColumnPK.php b/table/TableColumnPK.php → src/table/TableColumnPK.php
diff --git a/table/TableColumnSmallInt.php → src/table/TableColumnSmallInt.php b/table/TableColumnSmallInt.php → src/table/TableColumnSmallInt.php
diff --git a/table/TableColumnString.php → src/table/TableColumnString.php b/table/TableColumnString.php → src/table/TableColumnString.php
diff --git a/table/TableColumnText.php → src/table/TableColumnText.php b/table/TableColumnText.php → src/table/TableColumnText.php
diff --git a/table/TableColumnTime.php → src/table/TableColumnTime.php b/table/TableColumnTime.php → src/table/TableColumnTime.php
@@ -19,7 +19,7 @@ public function getLength()
 
     /**
      * Sets length of the column.
-     * @param $value
+     * @param int|string $value
      */
     public function setLength($value)
     {

diff --git a/table/TableColumnTimestamp.php → src/table/TableColumnTimestamp.php b/table/TableColumnTimestamp.php → src/table/TableColumnTimestamp.php
@@ -19,7 +19,7 @@ public function getLength()
 
     /**
      * Sets length of the column.
-     * @param $value
+     * @param int|string $value
      */
     public function setLength($value)
     {

diff --git a/table/TableColumnTinyInt.php → src/table/TableColumnTinyInt.php b/table/TableColumnTinyInt.php → src/table/TableColumnTinyInt.php
diff --git a/table/TableColumnUPK.php → src/table/TableColumnUPK.php b/table/TableColumnUPK.php → src/table/TableColumnUPK.php
diff --git a/table/TableForeignKey.php → src/table/TableForeignKey.php b/table/TableForeignKey.php → src/table/TableForeignKey.php
diff --git a/table/TableIndex.php → src/table/TableIndex.php b/table/TableIndex.php → src/table/TableIndex.php
diff --git a/table/TablePlan.php → src/table/TablePlan.php b/table/TablePlan.php → src/table/TablePlan.php
diff --git a/table/TablePrimaryKey.php → src/table/TablePrimaryKey.php b/table/TablePrimaryKey.php → src/table/TablePrimaryKey.php
@@ -47,7 +47,7 @@ public function render($table, $indent = 8)
 
     /**
      * Adds column to the key.
-     * @param $name
+     * @param string $name
      */
     public function addColumn($name)
     {

diff --git a/table/TableStructure.php → src/table/TableStructure.php b/table/TableStructure.php → src/table/TableStructure.php
@@ -67,7 +67,7 @@ public function getSchema()
 
     /**
      * Sets schema type based on the currently used schema class.
-     * @param string $schemaClass
+     * @param string|null $schemaClass
      */
     public function setSchema($schemaClass)
     {

diff --git a/views/create_migration.php → src/views/create_migration.php b/views/create_migration.php → src/views/create_migration.php
diff --git a/views/update_migration.php → src/views/update_migration.php b/views/update_migration.php → src/views/update_migration.php
diff --git a/tests/.gitignore b/tests/.gitignore
@@ -1 +1 @@
-/config.local.php
+config.local.php
diff --git a/tests/DbTestCase.php b/tests/DbTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace bizley\migration\tests;
+namespace bizley\tests;
 
 use Yii;
 use yii\console\Controller;
@@ -62,8 +62,8 @@ protected static function mockApplication($config = [], $appClass = '\yii\consol
                     'migrationNamespace' => null,
                 ],
                 'migrate' => [
-                    'class' => 'bizley\migration\tests\EchoMigrateController',
-                    'migrationNamespaces' => ['bizley\migration\tests\migrations'],
+                    'class' => 'bizley\tests\EchoMigrateController',
+                    'migrationNamespaces' => ['bizley\tests\migrations'],
                     'migrationPath' => null,
                     'interactive' => false
                 ],
@@ -75,7 +75,7 @@ protected static function mockApplication($config = [], $appClass = '\yii\consol
     }
 
     /**
-     * @param $route
+     * @param string $route
      * @param array $params
      * @throws \yii\base\InvalidRouteException
      * @throws \yii\console\Exception

diff --git a/tests/EchoMigrateController.php b/tests/EchoMigrateController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace bizley\migration\tests;
+namespace bizley\tests;
 
 use yii\console\controllers\MigrateController;
 

diff --git a/tests/MockMigrationController.php b/tests/MockMigrationController.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace bizley\migration\tests;
+namespace bizley\tests;
 
 use bizley\migration\controllers\MigrationController;
 
 /**
  * Class MockMigrationController
- * @package bizley\migration\tests
+ * @package bizley\tests
  */
 class MockMigrationController extends MigrationController
 {

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -10,4 +10,5 @@
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
 
-Yii::setAlias('@bizley/migration', __DIR__ . '/../');
+Yii::setAlias('@bizley/migration', __DIR__ . '/../src/');
+Yii::setAlias('@bizley/tests', __DIR__);
diff --git a/tests/migrations/m180317_093600_create_table_test_columns.php b/tests/migrations/m180317_093600_create_table_test_columns.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace bizley\migration\tests\migrations;
+namespace bizley\tests\migrations;
 
 use yii\db\Migration;
 

diff --git a/tests/migrations/m180317_100000_create_table_test_json.php b/tests/migrations/m180317_100000_create_table_test_json.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace bizley\migration\tests\migrations;
+namespace bizley\tests\migrations;
 
 use yii\db\Migration;