From ac287c0a6e0983fb30d54a014dde794da2003eff Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 17 Feb 2020 07:34:00 +0100
Subject: update to 4.0.4

---
 PHPINFO           |   6 +-
 REFLECTION        | 266 +++++++++++++++++++++++++++---------------------------
 php-phalcon4.spec |   5 +-
 3 files changed, 140 insertions(+), 137 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 718cded..924208a 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -5,9 +5,9 @@ phalcon
 Phalcon is a full stack PHP framework, delivered as a PHP extension, offering lower resource consumption and high performance.
 phalcon => enabled
 Author => Phalcon Team and contributors
-Version => 4.0.3
-Build Date => Jan 26 2020 00:00:00
-Powered by Zephir => Version 0.12.16-12256a1
+Version => 4.0.4
+Build Date => Feb 17 2020 00:00:00
+Powered by Zephir => Version 0.12.17-6724dbf
 
 Directive => Local Value => Master Value
 phalcon.db.escape_identifiers => On => On
diff --git a/REFLECTION b/REFLECTION
index fbe6ad7..827812a 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #106 phalcon version 4.0.3 ] {
+Extension [ <persistent> extension #108 phalcon version 4.0.4 ] {
 
   - Dependencies {
     Dependency [ pdo (Required) ]
@@ -47409,34 +47409,24 @@ Extension [ <persistent> extension #106 phalcon version 4.0.3 ] {
       }
 
       - Methods [37] {
-        Method [ <internal:phalcon, prototype Phalcon\Di\InjectionAwareInterface> public method setDI ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> Phalcon\Di\DiInterface $container ]
-          }
-          - Return [ void ]
-        }
-
-        Method [ <internal:phalcon, prototype Phalcon\Di\InjectionAwareInterface> public method getDI ] {
-
-          - Parameters [0] {
-          }
-          - Return [ Phalcon\Di\DiInterface ]
-        }
-
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method setModelName ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method andWhere ] {
 
-          - Parameters [1] {
-            Parameter #0 [ <required> string $modelName ]
+          - Parameters [3] {
+            Parameter #0 [ <required> string $conditions ]
+            Parameter #1 [ <optional> $bindParams ]
+            Parameter #2 [ <optional> $bindTypes ]
           }
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getModelName ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method betweenWhere ] {
 
-          - Parameters [0] {
+          - Parameters [3] {
+            Parameter #0 [ <required> string $expr ]
+            Parameter #1 [ <required> $minimum ]
+            Parameter #2 [ <required> $maximum ]
           }
-          - Return [ string ]
+          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
         Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method bind ] {
@@ -47456,10 +47446,10 @@ Extension [ <persistent> extension #106 phalcon version 4.0.3 ] {
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method distinct ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method cache ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $distinct ]
+            Parameter #0 [ <required> array $cache ]
           }
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
@@ -47472,129 +47462,104 @@ Extension [ <persistent> extension #106 phalcon version 4.0.3 ] {
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon> public method join ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method conditions ] {
 
-          - Parameters [4] {
-            Parameter #0 [ <required> string $model ]
-            Parameter #1 [ <optional> $conditions ]
-            Parameter #2 [ <optional> $alias ]
-            Parameter #3 [ <optional> $type ]
+          - Parameters [1] {
+            Parameter #0 [ <required> string $conditions ]
           }
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method innerJoin ] {
+        Method [ <internal:phalcon> public method createBuilder ] {
 
-          - Parameters [3] {
-            Parameter #0 [ <required> string $model ]
-            Parameter #1 [ <optional> $conditions ]
-            Parameter #2 [ <optional> $alias ]
+          - Parameters [0] {
           }
-          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
+          - Return [ Phalcon\Mvc\Model\Query\BuilderInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method leftJoin ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method distinct ] {
 
-          - Parameters [3] {
-            Parameter #0 [ <required> string $model ]
-            Parameter #1 [ <optional> $conditions ]
-            Parameter #2 [ <optional> $alias ]
+          - Parameters [1] {
+            Parameter #0 [ <required> $distinct ]
           }
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method rightJoin ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method execute ] {
 
-          - Parameters [3] {
-            Parameter #0 [ <required> string $model ]
-            Parameter #1 [ <optional> $conditions ]
-            Parameter #2 [ <optional> $alias ]
+          - Parameters [0] {
           }
-          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
+          - Return [ Phalcon\Mvc\Model\ResultsetInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method where ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method forUpdate ] {
 
-          - Parameters [3] {
-            Parameter #0 [ <required> string $conditions ]
-            Parameter #1 [ <optional> $bindParams ]
-            Parameter #2 [ <optional> $bindTypes ]
+          - Parameters [1] {
+            Parameter #0 [ <optional> bool $forUpdate ]
           }
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method andWhere ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getColumns ] {
 
-          - Parameters [3] {
-            Parameter #0 [ <required> string $conditions ]
-            Parameter #1 [ <optional> $bindParams ]
-            Parameter #2 [ <optional> $bindTypes ]
+          - Parameters [0] {
           }
-          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
+          - Return [ string or NULL ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method orWhere ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getConditions ] {
 
-          - Parameters [3] {
-            Parameter #0 [ <required> string $conditions ]
-            Parameter #1 [ <optional> $bindParams ]
-            Parameter #2 [ <optional> $bindTypes ]
+          - Parameters [0] {
           }
-          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
+          - Return [ string or NULL ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method betweenWhere ] {
+        Method [ <internal:phalcon, prototype Phalcon\Di\InjectionAwareInterface> public method getDI ] {
 
-          - Parameters [3] {
-            Parameter #0 [ <required> string $expr ]
-            Parameter #1 [ <required> $minimum ]
-            Parameter #2 [ <required> $maximum ]
+          - Parameters [0] {
           }
-          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
+          - Return [ Phalcon\Di\DiInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method notBetweenWhere ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getGroupBy ] {
+        }
 
-          - Parameters [3] {
-            Parameter #0 [ <required> string $expr ]
-            Parameter #1 [ <required> $minimum ]
-            Parameter #2 [ <required> $maximum ]
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getHaving ] {
+        }
+
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getLimit ] {
+
+          - Parameters [0] {
           }
-          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
+          - Return [ string or NULL ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method inWhere ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getModelName ] {
 
-          - Parameters [2] {
-            Parameter #0 [ <required> string $expr ]
-            Parameter #1 [ <required> array $values ]
+          - Parameters [0] {
           }
-          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
+          - Return [ string ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method notInWhere ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getOrderBy ] {
 
-          - Parameters [2] {
-            Parameter #0 [ <required> string $expr ]
-            Parameter #1 [ <required> array $values ]
+          - Parameters [0] {
           }
-          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
+          - Return [ string or NULL ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method conditions ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getParams ] {
 
-          - Parameters [1] {
-            Parameter #0 [ <required> string $conditions ]
+          - Parameters [0] {
           }
-          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
+          - Return [ array ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method orderBy ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getWhere ] {
 
-          - Parameters [1] {
-            Parameter #0 [ <required> string $orderColumns ]
+          - Parameters [0] {
           }
-          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
+          - Return [ string or NULL ]
         }
 
         Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method groupBy ] {
@@ -47613,99 +47578,134 @@ Extension [ <persistent> extension #106 phalcon version 4.0.3 ] {
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method limit ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method innerJoin ] {
 
-          - Parameters [2] {
-            Parameter #0 [ <required> int $limit ]
-            Parameter #1 [ <optional> int $offset ]
+          - Parameters [3] {
+            Parameter #0 [ <required> string $model ]
+            Parameter #1 [ <optional> $conditions ]
+            Parameter #2 [ <optional> $alias ]
           }
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method forUpdate ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method inWhere ] {
 
-          - Parameters [1] {
-            Parameter #0 [ <optional> bool $forUpdate ]
+          - Parameters [2] {
+            Parameter #0 [ <required> string $expr ]
+            Parameter #1 [ <required> array $values ]
           }
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method sharedLock ] {
+        Method [ <internal:phalcon> public method join ] {
 
-          - Parameters [1] {
-            Parameter #0 [ <optional> bool $sharedLock ]
+          - Parameters [4] {
+            Parameter #0 [ <required> string $model ]
+            Parameter #1 [ <optional> $conditions ]
+            Parameter #2 [ <optional> $alias ]
+            Parameter #3 [ <optional> $type ]
           }
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method cache ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method leftJoin ] {
 
-          - Parameters [1] {
-            Parameter #0 [ <required> array $cache ]
+          - Parameters [3] {
+            Parameter #0 [ <required> string $model ]
+            Parameter #1 [ <optional> $conditions ]
+            Parameter #2 [ <optional> $alias ]
           }
           - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getWhere ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method limit ] {
 
-          - Parameters [0] {
+          - Parameters [2] {
+            Parameter #0 [ <required> int $limit ]
+            Parameter #1 [ <optional> int $offset ]
           }
-          - Return [ string or NULL ]
+          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getColumns ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method notBetweenWhere ] {
 
-          - Parameters [0] {
+          - Parameters [3] {
+            Parameter #0 [ <required> string $expr ]
+            Parameter #1 [ <required> $minimum ]
+            Parameter #2 [ <required> $maximum ]
           }
-          - Return [ string or NULL ]
+          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getConditions ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method notInWhere ] {
 
-          - Parameters [0] {
+          - Parameters [2] {
+            Parameter #0 [ <required> string $expr ]
+            Parameter #1 [ <required> array $values ]
           }
-          - Return [ string or NULL ]
+          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getLimit ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method orderBy ] {
 
-          - Parameters [0] {
+          - Parameters [1] {
+            Parameter #0 [ <required> string $orderColumns ]
           }
-          - Return [ string or NULL ]
+          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getOrderBy ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method orWhere ] {
 
-          - Parameters [0] {
+          - Parameters [3] {
+            Parameter #0 [ <required> string $conditions ]
+            Parameter #1 [ <optional> $bindParams ]
+            Parameter #2 [ <optional> $bindTypes ]
           }
-          - Return [ string or NULL ]
+          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getGroupBy ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method rightJoin ] {
+
+          - Parameters [3] {
+            Parameter #0 [ <required> string $model ]
+            Parameter #1 [ <optional> $conditions ]
+            Parameter #2 [ <optional> $alias ]
+          }
+          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getHaving ] {
+        Method [ <internal:phalcon, prototype Phalcon\Di\InjectionAwareInterface> public method setDI ] {
+
+          - Parameters [1] {
+            Parameter #0 [ <required> Phalcon\Di\DiInterface $container ]
+          }
+          - Return [ void ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method getParams ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method setModelName ] {
 
-          - Parameters [0] {
+          - Parameters [1] {
+            Parameter #0 [ <required> string $modelName ]
           }
-          - Return [ array ]
+          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon> public method createBuilder ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method sharedLock ] {
 
-          - Parameters [0] {
+          - Parameters [1] {
+            Parameter #0 [ <optional> bool $sharedLock ]
           }
-          - Return [ Phalcon\Mvc\Model\Query\BuilderInterface ]
+          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
 
-        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method execute ] {
+        Method [ <internal:phalcon, prototype Phalcon\Mvc\Model\CriteriaInterface> public method where ] {
 
-          - Parameters [0] {
+          - Parameters [3] {
+            Parameter #0 [ <required> string $conditions ]
+            Parameter #1 [ <optional> $bindParams ]
+            Parameter #2 [ <optional> $bindTypes ]
           }
-          - Return [ Phalcon\Mvc\Model\ResultsetInterface ]
+          - Return [ Phalcon\Mvc\Model\CriteriaInterface ]
         }
       }
     }
diff --git a/php-phalcon4.spec b/php-phalcon4.spec
index 7481ea6..de13736 100644
--- a/php-phalcon4.spec
+++ b/php-phalcon4.spec
@@ -22,7 +22,7 @@
 %global pecl_name    phalcon
 # after 40-json.ini, 20-pdo.ini, 40-psr.ini
 %global ini_name     50-%{pecl_name}.ini
-%global upstream_ver 4.0.3
+%global upstream_ver 4.0.4
 #global upstream_pre rc.3
 
 Name:           %{?sub_prefix}php-phalcon4
@@ -255,6 +255,9 @@ fi
 
 
 %changelog
+* Mon Feb 17 2020 Remi Collet <remi@remirepo.net> - 4.0.4-1
+- update to 4.0.4
+
 * Sun Jan 26 2020 Remi Collet <remi@remirepo.net> - 4.0.3-1
 - update to 4.0.3
 
-- 
cgit