improve code coverage

Art4 · Aug 29, 2023 · 57dbee7 · 57dbee7
1 parent a629fae
commit 57dbee7
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.code-coverage
 /.php-cs-fixer.cache
 /.phpunit.cache/
 /.phpunit.result.cache

diff --git a/composer.json b/composer.json
@@ -37,6 +37,7 @@
         }
     },
     "scripts": {
+        "coverage": "phpunit --coverage-html=.code-coverage",
         "phpstan": "phpstan analyze --memory-limit 512M --configuration .phpstan.neon",
         "phpunit": "phpunit"
     },

diff --git a/src/Psr/Response.php b/src/Psr/Response.php
@@ -50,11 +50,11 @@ public static function fromResponse(RequestsResponse $response)
 
         $headers = [];
 
+        /**
+         * @var string $name
+         * @var string[] $value
+         */
         foreach ($response->headers->getAll() as $name => $value) {
-            if (!is_array($value)) {
-                $value = [$value];
-            }
-
             $headers[$name] = $value;
         }
 

diff --git a/src/Psr/Uri.php b/src/Psr/Uri.php
@@ -162,21 +162,20 @@ public function getPort(): ?int
         $port = $this->iri->port;
         $scheme = $this->getScheme();
 
+        try {
+            $portFromScheme = Port::get($scheme);
+        } catch (RequestsException $th) {
+            $portFromScheme = null;
+        }
+
         if ($port === null) {
-            try {
-                return Port::get($scheme);
-            } catch (RequestsException $th) {
-                return null;
-            }
+            return $portFromScheme;
         }
 
         $port = intval($port);
 
-        try {
-            if ($port === Port::get($scheme)) {
-                return null;
-            }
-        } catch (RequestsException $th) {
+        if ($port === $portFromScheme) {
+            return null;
         }
 
         return $port;

diff --git a/tests/Psr/Response/FromResponseTest.php b/tests/Psr/Response/FromResponseTest.php
@@ -15,6 +15,7 @@ final class FromResponseTest extends TestCase
      * Tests receiving a Response instance when using fromResponse().
      *
      * @covers \Art4\Requests\Psr\Response::fromResponse
+     * @covers \Art4\Requests\Psr\Response::__construct
      *
      * @return void
      */

diff --git a/tests/Psr/Response/GetBodyTest.php b/tests/Psr/Response/GetBodyTest.php
@@ -14,7 +14,7 @@ final class GetBodyTest extends TestCase
     /**
      * Tests receiving the stream when using getBody().
      *
-     * @covers \Art4\Requests\Psr\Request::getBody
+     * @covers \Art4\Requests\Psr\Response::getBody
      *
      * @return void
      */
@@ -30,7 +30,7 @@ public function testGetBodyReturnsStreamInterface()
     /**
      * Tests receiving the stream when using getBody().
      *
-     * @covers \Art4\Requests\Psr\Request::getBody
+     * @covers \Art4\Requests\Psr\Response::getBody
      *
      * @return void
      */

diff --git a/tests/Psr/Response/GetHeadersTest.php b/tests/Psr/Response/GetHeadersTest.php
@@ -13,6 +13,7 @@ final class GetHeadersTest extends TestCase
     /**
      * Tests receiving the headers when using getHeaders().
      *
+     * @covers \Art4\Requests\Psr\Response::fromResponse
      * @covers \Art4\Requests\Psr\Response::getHeaders
      *
      * @return void
@@ -27,6 +28,7 @@ public function _testGetHeadersReturnsEmptyArray()
     /**
      * Tests receiving the headers when using getHeaders().
      *
+     * @covers \Art4\Requests\Psr\Response::fromResponse
      * @covers \Art4\Requests\Psr\Response::getHeaders
      *
      * @return void

diff --git a/tests/Psr/Response/GetProtocolVersionTest.php b/tests/Psr/Response/GetProtocolVersionTest.php
@@ -13,7 +13,8 @@ final class GetProtocolVersionTest extends TestCase
     /**
      * Tests receiving the protocol version when using getProtocolVersion().
      *
-     * @covers \Art4\Requests\Psr\Request::getProtocolVersion
+     * @covers \Art4\Requests\Psr\Response::fromResponse
+     * @covers \Art4\Requests\Psr\Response::getProtocolVersion
      *
      * @return void
      */
@@ -30,7 +31,7 @@ public function testGetProtocolVersionWithFloatReturnsString()
     /**
      * Tests receiving the protocol version when using getProtocolVersion().
      *
-     * @covers \Art4\Requests\Psr\Request::getProtocolVersion
+     * @covers \Art4\Requests\Psr\Response::getProtocolVersion
      *
      * @return void
      */

diff --git a/tests/Psr/Response/WithStatusTest.php b/tests/Psr/Response/WithStatusTest.php
@@ -67,6 +67,7 @@ public function dataInvalidTypeNotString()
      * @dataProvider dataWithStatus
      *
      * @covers \Art4\Requests\Psr\Response::withStatus
+     * @covers \Art4\Requests\Psr\Response::getReasonPhrase
      *
      * @return void
      */