Reverting In Favor Of More Formal Fix

phalcon · Apr 20, 2022 · 005c201 · 005c201
1 parent 6144436
commit 005c201
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/phalcon/Db/Adapter/Pdo/Mysql.zep b/phalcon/Db/Adapter/Pdo/Mysql.zep
@@ -539,7 +539,7 @@ class Mysql extends PdoAdapter
             } elseif index["Non_unique"] == 0 {
                 let indexes[keyName]["type"] = "UNIQUE";
             } else {
-                let indexes[keyName]["type"] = null;
+                let indexes[keyName]["type"] = "";
             }
         }
 

diff --git a/phalcon/Db/Index.zep b/phalcon/Db/Index.zep
@@ -58,9 +58,9 @@ class Index implements IndexInterface
     /**
      * Index type
      *
-     * @var string|null
+     * @var string
      */
-    protected type;
+    protected type { get };
 
     /**
      * Phalcon\Db\Index constructor
@@ -71,14 +71,4 @@ class Index implements IndexInterface
         let this->columns = columns;
         let this->type = type;
     }
-
-    /**
-     * Index type
-     *
-     * @return string|null
-     */
-    public function getType() -> string | null
-    {
-        return this->type;
-    }
 }
diff --git a/phalcon/Db/IndexInterface.zep b/phalcon/Db/IndexInterface.zep
@@ -28,5 +28,5 @@ interface IndexInterface
     /**
      * Gets the index type
      */
-    public function getType() -> string | null;
+    public function getType() -> string;
 }