Remove ext-ctype from require section of composer.json (#936)

Tigrov · web-flow · commit 10451b5a0582 · 2025-03-14T16:15:02.000+07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -65,7 +65,8 @@
 - Bug #933: Explicitly mark nullable parameters (@vjik)
 - Chg #911: Change supported PHP versions to `8.1 - 8.4` (@Tigrov)
 - Enh #911: Minor refactoring (@Tigrov)
-- Chg #938: Remove `ext-json` from `require` section of `composer.json` (@Tigrov) 
+- Chg #938, #936: Remove `ext-json`, `ext-ctype` from `require` section of `composer.json` (@Tigrov) 
+- Chg #936: Remove `hasLimit()` and `hasOffset()` methods from `AbstractDQLQueryBuilder` class (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -142,6 +142,8 @@ Each table column has its own class in the `Yiisoft\Db\Schema\Column` namespace
 - `DbArrayHelper::getColumn()` - use `array_column()` instead;
 - `DbArrayHelper::getValueByPath()`;
 - `DbArrayHelper::populate()` - use `DbArrayHelper::index()` instead;
+- `AbstractDQLQueryBuilder::hasLimit()` - use `$limit !== null` instead;
+- `AbstractDQLQueryBuilder::hasOffset()` - use `!empty($offset)` instead;
 
 ### Remove deprecated parameters
 
diff --git a/composer.json b/composer.json
@@ -31,7 +31,6 @@
     ],
     "require": {
         "php": "8.1 - 8.4",
-        "ext-ctype": "*",
         "ext-mbstring": "*",
         "ext-pdo": "*",
         "psr/log": "^2.0|^3.0",
diff --git a/src/QueryBuilder/AbstractDQLQueryBuilder.php b/src/QueryBuilder/AbstractDQLQueryBuilder.php
@@ -30,7 +30,6 @@
 use function array_filter;
 use function array_merge;
 use function array_shift;
-use function ctype_digit;
 use function implode;
 use function is_array;
 use function is_bool;
@@ -265,12 +264,14 @@ public function buildLimit(ExpressionInterface|int|null $limit, ExpressionInterf
     {
         $sql = '';
 
-        if ($this->hasLimit($limit)) {
-            $sql = 'LIMIT ' . ($limit instanceof ExpressionInterface ? $this->buildExpression($limit) : (string) $limit);
+        if ($limit !== null) {
+            $sql = 'LIMIT '
+                . ($limit instanceof ExpressionInterface ? $this->buildExpression($limit) : (string) $limit);
         }
 
-        if ($this->hasOffset($offset)) {
-            $sql .= ' OFFSET ' . ($offset instanceof ExpressionInterface ? $this->buildExpression($offset) : (string) $offset);
+        if (!empty($offset)) {
+            $sql .= ' OFFSET '
+                . ($offset instanceof ExpressionInterface ? $this->buildExpression($offset) : (string) $offset);
         }
 
         return ltrim($sql);
@@ -552,30 +553,6 @@ protected function extractAlias(string $table): array|bool
         return false;
     }
 
-    /**
-     * Checks to see if the given limit is effective.
-     *
-     * @param mixed $limit The given limit.
-     *
-     * @return bool Whether the limit is effective.
-     */
-    protected function hasLimit(mixed $limit): bool
-    {
-        return ($limit instanceof ExpressionInterface) || ctype_digit((string) $limit);
-    }
-
-    /**
-     * Checks to see if the given offset is effective.
-     *
-     * @param mixed $offset The given offset.
-     *
-     * @return bool Whether the offset is effective.
-     */
-    protected function hasOffset(mixed $offset): bool
-    {
-        return ($offset instanceof ExpressionInterface) || (ctype_digit((string)$offset) && (string)$offset !== '0');
-    }
-
     /**
      * @throws Exception
      * @throws InvalidConfigException
