[setup] 0 == null, but 0 !== null...

Author: shish

core/Util/PolyfillsTest.php

@@ -81,6 +81,7 @@ public function test_parse_shorthand_int(): void
     {
         self::assertEquals(null, parse_shorthand_int("foo"));
         self::assertEquals(-1, parse_shorthand_int("-1"));
+        self::assertEquals(0, parse_shorthand_int("0"));
         self::assertEquals(33554432, parse_shorthand_int("32M"));
         self::assertEquals(44441, parse_shorthand_int("43.4KB"));
         self::assertEquals(1231231231, parse_shorthand_int("1231231231"));

ext/setup/main.php

@@ -59,7 +59,7 @@ public static function postToSettings(QueryArray $post): array
                     $settings[$key] = $value;
                 } elseif ($type === "int") {
                     assert(!is_array($value));
-                    $settings[$key] = $value ? parse_shorthand_int($value) : null;
+                    $settings[$key] = $value !== null ? parse_shorthand_int($value) : null;
                 } elseif ($type === "bool") {
                     $settings[$key] = $value === "on";
                 } elseif ($type === "array") {

ext/setup/test.php

@@ -8,7 +8,7 @@ final class SetupTest extends ShimmiePHPUnitTestCase
 {
     public function testParseSettings(): void
     {
-        self::assertEquals(
+        self::assertSame(
             [
                 "mynull" => null,
                 "mystring" => "hello world!",
@@ -18,8 +18,8 @@ public function testParseSettings(): void
                 "myarray" => ["hello", "world"],
                 "emptystring" => null,
                 "emptyint" => null,
-                "emptybool" => null,
                 "emptyarray" => null,
+                "zero" => 0,
             ],
             ConfigSaveEvent::postToSettings(new QueryArray([
                 // keys in POST that don't start with _type or _config are ignored
@@ -44,10 +44,11 @@ public function testParseSettings(): void
                 "_config_emptystring" => "",
                 "_type_emptyint" => "int",
                 "_config_emptyint" => "",
-                "_type_emptybool" => "bool",
-                "_config_emptybool" => "",
                 "_type_emptyarray" => "array",
                 "_config_emptyarray" => "",
+                // "0" should not be null
+                "_type_zero" => "int",
+                "_config_zero" => "0",
             ]))
         );