Fixed hydration of the Network class with IPv6 addresses (#339)

* IPv6 the CIDR field assigned with wrong type and notation.

For IPv6 networks the netmask is integer and the CIDR field is assigned with `int` to a field with `string` constraint. The netmask in this case represents the number for allow networks.

The IPv6 address `2b03:b0c0:2:d0::102e:d001` should have the CIDR notation `2b03:b0c0:2:d0::102e:d001/64` or `2b03:b0c0:0002:00d0:0000:0000:0000:0000/64`.

I'm not 100% sure what the netmask value can be on the api die, is it always int? or can it come as string? that's why the check for int.

* Added 'networks' to droplet test fully checking build() logic.

* Refactoring the networks fix code to comply with phpstan rules.

* Tested multiple solutions, this is the nicest and most minimal one, and probably more correct since we are not manipulating values we iterate on.
* This also this resulted some cleanup on the baseline rules file.

* Cleanup

* Fixed code style

* Update CHANGELOG.md

* IPv6 netmasks are always integers

---------

Co-authored-by: alkavan <[email protected]>
Co-authored-by: Graham Campbell <[email protected]>

Author: alkavan

CHANGELOG.md

@@ -2,6 +2,11 @@ CHANGE LOG
 ==========
 
 
+## 5.0.3 (UPCOMING)
+
+* Fixed hydration of the Network class with IPv6 addresses
+
+
 ## 5.0.2 (04/03/2025)
 
 * Fixed a couple of incorrect property types

phpstan-baseline.neon

@@ -192,22 +192,10 @@ parameters:
 			count: 2
 			path: src/Entity/Droplet.php
 
-		-
-			message: '#^Cannot access property \$cidr on mixed\.$#'
-			identifier: property.nonObject
-			count: 1
-			path: src/Entity/Droplet.php
-
-		-
-			message: '#^Cannot access property \$netmask on mixed\.$#'
-			identifier: property.nonObject
-			count: 2
-			path: src/Entity/Droplet.php
-
 		-
 			message: '#^Cannot access property \$version on mixed\.$#'
 			identifier: property.nonObject
-			count: 2
+			count: 1
 			path: src/Entity/Droplet.php
 
 		-

src/Entity/Droplet.php

@@ -103,10 +103,15 @@ public function build(array $parameters): void
 
                         if (\property_exists($value, 'v6')) {
                             foreach ($value->v6 as $subValue) {
-                                $subValue->version = 6;
-                                $subValue->cidr = $subValue->netmask;
-                                $subValue->netmask = null;
-                                $this->networks[] = new Network($subValue);
+                                /** @var object{ip_address: string, netmask: int, gateway: string, type: string} $subValue */
+                                $this->networks[] = new Network((object) [
+                                    'ip_address' => $subValue->ip_address,
+                                    'netmask' => null,
+                                    'gateway' => $subValue->gateway,
+                                    'type' => $subValue->type,
+                                    'cidr' => \sprintf('%s/%d', $subValue->ip_address, $subValue->netmask),
+                                    'version' => 6,
+                                ]);
                             }
                         }
                     }

tests/DropletEntityTest.php

@@ -95,6 +95,24 @@ public function testConstructor(): void
                 'description' => 'Basic',
             ],
             'size_slug' => 's-1vcpu-1gb',
+            'networks' => (object) [
+                'v4' => [
+                    (object) [
+                        'ip_address' => '10.135.0.3',
+                        'netmask' => '255.255.0.0',
+                        'gateway' => '10.135.0.1',
+                        'type' => 'private',
+                    ],
+                ],
+                'v6' => [
+                    (object) [
+                        'ip_address' => '2001:db8:a::1234:5678',
+                        'netmask' => 64,
+                        'gateway' => '2001:db8:a::1',
+                        'type' => 'public',
+                    ],
+                ],
+            ],
             'region' => (object) [
                 'name' => 'New York 3',
                 'slug' => 'nyc3',