Explicit strategy on Multi::fromEmbedded()

CHANGELOG.md

@@ -33,6 +33,7 @@
 - Add `fromInteger()` and `tryFromInteger()` on the new `Contracts\Factory4Interface` (IPv4 and Multi).
 - Arbitrary-precision `fromIntegerString()` and `tryFromIntegerString()` on all classes.
 - Fix: `Multi::fromProtocol()` now rejects a binary string of the wrong length instead of passing it through.
+- Fix: `Multi::fromEmbedded()` now keeps the strategy it is given instead of falling back to the default.
 
 ### Output
 

docs/04-helpers.md

@@ -228,6 +228,7 @@ an IPv6 address.
 
 ```php
 <?php
+use Darsyn\IP\Strategy\Derived;
 use Darsyn\IP\Strategy\Mapped;
 use Darsyn\IP\Version\IPv6;
 use Darsyn\IP\Version\Multi;

src/Version/Multi.php

@@ -207,6 +207,16 @@ public static function isValid(string $ip, ?EmbeddingStrategyInterface $strategy
         return null !== static::tryFromProtocol($ip, $strategy);
     }
 
+    /**
+     * @throws \Darsyn\IP\Exception\InvalidIpAddressException
+     * @throws \Darsyn\IP\Exception\WrongVersionException
+     * @return static
+     */
+    public static function fromEmbedded(string $ip, ?EmbeddingStrategyInterface $strategy = null)
+    {
+        return static::tryFromProtocol($ip, $strategy) ?? static::fromBinary($ip, $strategy);
+    }
+
     protected function __construct(string $ip, ?EmbeddingStrategyInterface $strategy = null)
     {
         // Fallback to default in case this instance was created from static in

tests/Version/MultiTest.php

@@ -928,6 +928,15 @@ public function testFromBinaryUsesExplicitStrategy(): void
         $this->assertSame('2002:0c22:384e:0000:0000:0000:0000:0000', $ip->toExpandedAddress());
     }
 
+    /** @test */
+    #[PHPUnit\Test]
+    public function testFromEmbeddedUsesExplicitStrategy(): void
+    {
+        $ip = IP::fromEmbedded('127.0.0.1', new Strategy\Derived());
+        $this->assertSame('2002:7f00:1::', $ip->toCompactedAddress());
+        $this->assertSame('127.0.0.1', $ip->toDotAddress());
+    }
+
     /**
      * @test
      * @dataProvider \Darsyn\IP\Tests\DataProvider\Multi::getValidBinarySequences()