Review (parts 2). Without folder QueryBuilder (#514)

darkdef · web-flow · commit 1a89c2fa3c2d · 2023-02-13T21:58:21.000+03:00
diff --git a/src/Query/Query.php b/src/Query/Query.php
@@ -67,17 +67,18 @@ class Query implements QueryInterface
     protected array $groupBy = [];
     protected array|ExpressionInterface|string|null $having = null;
     protected array $join = [];
-    private array $orderBy = [];
+    protected array $orderBy = [];
     protected array $params = [];
     protected array $union = [];
     protected array $withQueries = [];
+    protected Closure|string|null $indexBy = null;
+    protected ExpressionInterface|int|null $limit = null;
+    protected ExpressionInterface|int|null $offset = null;
+    protected array|string|ExpressionInterface|null $where = null;
+
     private bool $emulateExecution = false;
-    private Closure|string|null $indexBy = null;
-    private ExpressionInterface|int|null $limit = null;
-    private ExpressionInterface|int|null $offset = null;
-    private array|string|ExpressionInterface|null $where = null;
 
-    public function __construct(private ConnectionInterface $db)
+    public function __construct(protected ConnectionInterface $db)
     {
     }
 
diff --git a/src/Schema/AbstractColumnSchema.php b/src/Schema/AbstractColumnSchema.php
@@ -254,8 +254,8 @@ protected function typecast(mixed $value): mixed
 
         if (
             $value === null
-            || gettype($value) === $this->phpType
             || $value instanceof ExpressionInterface
+            || gettype($value) === $this->phpType
         ) {
             return $value;
         }
diff --git a/src/Schema/AbstractColumnSchemaBuilder.php b/src/Schema/AbstractColumnSchemaBuilder.php
@@ -176,6 +176,56 @@ public function asString(): string
         return $this->buildCompleteString($format);
     }
 
+    public function getType(): string|null
+    {
+        return $this->type;
+    }
+
+    public function getLength(): array|int|string|null
+    {
+        return $this->length;
+    }
+
+    public function isNotNull(): bool|null
+    {
+        return $this->isNotNull;
+    }
+
+    public function isUnique(): bool
+    {
+        return $this->isUnique;
+    }
+
+    public function getCheck(): string|null
+    {
+        return $this->check;
+    }
+
+    public function getDefault(): mixed
+    {
+        return $this->default;
+    }
+
+    public function getAppend(): string|null
+    {
+        return $this->append;
+    }
+
+    public function isUnsigned(): bool
+    {
+        return $this->isUnsigned;
+    }
+
+    public function getCategoryMap(): array
+    {
+        return $this->categoryMap;
+    }
+
+    public function getComment(): string|null
+    {
+        return $this->comment;
+    }
+
     /**
      * Builds the length, precision part of the column.
      *
@@ -228,7 +278,7 @@ protected function buildUniqueString(): string
      *
      * @return string|null string with default value of column.
      */
-    protected function buildDefaultValue()
+    protected function buildDefaultValue(): string|null
     {
         if ($this->default === null) {
             return $this->isNotNull === false ? 'NULL' : null;
@@ -328,54 +378,4 @@ protected function buildCompleteString(string $format): string
 
         return strtr($format, $placeholderValues);
     }
-
-    public function getType(): string|null
-    {
-        return $this->type;
-    }
-
-    public function getLength(): array|int|string|null
-    {
-        return $this->length;
-    }
-
-    public function isNotNull(): bool|null
-    {
-        return $this->isNotNull;
-    }
-
-    public function isUnique(): bool
-    {
-        return $this->isUnique;
-    }
-
-    public function getCheck(): string|null
-    {
-        return $this->check;
-    }
-
-    public function getDefault(): mixed
-    {
-        return $this->default;
-    }
-
-    public function getAppend(): string|null
-    {
-        return $this->append;
-    }
-
-    public function isUnsigned(): bool
-    {
-        return $this->isUnsigned;
-    }
-
-    public function getCategoryMap(): array
-    {
-        return $this->categoryMap;
-    }
-
-    public function getComment(): string|null
-    {
-        return $this->comment;
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -254,8 +254,8 @@ protected function typecast(mixed $value): mixed`
`254`	`254`
`255`	`255`	`if (`
`256`	`256`	`$value === null`
`257`		`- \|\| gettype($value) === $this->phpType`
`258`	`257`	`\|\| $value instanceof ExpressionInterface`
	`258`	`+ \|\| gettype($value) === $this->phpType`
`259`	`259`	`) {`
`260`	`260`	`return $value;`
`261`	`261`	`}`