From 6920ea390d020e6c68251078926a294af090a9a4 Mon Sep 17 00:00:00 2001
From: lubiana <lubiana@hannover.ccc.de>
Date: Mon, 23 May 2022 14:45:47 +0200
Subject: [PATCH] add solutions for chapter 9 and fix urltypos

---
 09-dependency-injector.md              | 10 ++++++----
 implementation/09/composer.lock        |  2 +-
 implementation/09/config/container.php | 16 ++++++++--------
 implementation/09/src/Action/Hello.php |  7 ++-----
 implementation/09/src/Bootstrap.php    |  1 -
 5 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/09-dependency-injector.md b/09-dependency-injector.md
index 14652ff..793fb06 100644
--- a/09-dependency-injector.md
+++ b/09-dependency-injector.md
@@ -16,7 +16,6 @@ we can later configure and switch our implementation.
 We need a new 'Service\Time' namespace, so lets first create the folder in our 'src' directory 'src/Service/Time'.
 There we place a Clock.php interface and a SystemClock.php implementation:
 
-
 The Clock.php interface:
 ```php
 <?php declare(strict_types=1);
@@ -29,6 +28,9 @@ interface Clock
 }
 ```
 
+The Clock interface is modelled after the [proposed clock interface psr](https://github.com/php-fig/fig-standards/blob/master/proposed/clock.md)
+which may or may not one day be accepted as an official standard.
+
 The SystemClock.php implementation:
 ```php
 <?php declare(strict_types=1);
@@ -94,7 +96,7 @@ great blogpost about that topic, which I highly recommend.
 
 Lets build our own Dependency Injector to make our application work again.
 
-As a starting point we are going to take a look at the [Container Interface])(https://www.php-fig.org/psr/psr-11/) that
+As a starting point we are going to take a look at the [Container Interface](https://www.php-fig.org/psr/psr-11/) that
 is widely adopted in the PHP-World.
 
 #### Building a dependency container
@@ -103,7 +105,7 @@ is widely adopted in the PHP-World.
 is needed for modern php development I will take a shortcut here and implement very reduced version to show you the
 basic concept.*
 
-The `Pst\Container\ContainerIterface` defines two methods:
+The `Psr\Container\ContainerIterface` defines two methods:
 
 * has($id): bool
     returns true if the container can provide a value for a given ID
@@ -209,7 +211,7 @@ when asking for the ResponseInterface and the Clock-Interface. We would need to
 was smart enough to automatically figure our which services to Inject by looking at the constructor of a class.
 
 PHP provides us with the great Reflection Api that is capable of showing us, [what arguments a constructor of any
-given class requires](https://www.php.net/manual/de/reflectionclass.getconstructor.php]. We could implement that
+given class requires](https://www.php.net/manual/de/reflectionclass.getconstructor.php). We could implement that
 functionality ourselves, or just try to use a library that takes care of that for us.
 
 You can query the composer database to find all [libraries that implement the container interface](https://packagist.org/providers/psr/container-implementation).
diff --git a/implementation/09/composer.lock b/implementation/09/composer.lock
index 386eb40..d2d0350 100644
--- a/implementation/09/composer.lock
+++ b/implementation/09/composer.lock
@@ -1462,5 +1462,5 @@
         "php": ">=8.1"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/implementation/09/config/container.php b/implementation/09/config/container.php
index ceb20dc..84e7386 100644
--- a/implementation/09/config/container.php
+++ b/implementation/09/config/container.php
@@ -1,7 +1,6 @@
 <?php declare(strict_types=1);
 
 use DI\ContainerBuilder;
-use FastRoute\Dispatcher;
 use Laminas\Diactoros\Response;
 use Laminas\Diactoros\ServerRequestFactory;
 use Lubian\NoFramework\Service\Time\Clock;
@@ -12,12 +11,13 @@ use Psr\Http\Message\ServerRequestInterface;
 use function FastRoute\simpleDispatcher;
 
 $builder = new ContainerBuilder;
-
-$builder->addDefinitions([
-    ServerRequestInterface::class => fn () => ServerRequestFactory::fromGlobals(),
-    ResponseInterface::class => fn () => new Response,
-    Dispatcher::class => fn () => simpleDispatcher(require __DIR__ . '/routes.php'),
-    Clock::class => fn () => new SystemClock,
-]);
+$builder->addDefinitions(
+    [
+        ServerRequestInterface::class => fn () => ServerRequestFactory::fromGlobals(),
+        ResponseInterface::class => fn () => new Response,
+        FastRoute\Dispatcher::class => fn () => simpleDispatcher(require __DIR__ . '/routes.php'),
+        Clock::class => fn () => new SystemClock,
+    ]
+);
 
 return $builder->build();
diff --git a/implementation/09/src/Action/Hello.php b/implementation/09/src/Action/Hello.php
index ec2e00c..012f1df 100644
--- a/implementation/09/src/Action/Hello.php
+++ b/implementation/09/src/Action/Hello.php
@@ -11,7 +11,7 @@ final class Hello implements RequestHandlerInterface
 {
     public function __construct(
         private readonly ResponseInterface $response,
-        private readonly Clock $clock
+        private readonly Clock $clock,
     ) {
     }
 
@@ -20,11 +20,8 @@ final class Hello implements RequestHandlerInterface
         $name = $request->getAttribute('name', 'Stranger');
         $body = $this->response->getBody();
 
-        $time = $this->clock->now()
-            ->format('H:i:s');
-
         $body->write('Hello ' . $name . '!<br />');
-        $body->write('The Time is: ' . $time);
+        $body->write('The time is: ' . $this->clock->now()->format('H:i:s'));
 
         return $this->response->withBody($body)
             ->withStatus(200);
diff --git a/implementation/09/src/Bootstrap.php b/implementation/09/src/Bootstrap.php
index 023c8c0..c5237b8 100644
--- a/implementation/09/src/Bootstrap.php
+++ b/implementation/09/src/Bootstrap.php
@@ -52,7 +52,6 @@ assert($request instanceof ServerRequestInterface);
 $dispatcher = $container->get(Dispatcher::class);
 assert($dispatcher instanceof Dispatcher);
 
-
 $routeInfo = $dispatcher->dispatch($request->getMethod(), $request->getUri() ->getPath(),);
 
 try {