Merge pull request #182 from getkirby/refactor/query-strict-types

Strict types for `Query` package
getkirby · Apr 25, 2023 · 90657de · 90657de
2 parents 0f48453 + decec30
commit 90657de
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 11 deletions.
diff --git a/src/Query/Argument.php b/src/Query/Argument.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kirby\Query;
 
@@ -70,6 +71,10 @@ public static function factory(string $argument): static
 
 		// numeric
 		if (is_numeric($argument) === true) {
+			if (strpos($argument, '.') === false) {
+				return new static((int)$argument);
+			}
+
 			return new static((float)$argument);
 		}
 

diff --git a/src/Query/Arguments.php b/src/Query/Arguments.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kirby\Query;
 

diff --git a/src/Query/Expression.php b/src/Query/Expression.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kirby\Query;
 

diff --git a/src/Query/Query.php b/src/Query/Query.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kirby\Query;
 

diff --git a/src/Query/Segment.php b/src/Query/Segment.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kirby\Query;
 

diff --git a/src/Query/Segments.php b/src/Query/Segments.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace Kirby\Query;
 

diff --git a/tests/Query/ArgumentTest.php b/tests/Query/ArgumentTest.php
@@ -43,7 +43,9 @@ public function testFactory()
 
 		// numbers
 		$argument = Argument::factory(' 23  ');
-		$this->assertSame(23.0, $argument->value);
+		$this->assertSame(23, $argument->value);
+		$argument = Argument::factory(' 23.3  ');
+		$this->assertSame(23.3, $argument->value);
 
 		// null
 		$argument = Argument::factory(' null ');
@@ -70,8 +72,8 @@ public function testResolve()
 		$this->assertSame(' 23 ', $argument);
 
 		// arrays
-		$argument = Argument::factory('[1, "a", 3]')->resolve();
-		$this->assertSame([1.0, 'a', 3.0], $argument);
+		$argument = Argument::factory('[1, "a", 3.3]')->resolve();
+		$this->assertSame([1, 'a', 3.3], $argument);
 
 		// nested query
 		$argument = Argument::factory('foo')->resolve(['foo' => 'bar']);

diff --git a/tests/Query/ArgumentsTest.php b/tests/Query/ArgumentsTest.php
@@ -33,19 +33,19 @@ public function testFactory()
 	 */
 	public function testResolve()
 	{
-		$arguments = Arguments::factory('1, 2, 3');
-		$this->assertSame([1.0 , 2.0, 3.0], $arguments->resolve());
+		$arguments = Arguments::factory('1, 2.3, 3');
+		$this->assertSame([1 , 2.3, 3], $arguments->resolve());
 
-		$arguments = Arguments::factory('1, 2, [3, 4]');
-		$this->assertSame([1.0 , 2.0, [3.0, 4.0]], $arguments->resolve());
+		$arguments = Arguments::factory('1, 2, [3.3, 4]');
+		$this->assertSame([1 , 2, [3.3, 4]], $arguments->resolve());
 
 		$arguments = Arguments::factory('1, 2, \'3, 4\'');
-		$this->assertSame([1.0 , 2.0, '3, 4'], $arguments->resolve());
+		$this->assertSame([1 , 2, '3, 4'], $arguments->resolve());
 
 		$arguments = Arguments::factory('1, 2, "3, 4"');
-		$this->assertSame([1.0 , 2.0, '3, 4'], $arguments->resolve());
+		$this->assertSame([1 , 2, '3, 4'], $arguments->resolve());
 
 		$arguments = Arguments::factory('1, 2, \'(3, 4)\'');
-		$this->assertSame([1.0 , 2.0, '(3, 4)'], $arguments->resolve());
+		$this->assertSame([1 , 2, '(3, 4)'], $arguments->resolve());
 	}
 }
diff --git a/tests/Query/ExpressionTest.php b/tests/Query/ExpressionTest.php
@@ -91,7 +91,7 @@ public function providerResolve(): array
 			['0 ?: "no"', 'no'],
 			['null ?? null ?? null ?? "yes"', 'yes'],
 			['"yes" ?? "no"', 'yes'],
-			['null ?? (null ?? null ?? (false ? "what" : 42)) ?? "no"', 42.0],
+			['null ?? (null ?? null ?? (false ? "what" : 42)) ?? "no"', 42],
 		];
 	}