Integration fixes (#101)

Author: shmax

README.md

@@ -15,7 +15,7 @@ Note that the original website, <http://www.phpactiverecord.org/>, has also fall
 
 http://php-activerecord.github.io/activerecord/
 
-and can be found in in `/docs` if you want to make any changes.
+and can be found in `/docs` if you want to make any changes.
 
 ## Installation
 

lib/Column.php

@@ -117,10 +117,16 @@ public static function castIntegerSafely($value): string|int
             return $value;
         }
 
+        // string representation of a float
+        elseif ((string) (float) $value === $value && (string) (int) $value !== $value) {
+            return (int) $value;
+        }
+
         // If adding 0 to a string causes a float conversion,
         // we have a number over PHP_INT_MAX
-        elseif (is_string($value) && 1 === bccomp($value, (string) PHP_INT_MAX)) {
-            return $value;
+        // @phpstan-ignore-next-line
+        elseif (is_string($value) && is_float($value + 0)) {
+            return (string) $value;
         }
 
         // If a float was passed and is greater than PHP_INT_MAX

lib/Config.php

@@ -38,7 +38,7 @@ class Config extends Singleton
      * });
      * ```
      *
-     * This is a singleton class so you can retrieve the {@link Singleton} instance by doing:
+     * This is a singleton class, so you can retrieve the {@link Singleton} instance by doing:
      *
      * ```
      * $config = ActiveRecord\Config::instance();
@@ -59,7 +59,7 @@ class Config extends Singleton
     private bool $logging = false;
 
     /**
-     * Contains a Logger object that must impelement a log() method.
+     * Contains a Logger object that must implement a log() method.
      */
     private LoggerInterface $logger;
 
@@ -202,9 +202,9 @@ public function get_logging(): bool
     /**
      * Returns the logger
      */
-    public function get_logger(): LoggerInterface
+    public function get_logger(): LoggerInterface|null
     {
-        return $this->logger;
+        return $this->logger ?? null;
     }
 
     /**

lib/Connection.php

@@ -50,7 +50,7 @@ abstract class Connection
     /**
      * Contains a Logger object that must implement a log() method.
      */
-    private LoggerInterface $logger;
+    private LoggerInterface|null $logger;
     /**
      * The name of the protocol that is used.
      */
@@ -348,9 +348,9 @@ public function eqToken(mixed $value): string
     public function query(string $sql, array &$values = [])
     {
         if ($this->logging) {
-            $this->logger->info($sql);
+            $this->logger?->info($sql);
             if ($values) {
-                $this->logger->info(var_export($values, true));
+                $this->logger?->info(var_export($values, true));
             }
         }
 

lib/Model.php

@@ -9,7 +9,6 @@
 
 use ActiveRecord\Exception\ActiveRecordException;
 use ActiveRecord\Exception\ReadOnlyException;
-use ActiveRecord\Exception\RecordNotFound;
 use ActiveRecord\Exception\RelationshipException;
 use ActiveRecord\Exception\UndefinedPropertyException;
 use ActiveRecord\Relationship\AbstractRelationship;
@@ -1444,12 +1443,9 @@ public static function __callStatic(string $method, mixed $args): static|null
     /**
      * Enables the use of build|create for associations.
      *
-     * @param string $method Name of method
-     * @param mixed  $args   Method args
-     *
      * @return mixed An instance of a given {@link AbstractRelationship}
      */
-    public function __call($method, $args)
+    public function __call(string $method, mixed $args)
     {
         // check for build|create_association methods
         if (preg_match('/(build|create)_/', $method)) {
@@ -1736,56 +1732,11 @@ public static function last(int $limit = null): static|array|null
     }
 
     /**
-     * Find records in the database.
-     *
-     * Finding by the primary key:
-     *
-     * ```
-     * # queries for the model with id=123
-     * YourModel::find(123);
-     *
-     * # queries for model with id in(1,2,3)
-     * YourModel::find(1,2,3);
-     *
-     * # finding by pk accepts an options array
-     * YourModel::find(123, ['order' => 'name desc']);
-     * ```
-     *
-     * Finding by using a conditions array:
-     *
-     * ```
-     * YourModel::find('first', ['conditions' => ['name=?','Tito']],
-     *   'order' => 'name asc'])
-     * YourModel::find('all', ['conditions' => 'amount > 3.14159265']);
-     * YourModel::find('all', ['conditions' => ['id in(?)', [1,2,3]]]);
-     * ```
-     *
-     * Finding by using a hash:
-     *
-     * ```
-     * YourModel::find(['name' => 'Tito', 'id' => 1]);
-     * YourModel::find('first',['name' => 'Tito', 'id' => 1]);
-     * YourModel::find('all',['name' => 'Tito', 'id' => 1]);
-     * ```
-     *
-     * @throws RecordNotFound if no options are passed or finding by pk and no records matched
-     *
-     * @return Model|Model[]|null
-     *
-     * The rules for what gets returned are complex, but predictable:
+     * @see Relation::find()
      *
-     * /-------------------------------------------------------------------------------------------
-     * 	First Argument								Return Type			Example
-     * --------------------------------------------------------------------------------------------
-     *	int|string									static				User::find(3);
-     * 	array<string, int|string>					static				User::find(["name"=>"Philip"]);
-     * 	"first"										static|null			User::find("first", ["name"=>"Waldo"]);
-     * 	"last"										static|null			User::find("last", ["name"=>"William"]);
-     *  "all"										static[]			User::find("all", ["name"=>"Stephen"]
-     *  ...int|string								static[]			User::find(1, 3, 5, 8);
-     *  list<int|string>						    static[]			User::find([1,3,5,8]);
+     * @return static|array<static>
      */
-    public static function find(/* $pk */): Model|array|null
+    public static function find(/* $pk */): Model|array
     {
         return static::Relation()->find(...func_get_args());
     }

lib/PhpStan/Relation/RelationReflectionHelper.php

@@ -5,7 +5,6 @@
 use PhpParser\Node\Arg;
 use PHPStan\Analyser\Scope;
 use PHPStan\Type\ArrayType;
-use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\NullType;
@@ -14,18 +13,6 @@
 
 trait RelationReflectionHelper
 {
-    protected function isNumericArray(ConstantArrayType $args): bool
-    {
-        $keys = $args->getKeyTypes();
-        foreach ($keys as $key) {
-            if (!($key instanceof IntegerType)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
     /**
      * @return string[]
      */
@@ -55,8 +42,7 @@ protected function computeTypeFromArgs(string $name, array $args, Type $modelTyp
                 $nullable = false;
 
                 if (1 == $numArgs) {
-                    if (!($args[0] instanceof ConstantArrayType)
-                        || (!$this->isNumericArray($args[0]))) {
+                    if (!$args[0]->isArray()->yes()) {
                         $single = true;
                     }
                 } elseif ($numArgs > 1) {

lib/Relation.php

@@ -177,7 +177,8 @@ public function __call(string $method, mixed $args): Model|null
                 return $this->className::create(SQLBuilder::create_hash_from_underscored_string(
                     $attributes,
                     $args,
-                    $this->alias_attribute));
+                    $this->alias_attribute
+                ));
             }
 
             return null;
@@ -306,7 +307,7 @@ public function reselect(): Relation
      *
      * @param string|array<string> $joins
      *
-     * @returns Relation<TModel>
+     * @return Relation<TModel>
      */
     public function joins(string|array $joins): Relation
     {

test/helpers/config.php

@@ -23,10 +23,10 @@
 
 require_once __DIR__ . '/../../ActiveRecord.php';
 
-// whether or not to run the slow non-crucial tests
+// whether to run the slow non-crucial tests
 $GLOBALS['slow_tests'] = false;
 
-// whether or not to show warnings when Log or Memcache is missing
+// whether to show warnings when Log or Memcache is missing
 $GLOBALS['show_warnings'] = true;
 
 if ('false' !== getenv('LOG')) {

test/phpstan/RelationFIndDynamicReturn.php renamed to test/phpstan/RelationFindDynamicReturn.php

@@ -24,7 +24,20 @@ class RelationFindDynamicReturn
 
     public function __construct()
     {
+        /**
+         * @var non-empty-array<int>
+         */
+        $ids = [];
+
         $this->book = Book::All()->find(1);
         $this->books = Book::All()->find([1, 2]);
+        $this->books = Book::All()->find($ids);
+
+        $books = Book::find($ids);
+        $this->books = $books;
+
+        $mixed = 1;
+        $books = Book::find($mixed);
+        $this->book = $books;
     }
 }