feat: add the missing support for null values in the network array data types

Author: martin-georgiev

src/MartinGeorgiev/Doctrine/DBAL/Types/BaseNetworkTypeArray.php

@@ -33,6 +33,10 @@ protected function transformArrayItemForPostgres(mixed $item): string
 
     public function isValidArrayItemForDatabase(mixed $item): bool
     {
+        if ($item === null) {
+            return true;
+        }
+
         if (!\is_string($item)) {
             return false;
         }
@@ -42,7 +46,7 @@ public function isValidArrayItemForDatabase(mixed $item): bool
 
     public function transformArrayItemForPHP(mixed $item): ?string
     {
-        if ($item === null) {
+        if ($item === null || $item === 'NULL') {
             return null;
         }
 

tests/Integration/MartinGeorgiev/Doctrine/DBAL/Types/CidrArrayTypeTest.php

@@ -28,7 +28,7 @@ public function can_handle_array_values(string $testName, array $arrayValue): vo
     }
 
     /**
-     * @return array<string, array{string, array<int, string>}>
+     * @return array<string, array{string, array<int, string|null>}>
      */
     public static function provideValidTransformations(): array
     {
@@ -47,6 +47,7 @@ public static function provideValidTransformations(): array
                 '2001:db8::1/128',
             ]],
             'empty cidr array' => ['empty cidr array', []],
+            'cidr array with null item' => ['cidr array with null item', ['192.168.0.0/24', null, '10.0.0.0/8']],
         ];
     }
 

tests/Integration/MartinGeorgiev/Doctrine/DBAL/Types/InetArrayTypeTest.php

@@ -28,7 +28,7 @@ public function can_handle_array_values(string $testName, array $arrayValue): vo
     }
 
     /**
-     * @return array<string, array{string, array<int, string>}>
+     * @return array<string, array{string, array<int, string|null>}>
      */
     public static function provideValidTransformations(): array
     {
@@ -46,6 +46,7 @@ public static function provideValidTransformations(): array
                 '::1',
             ]],
             'empty inet array' => ['empty inet array', []],
+            'inet array with null item' => ['inet array with null item', ['192.168.1.1', null, '10.0.0.1']],
         ];
     }
 

tests/Integration/MartinGeorgiev/Doctrine/DBAL/Types/MacaddrArrayTypeTest.php

@@ -28,7 +28,7 @@ public function can_handle_array_values(string $testName, array $arrayValue): vo
     }
 
     /**
-     * @return array<string, array{string, array<int, string>}>
+     * @return array<string, array{string, array<int, string|null>}>
      */
     public static function provideValidTransformations(): array
     {
@@ -44,6 +44,7 @@ public static function provideValidTransformations(): array
                 '0a:0b:0c:0d:0e:0f',
             ]],
             'empty macaddr array' => ['empty macaddr array', []],
+            'macaddr array with null item' => ['macaddr array with null item', ['08:00:2b:01:02:03', null, '00:11:22:33:44:55']],
         ];
     }
 

tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/CidrArrayTest.php

@@ -102,7 +102,6 @@ public static function provideInvalidDatabaseValueInputs(): array
             'empty string' => [['']],
             'whitespace only' => [[' ']],
             'malformed CIDR with spaces' => [['192.168.1.0 / 24']],
-            'valid value mixed with null array item' => [['192.168.1.0/24', null]],
             'valid value mixed with integer array item' => [['192.168.1.0/24', 123]],
             'valid value mixed with boolean array item' => [['192.168.1.0/24', true]],
             'valid value mixed with object array item' => [['192.168.1.0/24', new \stdClass()]],
@@ -168,6 +167,7 @@ public static function provideValidArrayItemsForDatabase(): array
             'IPv6 CIDR' => ['2001:db8::/32'],
             'IPv4 host CIDR' => ['10.0.0.1/32'],
             'IPv6 host CIDR' => ['::1/128'],
+            'null' => [null],
         ];
     }
 
@@ -187,7 +187,6 @@ public static function provideInvalidArrayItemsForDatabase(): array
             'invalid CIDR' => ['invalid-cidr'],
             'IP without netmask' => ['192.168.1.0'],
             'integer' => [123],
-            'null' => [null],
             'empty string' => [''],
             'boolean' => [true],
         ];

tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/InetArrayTest.php

@@ -194,6 +194,7 @@ public static function provideValidArrayItemsForDatabase(): array
             'IPv6 CIDR' => ['2001:db8::/32'],
             'loopback IPv4' => ['127.0.0.1'],
             'loopback IPv6' => ['::1'],
+            'null' => [null],
         ];
     }
 
@@ -213,7 +214,6 @@ public static function provideInvalidArrayItemsForDatabase(): array
             'invalid IP' => ['invalid-ip'],
             'out of range IPv4' => ['256.256.256.256'],
             'integer' => [123],
-            'null' => [null],
             'empty string' => [''],
             'boolean' => [true],
         ];

tests/Unit/MartinGeorgiev/Doctrine/DBAL/Types/MacaddrArrayTest.php

@@ -170,6 +170,7 @@ public static function provideValidArrayItemsForDatabase(): array
             'colon separated mixed case' => ['00:0c:29:Aa:Bb:CC'],
             'all zeros' => ['00:00:00:00:00:00'],
             'all ones' => ['ff:ff:ff:ff:ff:ff'],
+            'null' => [null],
         ];
     }
 
@@ -189,7 +190,6 @@ public static function provideInvalidArrayItemsForDatabase(): array
             'invalid MAC' => ['invalid-mac'],
             'too short' => ['00:11:22:33:44'],
             'integer' => [123],
-            'null' => [null],
             'empty string' => [''],
             'boolean' => [true],
         ];