Merge pull request #1161 from phalcon/3.2.x

sergeyklay · web-flow · commit f7d474ae5eb9 · 2018-01-05T13:24:28.000+02:00
3.2.x
diff --git a/README.md b/README.md
@@ -114,7 +114,7 @@ This command should display something similar to:
 ```sh
 $ phalcon --help
 
-Phalcon DevTools (3.2.11)
+Phalcon DevTools (3.2.12)
 
 Help:
   Lists the commands available in Phalcon devtools
diff --git a/scripts/Phalcon/Builder/Scaffold.php b/scripts/Phalcon/Builder/Scaffold.php
@@ -595,7 +595,7 @@ private function _makeLayoutsVolt()
 
         $fileName = Text::uncamelize($this->options->get('fileName'));
         $viewPath = $dirPathLayouts . DIRECTORY_SEPARATOR . $fileName . '.volt';
-        if (!file_exists($viewPath || $this->options->contains('force'))) {
+        if (!file_exists($viewPath) || $this->options->contains('force')) {
 
             // View model layout
             $code = '';
diff --git a/scripts/Phalcon/Devtools/Version.php b/scripts/Phalcon/Devtools/Version.php
@@ -39,6 +39,6 @@ class Version extends PhVersion
      */
     protected static function _getVersion()
     {
-        return [3, 2, 11, 4, 0];
+        return [3, 2, 12, 4, 0];
     }
 }
diff --git a/scripts/Phalcon/Generator/Snippet.php b/scripts/Phalcon/Generator/Snippet.php
@@ -167,7 +167,7 @@ public function getAttributes($type, $visibility, \Phalcon\Db\ColumnInterface $f
     /**
      *
      * @var %s%s%s
-     * @Column(type="%s"%s, nullable=%s)
+     * @Column(column="%s", type="%s"%s, nullable=%s)
      */
     %s \$%s;
 EOD;
@@ -176,6 +176,7 @@ public function getAttributes($type, $visibility, \Phalcon\Db\ColumnInterface $f
                 $type,
                 $field->isPrimary() ? PHP_EOL.'     * @Primary' : '',
                 $field->isAutoIncrement() ? PHP_EOL.'     * @Identity' : '',
+                $field->getName(),
                 $type,
                 $field->getSize() ? ', length=' . $field->getSize() : '',
                 $field->isNotNull() ? 'false' : 'true', $visibility, $fieldName).PHP_EOL;
diff --git a/tests/_data/console/app/models/files/TestModel.php b/tests/_data/console/app/models/files/TestModel.php
@@ -8,28 +8,28 @@ class TestModel extends \Phalcon\Mvc\Model
      * @var integer
      * @Primary
      * @Identity
-     * @Column(type="integer", length=10, nullable=false)
+     * @Column(column="id", type="integer", length=10, nullable=false)
      */
     public $id;
 
     /**
      *
      * @var string
-     * @Column(type="string", length=20, nullable=false)
+     * @Column(column="some-col", type="string", length=20, nullable=false)
      */
     public $someCol;
 
     /**
      *
      * @var string
-     * @Column(type="string", length=20, nullable=false)
+     * @Column(column="someCol2", type="string", length=20, nullable=false)
      */
     public $someCol2;
 
     /**
      *
      * @var string
-     * @Column(type="string", length=20, nullable=false)
+     * @Column(column="SomeCol3", type="string", length=20, nullable=false)
      */
     public $someCol3;
 
diff --git a/tests/_data/console/app/models/files/TestModel2.php b/tests/_data/console/app/models/files/TestModel2.php
@@ -8,14 +8,14 @@ class TestModel2 extends \Phalcon\Mvc\Model
      * @var integer
      * @Primary
      * @Identity
-     * @Column(type="integer", length=10, nullable=false)
+     * @Column(column="id", type="integer", length=10, nullable=false)
      */
     public $id;
 
     /**
      *
      * @var string
-     * @Column(type="string", length=45, nullable=false)
+     * @Column(column="name", type="string", length=45, nullable=false)
      */
     public $name;
 
diff --git a/tests/_data/console/app/models/files/TestModel3.php b/tests/_data/console/app/models/files/TestModel3.php
@@ -8,14 +8,14 @@ class TestModel3 extends \Phalcon\Mvc\Model
      * @var integer
      * @Primary
      * @Identity
-     * @Column(type="integer", length=10, nullable=false)
+     * @Column(column="id", type="integer", length=10, nullable=false)
      */
     public $id;
 
     /**
      *
      * @var string
-     * @Column(type="string", length=45, nullable=false)
+     * @Column(column="name", type="string", length=45, nullable=false)
      */
     public $name;
 
diff --git a/tests/_data/console/app/models/files/Testmodel4.php b/tests/_data/console/app/models/files/Testmodel4.php
@@ -8,14 +8,14 @@ class Testmodel4 extends \Phalcon\Mvc\Model
      * @var integer
      * @Primary
      * @Identity
-     * @Column(type="integer", length=10, nullable=false)
+     * @Column(column="id", type="integer", length=10, nullable=false)
      */
     public $id;
 
     /**
      *
      * @var string
-     * @Column(type="string", length=45, nullable=false)
+     * @Column(column="name", type="string", length=45, nullable=false)
      */
     public $name;
 
diff --git a/tests/_data/console_data/run_mysql_migration/1.0.2/test_migrations.dat b/tests/_data/console_data/run_mysql_migration/1.0.2/test_migrations.dat
@@ -0,0 +1 @@
+1,test1,"2017-08-29 13:05:41","2017-08-29 13:05:41"
diff --git a/tests/_data/console_data/run_mysql_migration/1.0.2/test_migrations.php b/tests/_data/console_data/run_mysql_migration/1.0.2/test_migrations.php
@@ -0,0 +1,100 @@
+<?php
+
+use Phalcon\Db\Column;
+use Phalcon\Db\Index;
+use Phalcon\Db\Reference;
+use Phalcon\Mvc\Model\Migration;
+
+/**
+ * Class TestMigrationsMigration_101
+ */
+class TestMigrationsMigration_102 extends Migration
+{
+    /**
+     * Define the table structure
+     *
+     * @return void
+     */
+    public function morph()
+    {
+        $this->morphTable('test_migrations', [
+                'columns' => [
+                    new Column(
+                        'id',
+                        [
+                            'type' => Column::TYPE_INTEGER,
+                            'unsigned' => true,
+                            'notNull' => true,
+                            'autoIncrement' => true,
+                            'size' => 10,
+                            'first' => true
+                        ]
+                    ),
+                    new Column(
+                        'name',
+                        [
+                            'type' => Column::TYPE_VARCHAR,
+                            'notNull' => true,
+                            'size' => 45,
+                            'after' => 'id'
+                        ]
+                    ),
+                    new Column(
+                        'created_at',
+                        [
+                            'type' => Column::TYPE_DATETIME,
+                            'notNull' => true,
+                            'size' => 1,
+                            'after' => 'name'
+                        ]
+                    ),
+                    new Column(
+                        'updated_at',
+                        [
+                            'type' => Column::TYPE_DATETIME,
+                            'notNull' => true,
+                            'size' => 1,
+                            'after' => 'created_at'
+                        ]
+                    )
+                ],
+                'indexes' => [
+                    new Index('PRIMARY', ['id'], 'PRIMARY')
+                ],
+                'options' => [
+                    'TABLE_TYPE' => 'BASE TABLE',
+                    'AUTO_INCREMENT' => '2',
+                    'ENGINE' => 'InnoDB',
+                    'TABLE_COLLATION' => 'utf8_general_ci'
+                ],
+            ]
+        );
+    }
+
+    /**
+     * Run the migrations
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $this->batchInsert('test_migrations', [
+                'id',
+                'name',
+                'created_at',
+                'updated_at'
+            ]
+        );
+    }
+
+    /**
+     * Reverse the migrations
+     *
+     * @return void
+     */
+    public function down()
+    {
+        $this->batchDelete('test_migrations');
+    }
+
+}
diff --git a/tests/_support/helpers.php b/tests/_support/helpers.php
@@ -4,7 +4,7 @@
   +------------------------------------------------------------------------+
   | Phosphorum                                                             |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2013-2017 Phalcon Team and contributors                  |
+  | Copyright (c) 2013-present Phalcon Team and contributors                  |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file  LICENSE.txt.                            |
diff --git a/tests/console/RunMysqlMigrationCept.php b/tests/console/RunMysqlMigrationCept.php
@@ -10,6 +10,7 @@
 
 $I->amInPath(dirname(app_path()));
 $I->cleanDir(tests_path('_data/console/.phalcon'));
+$I->copyDir(tests_path('_data/console_data/run_mysql_migration/1.0.2/'), app_path('migrations/1.0.2'));
 
 $I->seeFileFound(app_path('migrations/1.0.2/test_migrations.php'));
 $I->seeFileFound(app_path('migrations/1.0.2/test_migrations.dat'));
diff --git a/tests/unit/Mvc/Model/Migration/TableAware/ListTablesIteratorTest.php b/tests/unit/Mvc/Model/Migration/TableAware/ListTablesIteratorTest.php
@@ -10,7 +10,7 @@
   +------------------------------------------------------------------------+
   | Phalcon Developer Tools                                                |
   +------------------------------------------------------------------------+
-  | Copyright (c) 2011-2017 Phalcon Team (https://www.phalconphp.com)      |
+  | Copyright (c) 2013-present Phalcon Team (https://www.phalconphp.com)   |
   +------------------------------------------------------------------------+
   | This source file is subject to the New BSD License that is bundled     |
   | with this package in the file LICENSE.txt.                             |
@@ -41,7 +41,10 @@ public function shouldReturnListTablesFromIterator()
         $this->specify(
             'Method' . __METHOD__ . 'did not return table list',
             function($tablePrefix, $expected) use ($iterator, $listTables){
-                expect($listTables->listTablesForPrefix($tablePrefix, $iterator))->equals($expected);
+                $list = explode(',', $listTables->listTablesForPrefix($tablePrefix, $iterator));
+                natsort($list);
+
+                expect(implode(',', $list))->equals($expected);
             },
             [
                 'examples' => [

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@ class Version extends PhVersion`
`39`	`39`	`*/`
`40`	`40`	`protected static function _getVersion()`
`41`	`41`	`{`
`42`		`- return [3, 2, 11, 4, 0];`
	`42`	`+ return [3, 2, 12, 4, 0];`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+1,test1,"2017-08-29 13:05:41","2017-08-29 13:05:41"`