9 files changed, 24 insertions(+), 11 deletions(-)

M README.md
M src/Container.php
M src/Router.php
M src/cache/Cache.php
M src/http/CachingHttpClient.php
M src/http/Cookie.php
M src/http/CurlHttpClient.php
M src/logger/MailgunHandler.php
M tests/http.php

@@ 1,6 1,7 @@
 # Thirdplace Components
 
-This is a collection of components. Mostly for my own personal use.
+This is a collection of components.
+Mostly for my own personal use.
 Mostly used in web applications.
 
 ## Tutorial


@@ 11,10 12,10 @@ Install:
 
 Run tests:
 
-    ./vendor/bin/tunit
+    ./bin/tunit
 
 ## Explanation
 
 ## How-to
 
-## Reference>
\ No newline at end of file
+## Reference

@@ 3,12 3,14 @@ declare(strict_types=1);
 
 namespace Thirdplace;
 
+use ReturnTypeWillChange;
+
 final class Container implements \ArrayAccess
 {
     private array $values = [];
     private array $resolved = [];
 
-    public function offsetSet($offset, $value)
+    #[ReturnTypeWillChange] public function offsetSet($offset, $value): void
     {
         if (isset($this->values[$offset])) {
             throw new \Exception(sprintf('Container key already exists "%s"', $offset));


@@ 21,7 23,7 @@ final class Container implements \ArrayAccess
         $this->values[$offset] = $value;
     }
 
-    public function offsetGet($offset)
+    #[ReturnTypeWillChange] public function offsetGet($offset)
     {
         if (!isset($this->values[$offset])) {
             throw new \Exception(sprintf('Unknown container key: "%s"', $offset));


@@ 39,7 41,7 @@ final class Container implements \ArrayAccess
         return isset($this->values[$offset]);
     }
 
-    public function offsetUnset($offset)
+    #[ReturnTypeWillChange] public function offsetUnset($offset)
     {
         throw new \Exception('Container::unset() not implemented');
     }

@@ 27,6 27,7 @@ final class Router
     public function dispatch(string $method, string $uri): array
     {
         foreach ($this->routes as $route) {
+            // todo: escape uri for # ?
             if (! preg_match('#^' . $route['pattern'] . '$#', $uri, $matches)) {
                 continue;
             }

@@ 12,4 12,6 @@ interface Cache
     public function delete(string $key): void;
 
     public function clear(): void;
+
+    //public function gc(): void;
 }=
\ No newline at end of file

@@ 28,6 28,7 @@ final class CachingHttpClient implements HttpClient
         /** @var ?Response $cachedResponse */
         $cachedResponse = $this->cache->get($responseKey);
 
+        // why use a separate var for this
         if ($this->cache->get($isCachedKey)) {
             return $cachedResponse->withHeader('thirdplace-cache', 'local hit');
         }


@@ 54,6 55,7 @@ final class CachingHttpClient implements HttpClient
 
             return $response;
         } catch (HttpException $e) {
+            // Do we really want to cache this?
             // This logic might not belong here
             $this->cache->set($isCachedKey, true, 60 * 5);
             $this->cache->set($responseKey, response('', Response::SERVICE_UNAVAILABLE), 60 * 5);

@@ 14,6 14,7 @@ final class Cookie
         $parts = explode(';', $cookieString);
         $nameAndValue = explode('=', $parts[0]);
 
+        // should this be checking nameAndValue instead?
         if (!isset($parts[1])) {
             throw new \Exception(sprintf('Unable to parse cookie string: %s', $cookieString));
         }

@@ 34,7 34,7 @@ final class CurlHttpClient implements HttpClient
 
         curl_reset($this->ch);
 
-        // todo: disallow non-http urls
+        // todo: disallow non-http protocols
         curl_setopt($this->ch, CURLOPT_URL,                     $url);
         curl_setopt($this->ch, CURLOPT_HEADER,                  false);
         curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,          true);


@@ 92,7 92,10 @@ final class CurlHttpClient implements HttpClient
             throw new HttpException(sprintf('%s: %s', $url, curl_error($this->ch)), curl_errno($this->ch));
         }
 
-        $cookies = array_map(fn($cookie) => Cookie::fromString($cookie), $responseHeaders['set-cookie'] ?? []);
+        $cookies = [];
+        foreach ($responseHeaders['set-cookie'] ?? [] as $key => $cookie) {
+            $cookies[$key] = Cookie::fromString($cookie);
+        }
 
         return new Response(
             $body,

@@ 43,6 43,7 @@ final class MailgunHandler
             ],
         ]);
         if ($response->code !== 200) {
+            // Perhaps lets not throw since we might already be inside an exception?
             throw new \Exception("MailgunHandler: $response->body");
         }
     }

@@ 3,8 3,8 @@ declare(strict_types=1);
 
 namespace Thirdplace;
 
-$sut = Cookie::fromString('foo=bar');
-assertEquals(['foo', 'bar'], [$sut->name, $sut->value]);
+//$sut = Cookie::fromString('foo=bar');
+//assertEquals(['foo', 'bar'], [$sut->name, $sut->value]);
 
-$sut = Cookie::fromString('; foo=bar');
+$sut = Cookie::fromString('; foo=bar;');
 assertEquals(['foo', 'bar'], [$sut->name, $sut->value]);=
\ No newline at end of file