Improve types in pool interface

activecollab · Apr 24, 2022 · ec70acb · ec70acb
1 parent 21043ab
commit ec70acb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/src/Finder.php b/src/Finder.php
@@ -52,7 +52,7 @@ public function getType(): string
 
     public function getSelectSql(): string
     {
-        return $this->getSelectFieldsSql($this->pool->getEscapedTypeFields($this->type));
+        return $this->getSelectFieldsSql($this->pool->getTypeFieldsReadStatement($this->type));
     }
 
     public function getSelectIdsSql(): string
@@ -279,9 +279,13 @@ private function loadByTypeField(): bool
         return $this->load_by_type_field;
     }
 
-    private function getSelectFieldsSql(string $escaped_field_names): string
+    private function getSelectFieldsSql(string $fields_read_statement): string
     {
-        $result = "SELECT $escaped_field_names FROM " . $this->getEscapedTableName();
+        $result = sprintf(
+            'SELECT %s FROM %s',
+            $fields_read_statement,
+            $this->getEscapedTableName()
+        );
 
         if ($this->join) {
             $result .= " $this->join";

diff --git a/src/Pool.php b/src/Pool.php
@@ -300,7 +300,7 @@ public function forget(string $type, int ...$ids_to_forget): void
      *
      * @param array|string|null $conditions
      */
-    public function count(string $type, $conditions = null): int
+    public function count(string $type, mixed $conditions = null): int
     {
         $this->requireRegisteredType($type);
 
@@ -359,10 +359,7 @@ public function getDefaultFinderClass(): string
         return Finder::class;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function findBySql(string $type, string $sql, ...$arguments)
+    public function findBySql(string $type, string $sql, mixed ...$arguments): mixed
     {
         if (empty($type)) {
             throw new InvalidArgumentException('Type is required');

diff --git a/src/PoolInterface.php b/src/PoolInterface.php
@@ -36,11 +36,9 @@ public function forget(string $type, int ...$ids_to_forget): void;
     /**
      * Return number of records of the given type that match the given conditions.
      *
-     * @param  string            $type
      * @param  array|string|null $conditions
-     * @return int
      */
-    public function count(string $type, $conditions = null): int;
+    public function count(string $type, mixed $conditions = null): int;
 
     /**
      * Return true if object of the given type with the given ID exists.
@@ -62,13 +60,9 @@ public function find(string $type): FinderInterface;
     /**
      * Return result by a prepared SQL statement.
      *
-     * @param  string                                 $type
-     * @param  string                                 $sql
-     * @param  mixed                                  $arguments
      * @return ResultInterface|EntityInterface[]|null
      */
-    public function findBySql(string $type, string $sql, ...$arguments);
-
+    public function findBySql(string $type, string $sql, mixed ...$arguments): mixed;
     public function getTypeTable(string $type, bool $escaped = false): string;
 
     /**