refactor(builder): refactor from zephir.

noone-silent · Jul 30, 2024 · 7f37bbf · 7f37bbf
1 parent 81e5a0a
commit 7f37bbf
Show file tree

Hide file tree

Showing 14 changed files with 321 additions and 457 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/docker/8.3/.bashrc b/docker/8.3/.bashrc
diff --git a/docker/8.3/Dockerfile b/docker/8.3/Dockerfile
diff --git a/docker/8.3/extra.ini b/docker/8.3/extra.ini
diff --git a/resources/docker/8.1/Dockerfile b/resources/docker/8.1/Dockerfile
@@ -20,7 +20,7 @@ RUN set -eux && \
 
 # Update
 RUN apt update -y && \
-    apt install -y \
+    apt install -y --no-install-recommends \
         apt-utils \
         gettext \
         git \
@@ -105,4 +105,6 @@ COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 # Bash script with helper aliases
 COPY ./.bashrc /root/.bashrc
 
+USER $MY_USER
+
 CMD ["php-fpm"]
diff --git a/resources/docker/8.2/Dockerfile b/resources/docker/8.2/Dockerfile
@@ -20,7 +20,7 @@ RUN set -eux && \
 
 # Update
 RUN apt update -y && \
-    apt install -y \
+    apt install -y --no-install-recommends \
         apt-utils \
         gettext \
         git \
@@ -105,4 +105,6 @@ COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 # Bash script with helper aliases
 COPY ./.bashrc /root/.bashrc
 
+USER $MY_USER
+
 CMD ["php-fpm"]
diff --git a/resources/docker/8.3/Dockerfile b/resources/docker/8.3/Dockerfile
@@ -20,7 +20,7 @@ RUN set -eux && \
 
 # Update
 RUN apt update -y && \
-    apt install -y \
+    apt install -y --no-install-recommends \
         apt-utils \
         gettext \
         git \
@@ -105,4 +105,6 @@ COPY --from=composer /usr/bin/composer /usr/local/bin/composer
 # Bash script with helper aliases
 COPY ./.bashrc /root/.bashrc
 
+USER $MY_USER
+
 CMD ["php-fpm"]
diff --git a/src/Mvc/Model.php b/src/Mvc/Model.php
@@ -6315,6 +6315,19 @@ private static function getPreparedQuery(
             $builder->limit($params['limit'], $params['offset'] ?? null);
         }
 
+        if (isset($params['columns']) && (is_array($params['columns']) || is_string($params['columns']))) {
+            $builder->columns($params['columns']);
+        }
+
+        if (isset($params['group']) && (is_array($params['group']) || is_string($params['group']))) {
+            $builder->groupBy($params['group']);
+        }
+
+        if (isset($params['order']) && (is_array($params['order']) || is_string($params['order']))) {
+            $builder->orderBy($params['order']);
+        }
+
+
         $query = $builder->getQuery();
 
         /**

diff --git a/src/Mvc/Model/Criteria.php b/src/Mvc/Model/Criteria.php
@@ -282,7 +282,7 @@ public function createBuilder(): BuilderInterface
          */
         $builder = $manager->createBuilder($this->params);
 
-        $builder->from($this->model);
+        $builder->from((string)$this->model);
 
         return $builder;
     }