Fixed return type hint for Column::getSize

See: #15019
phalcon · May 6, 2020 · c633aa9 · c633aa9
1 parent ed6da0b
commit c633aa9
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 37 deletions.
diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
@@ -53,6 +53,7 @@
 - Fixed return type hint for `Phalcon\Mvc\Model\MetaData::getColumnMap` and `Phalcon\Mvc\Model\MetaData::getReverseColumnMap` to reflect original behavior [#15015](https://github.com/phalcon/cphalcon/issues/15015)
 - Fixed return type hint for `Phalcon\Mvc\Model\MetaDataInterface::getColumnMap` and `Phalcon\Mvc\Model\MetaDataInterface::getReverseColumnMap` to reflect original behavior [#15015](https://github.com/phalcon/cphalcon/issues/15015)
 - Fixed return type hint for `Phalcon\Mvc\Model\CriteriaInterface::getColumns` and `Phalcon\Mvc\Model\Criteria::getColumns` to reflect original behavior [#15017](https://github.com/phalcon/cphalcon/issues/15017)
+- Fixed return type hint for `Phalcon\Db\Column::getSize` and `Phalcon\Db\ColumnInterface::getSize` to reflect original behavior [#15019](https://github.com/phalcon/cphalcon/issues/15019)
 
 # [4.0.5](https://github.com/phalcon/cphalcon/releases/tag/v4.0.5) (2020-03-07)
 ## Added

diff --git a/ext/phalcon/db/column.zep.c b/ext/phalcon/db/column.zep.c
diff --git a/ext/phalcon/db/column.zep.h b/ext/phalcon/db/column.zep.h
diff --git a/ext/phalcon/db/columninterface.zep.c b/ext/phalcon/db/columninterface.zep.c
diff --git a/ext/phalcon/db/columninterface.zep.h b/ext/phalcon/db/columninterface.zep.h
diff --git a/phalcon/Db/Column.zep b/phalcon/Db/Column.zep
@@ -1,11 +1,11 @@
 
 /**
- * This file is part of the Phalcon.
+ * This file is part of the Phalcon Framework.
  *
- * (c) Phalcon Team <team@phalcon.com>
+ * (c) Phalcon Team <team@phalcon.io>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view the
+ * LICENSE.txt file that was distributed with this source code.
  */
 
 namespace Phalcon\Db;
@@ -272,7 +272,7 @@ class Column implements ColumnInterface
     /**
      * Integer column size
      *
-     * @var int
+     * @var int | string
      */
     protected size = 0 { get };
 

diff --git a/phalcon/Db/ColumnInterface.zep b/phalcon/Db/ColumnInterface.zep
@@ -1,11 +1,11 @@
 
 /**
- * This file is part of the Phalcon.
+ * This file is part of the Phalcon Framework.
  *
- * (c) Phalcon Team <team@phalcon.com>
+ * (c) Phalcon Team <team@phalcon.io>
  *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view the
+ * LICENSE.txt file that was distributed with this source code.
  */
 
 namespace Phalcon\Db;
@@ -43,7 +43,7 @@ interface ColumnInterface
     /**
      * Returns column size
      */
-    public function getSize() -> int;
+    public function getSize() -> int | string;
 
     /**
      * Returns column type

diff --git a/tests/_data/fixtures/Traits/DbTrait.php b/tests/_data/fixtures/Traits/DbTrait.php
@@ -659,6 +659,8 @@ protected function getColumnsArray(): array
      *
      * @author Phalcon Team <[email protected]>
      * @since  2020-02-01
+     *
+     * @return Column[]
      */
     protected function getColumnsObjects(): array
     {

diff --git a/tests/database/Db/Column/GetSizeCest.php b/tests/database/Db/Column/GetSizeCest.php
@@ -5,8 +5,8 @@
  *
  * (c) Phalcon Team <[email protected]>
  *
- * For the full copyright and license information, please view the LICENSE.txt
- * file that was distributed with this source code.
+ * For the full copyright and license information, please view the
+ * LICENSE.txt file that was distributed with this source code.
  */
 
 declare(strict_types=1);
@@ -23,6 +23,8 @@ class GetSizeCest
     /**
      * Tests Phalcon\Db\Column :: getSize()
      *
+     * @param  DatabaseTester $I
+     *
      * @author Phalcon Team <[email protected]>
      * @since  2020-02-01
      *