Merge pull request #23 from XueSiLf/2.x

feat: Adapt to php8.1 version
easy-swoole · Mar 15, 2024 · 3c83060 · 3c83060
2 parents c2a8420 + 513246a
commit 3c83060
Show file tree

Hide file tree

Showing 34 changed files with 864 additions and 669 deletions.
diff --git a/composer.json b/composer.json
@@ -1,31 +1,35 @@
 {
-  "name": "easyswoole/ddl",
-  "type": "library",
-  "description": "An efficient swoole framework",
-  "keywords": [
-    "swoole",
-    "framework",
-    "async",
-    "easyswoole"
-  ],
-  "homepage": "https://www.easyswoole.com/",
-  "license": "Apache-2.0",
-  "authors": [
-    {
-      "name": "YF",
-      "email": "291323003@qq.com"
+    "name": "easyswoole/ddl",
+    "type": "library",
+    "description": "An efficient swoole framework",
+    "keywords": [
+        "swoole",
+        "framework",
+        "async",
+        "easyswoole"
+    ],
+    "homepage": "https://www.easyswoole.com/",
+    "license": "Apache-2.0",
+    "authors": [
+        {
+            "name": "YF",
+            "email": "291323003@qq.com"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "EasySwoole\\DDL\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "EasySwoole\\DDL\\Test\\": "test/"
+        }
+    },
+    "require": {
+        "easyswoole/spl": "^2.0"
+    },
+    "require-dev": {
+        "easyswoole/phpunit": "^1.0"
     }
-  ],
-  "autoload": {
-    "psr-4": {
-      "EasySwoole\\DDL\\": "src/",
-      "EasySwoole\\DDL\\Test\\": "test/"
-    }
-  },
-  "require": {
-    "easyswoole/spl": "^1.2"
-  },
-  "require-dev": {
-    "easyswoole/phpunit": "^1.0"
-  }
 }
diff --git a/src/Blueprint/AbstractInterface/ColumnAbstract.php b/src/Blueprint/AbstractInterface/ColumnAbstract.php
@@ -51,25 +51,24 @@ public function getColumnName()
 
     /**
      * 设置字段类型
-     * @param string $type
+     * @param DataType $type
      * @return ColumnAbstract
      */
-    public function setColumnType(string $type)
+    public function setColumnType(DataType $type)
     {
-        $type = trim($type);
         if (!DataType::isValidValue($type)) {
-            throw new InvalidArgumentException('The column type ' . $type . ' is invalid');
+            throw new InvalidArgumentException('The column type ' . $type->value . ' is invalid');
         }
         $this->columnType = $type;
         return $this;
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getColumnType()
     {
-        return $this->columnType;
+        return $this->columnType->value;
     }
 
     /**

diff --git a/src/Blueprint/AbstractInterface/ColumnInterface.php b/src/Blueprint/AbstractInterface/ColumnInterface.php
@@ -2,9 +2,12 @@
 
 namespace EasySwoole\DDL\Blueprint\AbstractInterface;
 
+use EasySwoole\DDL\Enum\DataType;
+
 /**
  * 字段构造器接口类
  * Class ColumnInterface
+ *
  * @package EasySwoole\DDL\Blueprint\AbstractInterface
  */
 interface ColumnInterface
@@ -23,10 +26,10 @@ public function getColumnName();
 
     /**
      * 设置字段类型
-     * @param string $type
+     * @param DataType $type
      * @return ColumnInterface
      */
-    public function setColumnType(string $type);
+    public function setColumnType(DataType $type);
 
     /**
      * @return mixed

diff --git a/src/Blueprint/AbstractInterface/IndexAbstract.php b/src/Blueprint/AbstractInterface/IndexAbstract.php
@@ -2,6 +2,7 @@
 
 namespace EasySwoole\DDL\Blueprint\AbstractInterface;
 
+use EasySwoole\DDL\Enum\Index;
 use EasySwoole\DDL\Enum\Index as IndexType;
 use InvalidArgumentException;
 
@@ -39,12 +40,11 @@ public function getIndexName()
 
     /**
      * 设置索引类型
-     * @param string $type
+     * @param IndexType $type
      * @return IndexAbstract
      */
-    public function setIndexType(string $type)
+    public function setIndexType(IndexType $type)
     {
-        $type = trim($type);
         if (!IndexType::isValidValue($type)) {
             throw new InvalidArgumentException('The index type ' . $type . ' is invalid');
         }
@@ -57,7 +57,7 @@ public function setIndexType(string $type)
      */
     public function getIndexType()
     {
-        return $this->indexType;
+        return $this->indexType->value;
     }
 
     /**
@@ -112,4 +112,9 @@ public function __toString()
     {
         return $this->__createDDL();
     }
+
+    public static function isValidValue()
+    {
+
+    }
 }
diff --git a/src/Blueprint/AbstractInterface/IndexInterface.php b/src/Blueprint/AbstractInterface/IndexInterface.php
@@ -2,9 +2,12 @@
 
 namespace EasySwoole\DDL\Blueprint\AbstractInterface;
 
+use EasySwoole\DDL\Enum\Index as IndexType;
+
 /**
  * 索引构造器接口类
  * Class IndexInterface
+ *
  * @package EasySwoole\DDL\Blueprint\AbstractInterface
  */
 interface IndexInterface
@@ -23,10 +26,10 @@ public function getIndexName();
 
     /**
      * 设置索引类型
-     * @param string $type
+     * @param IndexType $type
      * @return IndexInterface
      */
-    public function setIndexType(string $type);
+    public function setIndexType(IndexType $type);
 
     /**
      * @return mixed

diff --git a/src/Blueprint/Alter/ColumnAdd.php b/src/Blueprint/Alter/ColumnAdd.php
@@ -339,7 +339,7 @@ private function parseColumnLimit()
     private function parseDataType()
     {
         $columnLimit = $this->parseColumnLimit();
-        $columnType = $this->columnType;
+        $columnType = $this->columnType->value;
         if ($columnLimit) {
             $columnType .= $columnLimit;
         }
@@ -362,7 +362,7 @@ public function __createDDL(): string
         return implode(' ',
             array_filter(
                 [
-                    Alter::ADD,
+                    Alter::ADD->name,
                     '`' . $this->columnName . '`',
                     (string)$this->parseDataType(),
                     $this->isBinary ? 'BINARY' : null,

diff --git a/src/Blueprint/Alter/ColumnChange.php b/src/Blueprint/Alter/ColumnChange.php
@@ -363,7 +363,7 @@ private function parseColumnLimit()
     private function parseDataType()
     {
         $columnLimit = $this->parseColumnLimit();
-        $columnType = $this->columnType;
+        $columnType = $this->columnType->value;
         if ($columnLimit) {
             $columnType .= $columnLimit;
         }
@@ -385,7 +385,7 @@ public function __createDDL(): string
         return implode(' ',
             array_filter(
                 [
-                    Alter::CHANGE,
+                    Alter::CHANGE->name,
                     '`' . $this->oldColumnName . '`',
                     '`' . $this->columnName . '`',
                     (string)$this->parseDataType(),

diff --git a/src/Blueprint/Alter/ColumnDrop.php b/src/Blueprint/Alter/ColumnDrop.php
@@ -56,7 +56,7 @@ public function __createDDL(): string
         return implode(' ',
             array_filter(
                 [
-                    Alter::DROP,
+                    Alter::DROP->name,
                     '`' . $this->getColumnName() . '`',
                 ]
             )

diff --git a/src/Blueprint/Alter/ColumnModify.php b/src/Blueprint/Alter/ColumnModify.php
@@ -339,7 +339,7 @@ private function parseColumnLimit()
     private function parseDataType()
     {
         $columnLimit = $this->parseColumnLimit();
-        $columnType = $this->getColumnType();
+        $columnType = $this->getColumnType() ;
         if ($columnLimit) {
             $columnType .= $columnLimit;
         }
@@ -362,7 +362,7 @@ public function __createDDL(): string
         return implode(' ',
             array_filter(
                 [
-                    Alter::MODIFY,
+                    Alter::MODIFY->name,
                     '`' . $this->getColumnName() . '`',
                     (string)$this->parseDataType(),
                     $this->getIsBinary() ? 'BINARY' : null,

diff --git a/src/Blueprint/Alter/ForeignAdd.php b/src/Blueprint/Alter/ForeignAdd.php
@@ -222,7 +222,7 @@ public function __createDDL()
         return implode(' ',
             array_filter(
                 [
-                    Alter::ADD,
+                    Alter::ADD->name,
                     $this->getForeignName() ? "CONSTRAINT `{$this->getForeignName()}`" : null,
                     "FOREIGN KEY",
                     $this->parseLocalColumns(),
@@ -243,4 +243,4 @@ public function __toString()
     {
         return $this->__createDDL();
     }
-}
+}
diff --git a/src/Blueprint/Alter/ForeignDrop.php b/src/Blueprint/Alter/ForeignDrop.php
@@ -57,7 +57,7 @@ public function __createDDL()
         return implode(' ',
             array_filter(
                 [
-                    Alter::DROP . ' FOREIGN KEY',
+                    Alter::DROP->name . ' FOREIGN KEY',
                     '`' . $this->getForeignName() . '`',
                 ]
             )
@@ -72,4 +72,4 @@ public function __toString()
     {
         return $this->__createDDL();
     }
-}
+}
diff --git a/src/Blueprint/Alter/IndexAdd.php b/src/Blueprint/Alter/IndexAdd.php
@@ -97,15 +97,15 @@ private function parseIndexColumns()
     public function __createDDL()
     {
         $indexPrefix = [
-            IndexType::NORMAL   => 'INDEX',
-            IndexType::UNIQUE   => 'UNIQUE INDEX',
-            IndexType::PRIMARY  => 'PRIMARY KEY',
-            IndexType::FULLTEXT => 'FULLTEXT INDEX',
+            IndexType::NORMAL->value   => 'INDEX',
+            IndexType::UNIQUE->value   => 'UNIQUE INDEX',
+            IndexType::PRIMARY->value  => 'PRIMARY KEY',
+            IndexType::FULLTEXT->value => 'FULLTEXT INDEX',
         ];
         return implode(' ',
             array_filter(
                 [
-                    Alter::ADD,
+                    Alter::ADD->name,
                     $indexPrefix[$this->getIndexType()],
                     $this->getIndexName() !== null ? '`' . $this->getIndexName() . '`' : null,
                     $this->parseIndexColumns(),
@@ -114,4 +114,4 @@ public function __createDDL()
             )
         );
     }
-}
+}
diff --git a/src/Blueprint/Alter/IndexDrop.php b/src/Blueprint/Alter/IndexDrop.php
@@ -57,7 +57,7 @@ public function __createDDL()
         return implode(' ',
             array_filter(
                 [
-                    Alter::DROP . ' INDEX',
+                    Alter::DROP->name . ' INDEX',
                     '`' . $this->getIndexName() . '`',
                 ]
             )
@@ -72,4 +72,4 @@ public function __toString()
     {
         return $this->__createDDL();
     }
-}
+}