Replace content handlers with events (#37)

* Replace content handlers with events

* Final

* Remove namespace registration

* Don't replace titles

Author: thewilkybarkid

README.md

@@ -16,11 +16,9 @@ To run a website reading from two content services (`blog-articles` and `scholar
     content_page:
         pages:
             blog_article:
-                handler: 'libero'
                 path: '/blog/{id}'
                 service: 'blog-articles'
             scholarly_article:
-                handler: 'libero'
                 path: '/articles/{id}'
                 service: 'scholarly-articles'
     ```

composer.lock

@@ -1,10 +1,8 @@
 content_page:
     pages:
         blog_article:
-            handler: 'libero'
             path: '/blog/{id}'
             service: 'blog-articles'
         scholarly_article:
-            handler: 'jats'
             path: '/articles/{id}'
             service: 'scholarly-articles'

config/packages/dev/content_page.yaml

@@ -1,10 +1,8 @@
 content_page:
     pages:
         blog_article:
-            handler: 'libero'
             path: '/blog/{id}'
             service: 'blog-articles'
         scholarly_article:
-            handler: 'libero'
             path: '/articles/{id}'
             service: 'scholarly-articles'

config/packages/test/content_page.yaml

@@ -1,8 +1,10 @@
 parameters:
     ignoreErrors:
+        - '~^Access to an undefined property FluentDOM\\DOM\\Xpath::\$registerNodeNamespaces\.$~'
         - '~^Call to an undefined method FluentDOM\\DOM\\Node\\.+?::getNodePath\(\)\.$~'
         - '~^Cannot cast FluentDOM\\DOM\\Node\\.+? to string\.$~'
         - '~^Cannot call method ([a-z]+)Node\(\) on Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface\|null\.$~'
+        - '~^Method [^\s]+? should return FluentDOM\\DOM\\Element but returns DOMElement\.$~'
         - '~^Service "csa_guzzle\.mock\.storage" is not registered in the container\.$~'
     level: max
     paths:

phpstan.neon.dist

@@ -6,7 +6,7 @@
 
     <meta charset="utf-8">
 
-    <title>{{ include('@LiberoPatterns/text.html.twig', {nodes: title})|striptags }}</title>
+    <title>{{ title }}</title>
 
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 

templates/page.html.twig

@@ -21,6 +21,7 @@
         "punic/punic": "^3.3",
         "symfony/config": "^4.1",
         "symfony/dependency-injection": "^4.1",
+        "symfony/event-dispatcher": "^4.1",
         "symfony/http-foundation": "^4.1",
         "symfony/http-kernel": "^4.1",
         "symfony/routing": "^4.1",

vendor-extra/ContentPageBundle/composer.json

@@ -4,14 +4,8 @@
 
 namespace Libero\ContentPageBundle;
 
-use Libero\ContentPageBundle\DependencyInjection\Compiler\ContentHandlerPass;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 final class ContentPageBundle extends Bundle
 {
-    public function build(ContainerBuilder $container) : void
-    {
-        $container->addCompilerPass(new ContentHandlerPass());
-    }
 }

vendor-extra/ContentPageBundle/src/ContentPageBundle.php

@@ -6,8 +6,9 @@
 
 use FluentDOM;
 use GuzzleHttp\ClientInterface;
-use Libero\ContentPageBundle\Handler\ContentHandler;
+use Libero\ContentPageBundle\Event\CreateContentPageEvent;
 use Psr\Http\Message\ResponseInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Twig\Environment;
@@ -16,7 +17,7 @@
 final class ContentController
 {
     private $client;
-    private $contentHandler;
+    private $dispatcher;
     private $service;
     private $template;
     private $twig;
@@ -26,13 +27,13 @@ public function __construct(
         string $service,
         Environment $twig,
         string $template,
-        ContentHandler $contentHandler
+        EventDispatcherInterface $dispatcher
     ) {
         $this->client = $client;
         $this->service = $service;
         $this->twig = $twig;
         $this->template = $template;
-        $this->contentHandler = $contentHandler;
+        $this->dispatcher = $dispatcher;
     }
 
     public function __invoke(Request $request, string $id) : Response
@@ -48,17 +49,20 @@ public function __invoke(Request $request, string $id) : Response
             )
             ->then(
                 function (ResponseInterface $response) use ($request) : Response {
-                    $dom = FluentDOM::load((string) $response->getBody());
+                    $document = FluentDOM::load((string) $response->getBody());
 
                     $context = [
                         'lang' => $request->getLocale(),
                         'dir' => text_direction($request->getLocale()),
                     ];
 
+                    $event = new CreateContentPageEvent($document, $context);
+                    $this->dispatcher->dispatch($event::NAME, $event);
+
                     return new Response(
                         $this->twig->render(
                             $this->template,
-                            $this->contentHandler->handle($dom->documentElement, $context)
+                            $event->getContext() + ['title' => $event->getTitle(), 'content' => $event->getContent()]
                         )
                     );
                 }