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

List parameters 2.x

Author: Bizley

README.md

@@ -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": "[email protected]"
-        }
-    ],
-    "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": "[email protected]"
+    }
+  ],
+  "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"
+    }
+  ]
 }

composer.json

@@ -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) {

Generator.php renamed to src/Generator.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':

Updater.php renamed to src/Updater.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)