Merge pull request #16563 from phalcon/revert-16562-T16532-column-cor…

…rections Revert "T16532 column corrections"
phalcon · Apr 5, 2024 · 44243c0 · 44243c0
2 parents b8375ad + d938357
commit 44243c0
Show file tree

Hide file tree

Showing 23 changed files with 287 additions and 332 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -135,7 +135,7 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download Phalcon Pecl Package
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: phalcon-pecl
           path: ./phalcon-pecl
@@ -284,7 +284,7 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download Phalcon Pecl Package
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: phalcon-pecl
           path: ./phalcon-pecl
@@ -392,7 +392,7 @@ jobs:
 
       - name: Download Phalcon build artifacts
         id: download
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           path: ./build-artifacts
 

diff --git a/BACKERS.md b/BACKERS.md
@@ -102,14 +102,14 @@ Thanks for the support
 <a href="https://github.com/elcreator"><img src="https://avatars.githubusercontent.com/u/974975?v=4" title="Artur Kyryliuk" width="60" height="60"></a>
 <a href="https://github.com/Ultimater"><img src="https://avatars.githubusercontent.com/u/1922199?v=4" title="Kevin Yarmak" width="60" height="60"></a>
 <a href="https://github.com/Ruzgfpegk"><img src="https://avatars1.githubusercontent.com/u/3818364?s=460&v=4" title="Ruzgfpegk" width="60" height="60"></a>
+<a href="https://github.com/SliceOfLife"><img src="https://avatars.githubusercontent.com/u/3955618?v=4" title="SliceOfLife" width="60" height="60"></a>
 <a href="https://github.com/f-do"><img src="https://avatars.githubusercontent.com/u/4299065?v=4" title="Florian" width="60" height="60"></a>
 <a href="https://github.com/borisdelev"><img src="https://avatars.githubusercontent.com/u/4441663?s=460&u=be604c39153e26326f2123c6e1bfe880d5ec0947&v=4" title="Boris Delev" width="60" height="60"></a>
 <a href="https://github.com/emagus"><img src="https://avatars.githubusercontent.com/u/5857789?v=4" title="maGus Informática" width="60" height="60"></a>
 <a href="https://github.com/tztztztz"><img src="https://avatars.githubusercontent.com/u/7032308?v=4" title="Tomasz Zadora" width="60" height="60"></a>
 <a href="https://github.com/sitchi"><img src="https://avatars.githubusercontent.com/u/11546683?v=4" title="Nikoloz Sitchinava" width="60" height="60"></a>
 <a href="https://github.com/6trading"><img src="https://avatars.githubusercontent.com/u/12135941?v=4" title="Chris" width="60" height="60"></a>
 <a href="https://github.com/fvromera"><img src="https://avatars.githubusercontent.com/u/32909196?s=460&u=a4a6d765c836be52ab247354399d0ed1a49224fa&v=4" title="fvromera" width="60" height="60"></a>
-<a href="https://github.com/shenyman"><img src="https://avatars.githubusercontent.com/u/31950816?v=4" title="Sea Man" width="60" height="60"></a>
 <a href="https://github.com/dredasss"><img src="https://avatars1.githubusercontent.com/u/38747389?s=460&u=ee99a8bb28ee6bedbbea6325d49d4eb99080d421&v=4" title="Nerijus Alex" width="60" height="60"></a>
 <a href="https://github.com/housesigma"><img src="https://avatars.githubusercontent.com/u/50630040?s=200&v=4" title="HouseSigma" width="60" height="60"></a>
 <a href="https://github.com/markofo"><img src="https://avatars.githubusercontent.com/u/59839390?v=4" title="markofo" width="60" height="60"></a>

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -1,21 +1,5 @@
 # Changelog
 
-## [5.7.0](https://github.com/phalcon/cphalcon/releases/tag/v5.7.0) (xxxx-xx-xx)
-
-### Changed
-
-### Added
-
-### Fixed
-
-- Fixed `Phalcon\Mvc\Cli\Router` to extend the `Phalcon\Mvc\Cli\RouterInterface` [#16551](https://github.com/phalcon/cphalcon/issues/16551)
-- Fixed `Phalcon\Filter\Validation\Validator\StringLength::validate()` to correctly use the `include` parameter [#16560](https://github.com/phalcon/cphalcon/issues/16560)
-- Fixed `Phalcon\Db\Column::TYPE_BINARY` and `Phalcon\Db\Column::TYPE_TINYINTEGER` to have unique values [#16532](https://github.com/phalcon/cphalcon/issues/16532)
-
-### Removed
-
-# Changelog
-
 ## [5.6.2](https://github.com/phalcon/cphalcon/releases/tag/v5.6.1) (2024-03-14)
 
 ### Changed

diff --git a/composer.lock b/composer.lock
diff --git a/phalcon/Cli/Router.zep b/phalcon/Cli/Router.zep
@@ -15,7 +15,6 @@ use Phalcon\Di\AbstractInjectionAware;
 use Phalcon\Cli\Router\Route;
 use Phalcon\Cli\Router\Exception;
 use Phalcon\Cli\Router\RouteInterface;
-use Phalcon\Cli\RouterInterface;
 
 /**
  * Phalcon\Cli\Router is the standard framework router. Routing is the process
@@ -37,7 +36,7 @@ use Phalcon\Cli\RouterInterface;
  * echo $router->getTaskName();
  *```
  */
-class Router extends AbstractInjectionAware implements RouterInterface
+class Router extends AbstractInjectionAware
 {
     /**
      * @var string
@@ -139,8 +138,7 @@ class Router extends AbstractInjectionAware implements RouterInterface
      * $router->add("/about", "About::main");
      *```
      *
-     * @param string     $pattern
-     * @param mixed|null $paths
+     * @param string|array paths
      */
     public function add(string! pattern, paths = null) -> <RouteInterface>
     {
@@ -205,16 +203,14 @@ class Router extends AbstractInjectionAware implements RouterInterface
     /**
      * Returns a route object by its id
      *
-     * @param mixed $id
+     * @param int id
      */
     public function getRouteById(var id) -> <RouteInterface> | bool
     {
-        var route, routeId;
-
-        let routeId = (string) id;
+        var route;
 
         for route in this->routes {
-            if route->getRouteId() == routeId {
+            if route->getRouteId() == id {
                 return route;
             }
         }
@@ -225,7 +221,7 @@ class Router extends AbstractInjectionAware implements RouterInterface
     /**
      * Returns a route object by its name
      */
-    public function getRouteByName(string name) -> <RouteInterface> | bool
+    public function getRouteByName(string! name) -> <RouteInterface> | bool
     {
         var route;
 
@@ -465,17 +461,17 @@ class Router extends AbstractInjectionAware implements RouterInterface
     /**
      * Sets the default action name
      */
-    public function setDefaultAction(string actionName) -> <RouterInterface>
+    public function setDefaultAction(string actionName) -> <Router>
     {
         let this->defaultAction = actionName;
-
+        
         return this;
     }
 
     /**
      * Sets the name of the default module
      */
-    public function setDefaultModule(string moduleName) -> <RouterInterface>
+    public function setDefaultModule(string moduleName) -> <Router>
     {
         let this->defaultModule = moduleName;
         return this;
@@ -495,7 +491,7 @@ class Router extends AbstractInjectionAware implements RouterInterface
      * );
      *```
      */
-    public function setDefaults(array defaults) -> <RouterInterface>
+    public function setDefaults(array! defaults) -> <Router>
     {
         var module, task, action, params;
 

diff --git a/phalcon/Cli/RouterInterface.zep b/phalcon/Cli/RouterInterface.zep
@@ -56,12 +56,12 @@ interface RouterInterface
     /**
      * Returns a route object by its id
      */
-    public function getRouteById(var id) -> <RouteInterface> | bool;
+    public function getRouteById(var id) -> <RouteInterface>;
 
     /**
      * Returns a route object by its name
      */
-    public function getRouteByName(string name) -> <RouteInterface> | bool;
+    public function getRouteByName(string! name) -> <RouteInterface>;
 
     /**
      * Return all the routes defined in the router
@@ -83,17 +83,17 @@ interface RouterInterface
     /**
      * Sets the default action name
      */
-    public function setDefaultAction(string! actionName) -> <RouterInterface>;
+    public function setDefaultAction(string! actionName) -> void;
 
     /**
      * Sets the name of the default module
      */
-    public function setDefaultModule(string! moduleName) -> <RouterInterface>;
+    public function setDefaultModule(string! moduleName) -> void;
 
     /**
      * Sets an array of default paths
      */
-    public function setDefaults(array defaults) -> <RouterInterface>;
+    public function setDefaults(array! defaults) -> void;
 
     /**
      * Sets the default task name

diff --git a/phalcon/Db/Column.zep b/phalcon/Db/Column.zep
@@ -84,7 +84,7 @@ class Column implements ColumnInterface
     /**
      * Binary abstract data type
      */
-    const TYPE_BINARY = 27;
+    const TYPE_BINARY = 26;
 
     /**
      * Blob abstract data type
@@ -209,7 +209,7 @@ class Column implements ColumnInterface
     /**
      * Varbinary abstract data type
      */
-    const TYPE_VARBINARY = 28;
+    const TYPE_VARBINARY = 27;
 
     /**
      * Varchar abstract data type