PHPORM-100 Support query on numerical field names

Author: GromNaN

src/Eloquent/Model.php

@@ -169,6 +169,8 @@ public function getAttribute($key)
             return null;
         }
 
+        $key = (string) $key;
+
         // An unset attribute is null or throw an exception.
         if (isset($this->unset[$key])) {
             return $this->throwMissingAttributeExceptionIfApplicable($key);
@@ -194,6 +196,8 @@ public function getAttribute($key)
     /** @inheritdoc */
     protected function getAttributeFromArray($key)
     {
+        $key = (string) $key;
+
         // Support keys in dot notation.
         if (str_contains($key, '.')) {
             return Arr::get($this->attributes, $key);
@@ -212,6 +216,8 @@ public function setAttribute($key, $value)
             $value = $builder->convertKey($value);
         }
 
+        $key = (string) $key;
+
         // Support keys in dot notation.
         if (str_contains($key, '.')) {
             // Store to a temporary key, then move data to the actual key
@@ -314,6 +320,8 @@ public function originalIsEquivalent($key)
     /** @inheritdoc */
     public function offsetUnset($offset): void
     {
+        $offset = (string) $offset;
+
         if (str_contains($offset, '.')) {
             // Update the field in the subdocument
             Arr::forget($this->attributes, $offset);

src/Query/Builder.php

@@ -23,13 +23,11 @@
 use MongoDB\BSON\UTCDateTime;
 use MongoDB\Driver\Cursor;
 use RuntimeException;
-use Stringable;
 
 use function array_fill_keys;
 use function array_is_list;
 use function array_key_exists;
 use function array_merge;
-use function array_merge_recursive;
 use function array_values;
 use function array_walk_recursive;
 use function assert;
@@ -47,6 +45,7 @@
 use function in_array;
 use function is_array;
 use function is_int;
+use function is_scalar;
 use function is_string;
 use function md5;
 use function preg_match;
@@ -60,6 +59,7 @@
 use function strlen;
 use function strtolower;
 use function substr;
+use function var_export;
 
 class Builder extends BaseBuilder
 {
@@ -660,7 +660,7 @@ public function update(array $values, array $options = [])
     {
         // Use $set as default operator for field names that are not in an operator
         foreach ($values as $key => $value) {
-            if (str_starts_with($key, '$')) {
+            if (is_string($key) && str_starts_with($key, '$')) {
                 continue;
             }
 
@@ -961,8 +961,8 @@ public function where($column, $operator = null, $value = null, $boolean = 'and'
             }
         }
 
-        if (func_num_args() === 1 && is_string($column)) {
-            throw new ArgumentCountError(sprintf('Too few arguments to function %s("%s"), 1 passed and at least 2 expected when the 1st is a string.', __METHOD__, $column));
+        if (func_num_args() === 1 && is_scalar($column)) {
+            throw new ArgumentCountError(sprintf('Too few arguments to function %s(%s), 1 passed and at least 2 expected when the 1st is a scalar.', __METHOD__, var_export($column, true)));
         }
 
         return parent::where(...$params);
@@ -993,7 +993,7 @@ protected function compileWheres(): array
             }
 
             // Convert column name to string to use as array key
-            if (isset($where['column']) && $where['column'] instanceof Stringable) {
+            if (isset($where['column'])) {
                 $where['column'] = (string) $where['column'];
             }
 
@@ -1071,7 +1071,14 @@ protected function compileWheres(): array
             }
 
             // Merge the compiled where with the others.
-            $compiled = array_merge_recursive($compiled, $result);
+            // array_merge_recursive can't be used here because it converts int keys to sequential int.
+            foreach ($result as $key => $value) {
+                if (in_array($key, ['$and', '$or', '$nor'])) {
+                    $compiled[$key] = array_merge($compiled[$key] ?? [], $value);
+                } else {
+                    $compiled[$key] = $value;
+                }
+            }
         }
 
         return $compiled;

tests/ModelTest.php

@@ -957,4 +957,20 @@ public function testEnumCast(): void
         $this->assertSame(MemberStatus::Member->value, $check->getRawOriginal('member_status'));
         $this->assertSame(MemberStatus::Member, $check->member_status);
     }
+
+    public function testNumericFieldName(): void
+    {
+        $user      = new User();
+        $user->{1} = 'one';
+        $user->{2} = ['2' => 'two.two'];
+        $user->save();
+
+        $found = User::where(1, 'one')->first();
+        $this->assertInstanceOf(User::class, $found);
+        $this->assertEquals('one', $found[1]);
+
+        $found = User::where('2.2', 'two.two')->first();
+        $this->assertInstanceOf(User::class, $found);
+        $this->assertEquals([2 => 'two.two'], $found[2]);
+    }
 }

tests/Query/BuilderTest.php

@@ -90,6 +90,11 @@ public static function provideQueryBuilderToMql(): iterable
             fn (Builder $builder) => $builder->where('foo', 'bar'),
         ];
 
+        yield 'find with numeric field name' => [
+            ['find' => [['123' => 'bar'], []]],
+            fn (Builder $builder) => $builder->where(123, 'bar'),
+        ];
+
         yield 'where with single array of conditions' => [
             [
                 'find' => [
@@ -1175,10 +1180,16 @@ public static function provideExceptions(): iterable
 
         yield 'find with single string argument' => [
             ArgumentCountError::class,
-            'Too few arguments to function MongoDB\Laravel\Query\Builder::where("foo"), 1 passed and at least 2 expected when the 1st is a string',
+            'Too few arguments to function MongoDB\Laravel\Query\Builder::where(\'foo\'), 1 passed and at least 2 expected when the 1st is a scalar',
             fn (Builder $builder) => $builder->where('foo'),
         ];
 
+        yield 'find with single numeric argument' => [
+            ArgumentCountError::class,
+            'Too few arguments to function MongoDB\Laravel\Query\Builder::where(123), 1 passed and at least 2 expected when the 1st is a scalar',
+            fn (Builder $builder) => $builder->where(123),
+        ];
+
         yield 'where regex not starting with /' => [
             LogicException::class,
             'Missing expected starting delimiter in regular expression "^ac/me$", supported delimiters are: / # ~',