Merge pull request #84 from niden/master

prep for 5.1.4
phalcon · Jan 15, 2023 · 20b21b8 · 20b21b8
2 parents 6ad86e7 + 3cf0fd5
commit 20b21b8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/src/Acl/Adapter/Memory.php b/src/Acl/Adapter/Memory.php
@@ -17,6 +17,7 @@
 use Phalcon\Acl\RoleAwareInterface;
 use Phalcon\Acl\ComponentAwareInterface;
 use Phalcon\Acl\ComponentInterface;
+use ReflectionClass;
 use ReflectionFunction;
 
 /**

diff --git a/src/Db/DialectInterface.php b/src/Db/DialectInterface.php
@@ -153,9 +153,10 @@ public function dropPrimaryKey(string $tableName, string $schemaName): string;
      *
      * @param string $tableName
      * @param string $schemaName
+     * @param bool $ifExists
      * @return string
      */
-    public function dropTable(string $tableName, string $schemaName): string;
+    public function dropTable(string $tableName, string $schemaName, bool $ifExists = true): string;
 
     /**
      * Generates SQL to drop a view

diff --git a/src/Db/Enum.php b/src/Db/Enum.php
@@ -42,6 +42,8 @@ class Enum
 
     const FETCH_OBJ = 5;
 
+    const FETCH_ORI_NEXT = 0;
+
     const FETCH_PROPS_LATE = 1048576;
 
     const FETCH_SERIALIZE = 524288;

diff --git a/src/Db/Result/PdoResult.php b/src/Db/Result/PdoResult.php
@@ -9,7 +9,6 @@
  */
 namespace Phalcon\Db\Result;
 
-use Pdo;
 use Phalcon\Db\Enum;
 use Phalcon\Db\ResultInterface;
 use Phalcon\Db\Adapter\AdapterInterface;
@@ -144,7 +143,7 @@ public function execute(): bool
      * @param int $cursorOrientation
      * @param int $cursorOffset
      */
-    public function fetch(int $fetchStyle = null, int $cursorOrientation = Pdo::FETCH_ORI_NEXT, int $cursorOffset = 0)
+    public function fetch(int $fetchStyle = null, int $cursorOrientation = Enum::FETCH_ORI_NEXT, int $cursorOffset = 0)
     {
     }
 
@@ -166,7 +165,7 @@ public function fetch(int $fetchStyle = null, int $cursorOrientation = Pdo::FETC
      * @param array|null               $constructorArgs
      * @return array
      */
-    public function fetchAll(int $mode = Enum::FETCH_DEFAULT, $fetchArgument = Pdo::FETCH_ORI_NEXT, $constructorArgs = null): array
+    public function fetchAll(int $mode = Enum::FETCH_DEFAULT, $fetchArgument = Enum::FETCH_ORI_NEXT, $constructorArgs = null): array
     {
     }
 

diff --git a/src/Html/TagFactory.php b/src/Html/TagFactory.php
@@ -9,8 +9,8 @@
  */
 namespace Phalcon\Html;
 
-use Phalcon\Html\Escaper\EscaperInterface;
 use Phalcon\Factory\AbstractFactory;
+use Phalcon\Html\Escaper\EscaperInterface;
 use Phalcon\Html\Helper\Doctype;
 use Phalcon\Html\Helper\Input\Checkbox;
 use Phalcon\Html\Helper\Input\Color;