Merge pull request #14 from szepeviktor/further-impr

Further optimize the code

Author: mnavarrocarter

src/Headers.php

@@ -27,7 +27,7 @@ class Headers
     public static function fromLines(array &$lines): Headers
     {
         $headers = new self();
-        while (count($lines) !== 0) {
+        while ($lines !== []) {
             $line = array_shift($lines);
             if (strpos($line, 'HTTP') === 0) {
                 array_unshift($lines, $line); // Put the line back
@@ -63,60 +63,49 @@ public function __construct()
 
     protected function put(string $name, string $value): void
     {
-        $name = strtolower($name);
-        $this->headers[$name] = $value;
+        $this->headers[strtolower($name)] = $value;
     }
 
     /**
      * Returns a header.
      */
     public function get(string $name): string
     {
-        $name = strtolower($name);
-
-        return $this->headers[$name] ?? '';
+        return $this->headers[strtolower($name)] ?? '';
     }
 
     public function contains(string $name, string $substring): bool
     {
-        $name = strtolower($name);
-
-        return strpos($this->get($name), $substring) !== false;
+        return strpos($this->get(strtolower($name)), $substring) !== false;
     }
 
     public function has(string $name): bool
     {
-        $name = strtolower($name);
-
-        return array_key_exists($name, $this->headers);
+        return array_key_exists(strtolower($name), $this->headers);
     }
 
     /**
      * @return list<string>
      */
     public function map(callable $callable): array
     {
-        $arr = [];
-        foreach ($this->headers as $name => $value) {
-            $arr[] = $callable($value, $name);
-        }
-
-        return $arr;
+        return array_map(
+            fn (string $name, string $value) => $callable($value, $name),
+            array_keys($this->headers),
+            $this->headers
+        );
     }
 
     /**
      * @return array<string, string>
      */
     public function filter(callable $callable): array
     {
-        $arr = [];
-        foreach ($this->headers as $name => $value) {
-            if ($callable($value, $name) === true) {
-                $arr[$name] = $value;
-            }
-        }
-
-        return $arr;
+        return array_filter(
+            $this->headers,
+            fn (string $value, string $name) => $callable($value, $name),
+            ARRAY_FILTER_USE_BOTH
+        );
     }
 
     /**

src/functions.php

@@ -17,27 +17,22 @@
 /**
  * Fetches a url.
  *
+ * @param array<string, mixed> $options
+ *
  * @throws ProtocolError when the server responds with an error
  * @throws SocketError   when a connection cannot be established
  */
 function fetch(string $url, array $options = []): Response
 {
-    $method = $options['method'] ?? 'GET';
-    $headers = $options['headers'] ?? [];
-    $body = $options['body'] ?? null;
-    $followRedirects = $options['follow_redirects'] ?? true;
-    $maxRedirects = $options['max_redirects'] ?? 20;
-    $protocolVersion = $options['protocol_version'] ?? '1.1';
-
     $context = [
         'http' => [
-            'method' => $method,
-            'header' => Headers::fromMap($headers)->toArray(),
-            'contents' => $body,
+            'method' => $options['method'] ?? 'GET',
+            'header' => Headers::fromMap($options['headers'] ?? [])->toArray(),
+            'contents' => $options['body'] ?? null,
             'ignore_errors' => true,
-            'follow_location' => $followRedirects ? 1 : 0,
-            'max_redirects' => $maxRedirects,
-            'protocol_version' => (float) $protocolVersion,
+            'follow_location' => ($options['follow_redirects'] ?? true) ? 1 : 0,
+            'max_redirects' => $options['max_redirects'] ?? 20,
+            'protocol_version' => (float) ($options['protocol_version'] ?? '1.1'),
         ],
     ];
 
@@ -49,17 +44,16 @@ function fetch(string $url, array $options = []): Response
 
     // We extract relevant stream meta data
     $meta = stream_get_meta_data($resource);
-    $rawHeaders = $meta['wrapper_data'];
 
     // We create objects out of that data.
-    $partials = HttpPartialResponse::parseLines($rawHeaders);
+    $partials = HttpPartialResponse::parseLines($meta['wrapper_data']);
+    /** @var HttpPartialResponse $mainPartial */
     $mainPartial = array_pop($partials);
-    $body = new ResourceReader($resource);
-    $response = new HttpResponse($mainPartial, $body);
+    $response = new HttpResponse($mainPartial, new ResourceReader($resource));
 
     // If there are still partials, we are dealing with a redirect here.
     // We decorate the response on previous request.
-    if (count($partials) > 0) {
+    if ($partials !== []) {
         $response = new RedirectedHttpResponse($response, ...$partials);
     }