test EmptyStream and UriResolver

Author: KurtThiemann

src/Psr18/UriResolver/UriResolver.php

@@ -9,11 +9,9 @@ class UriResolver implements UriResolverInterface
 {
     /**
      * @param UriFactoryInterface $uriFactory
-     * @param bool $strict
      */
     public function __construct(
-        protected UriFactoryInterface $uriFactory,
-        protected bool $strict = true
+        protected UriFactoryInterface $uriFactory
     )
     {
     }
@@ -23,10 +21,6 @@ public function __construct(
      */
     public function resolve(UriInterface $baseUri, UriInterface $relativeUri): UriInterface
     {
-        if (!$this->strict && $relativeUri->getScheme() === $baseUri->getScheme()) {
-            $relativeUri = $relativeUri->withScheme("");
-        }
-
         if ($relativeUri->getScheme() !== "") {
             return $relativeUri;
         }

src/Psr7/Stream/StreamMetaDataTrait.php

@@ -4,6 +4,23 @@
 
 trait StreamMetaDataTrait
 {
+    /**
+     * @return string|null
+     */
+    protected function approximateMode(): ?string
+    {
+        if ($this->isReadable() && $this->isWritable()) {
+            return "r+";
+        }
+        if ($this->isReadable()) {
+            return "r";
+        }
+        if ($this->isWritable()) {
+            return "w";
+        }
+        return null;
+    }
+
     /**
      * @inheritDoc
      */

src/Psr7/Stream/StringStream.php

@@ -164,21 +164,4 @@ public function getContents(): string
         }
         return substr($this->data, $this->position);
     }
-
-    /**
-     * @return string|null
-     */
-    protected function approximateMode(): ?string
-    {
-        if ($this->isReadable() && $this->isWritable()) {
-            return "r+";
-        }
-        if ($this->isReadable()) {
-            return "r";
-        }
-        if ($this->isWritable()) {
-            return "w";
-        }
-        return null;
-    }
 }

tests/StreamTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests;
 
+use Aternos\CurlPsr\Psr7\Stream\EmptyStream;
 use Aternos\CurlPsr\Psr7\Stream\Stream;
 use PHPUnit\Framework\TestCase;
 use ReflectionObject;
@@ -254,4 +255,29 @@ public function testStatFails(): void
 
         $this->assertNull($stream->getSize());
     }
+
+    public function testEmptyStream(): void
+    {
+        $stream = new EmptyStream();
+        $this->assertEquals("", (string)$stream);
+        $this->assertNull($stream->detach());
+        $this->assertEquals(0, $stream->getSize());
+        $this->assertEquals(0, $stream->tell());
+        $this->assertTrue($stream->eof());
+        $this->assertTrue($stream->isSeekable());
+        $this->assertTrue($stream->isReadable());
+        $this->assertFalse($stream->isWritable());
+        $this->assertIsArray($stream->getMetadata());
+        $this->assertEquals(0, $stream->getMetadata("unread_bytes"));
+        $this->assertEquals("", $stream->read(10));
+        $this->assertEquals("", $stream->getContents());
+
+        // Do nothing
+        $stream->seek(2);
+        $stream->rewind();
+        $stream->close();
+
+        $this->expectException(RuntimeException::class);
+        $stream->write("test");
+    }
 }

tests/UriResolverTest.php

@@ -36,11 +36,12 @@ class UriResolverTest extends TestCase
     #[TestWith(["../../g", "http://a/g"])]
     #[TestWith(["../../../g", "http://a/g"])]
     #[TestWith(["../../../../g", "http://a/g"])]
-    public function testRelativeResolution(string $relativeUri, string $expectedUri)
+    #[TestWith(["abc", "http://a/abc", "http://a"])]
+    public function testRelativeResolution(string $relativeUri, string $expectedUri, string $baseUriString = self::BASE_URI): void
     {
         $factory = new Psr17Factory();
         $resolver = new UriResolver($factory);
-        $baseUri = $factory->createUri(self::BASE_URI);
+        $baseUri = $factory->createUri($baseUriString);
         $relativeUri = $factory->createUri($relativeUri);
         $resolvedUri = $resolver->resolve($baseUri, $relativeUri);
         $this->assertEquals($expectedUri, (string)$resolvedUri);