Separate View into different implementations

phpstan.neon.dist

@@ -3,6 +3,7 @@ parameters:
         - '~^Call to an undefined method FluentDOM\\DOM\\Node\\.+?::getNodePath\(\)\.$~'
         - '~^Cannot call method (end|([a-z]+)Node)\(\) on Symfony\\Component\\Config\\Definition\\Builder\\NodeParentInterface\|null\.$~'
         - '~^Service "csa_guzzle\.mock\.storage" is not registered in the container\.$~'
+        - '~^Call to method PHPUnit\\Framework\\Assert::assert(True|False)\(\) with (true|false) will always evaluate to (true|false)\.$~'
     level: max
     paths:
         - bin/console

vendor-extra/JatsContentBundle/src/EventListener/BuildView/BoldListener.php

@@ -7,7 +7,7 @@
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\ConvertsChildren;
 use Libero\ViewsBundle\Views\OptionalTemplateListener;
-use Libero\ViewsBundle\Views\View;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\ViewConverter;
 use function Libero\ViewsBundle\array_has_key;
 
@@ -21,7 +21,7 @@ public function __construct(ViewConverter $converter)
         $this->converter = $converter;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : TemplateView
     {
         return $view->withArgument('text', $this->convertChildren($object, $view->getContext()));
     }

vendor-extra/JatsContentBundle/src/EventListener/BuildView/FrontArticleTitleContentHeaderListener.php

@@ -6,6 +6,7 @@
 
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\View;
 use Libero\ViewsBundle\Views\ViewConverter;
 use function Libero\ViewsBundle\array_has_key;
@@ -21,7 +22,7 @@ public function __construct(ViewConverter $converter)
         $this->converter = $converter;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : View
     {
         $title = $object->ownerDocument->xpath()
             ->firstOf('jats:article-meta/jats:title-group/jats:article-title', $object);

vendor-extra/JatsContentBundle/src/EventListener/BuildView/FrontArticleTypeContentMetaListener.php

@@ -7,6 +7,7 @@
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\ContextAwareTranslation;
 use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\View;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use function sprintf;
@@ -24,7 +25,7 @@ public function __construct(TranslatorInterface $translator, array $translationK
         $this->translationKeys = $translationKeys;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : View
     {
         $items = $view->getArgument('items') ?? [];
 

vendor-extra/JatsContentBundle/src/EventListener/BuildView/FrontContentHeaderMetaListener.php

@@ -7,6 +7,7 @@
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\ContextAwareTranslation;
 use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\View;
 use Libero\ViewsBundle\Views\ViewConverter;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -25,7 +26,7 @@ public function __construct(ViewConverter $converter, TranslatorInterface $trans
         $this->translator = $translator;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : View
     {
         $meta = $this->converter
             ->convert($object, '@LiberoPatterns/content-meta.html.twig', $view->getContext())

vendor-extra/JatsContentBundle/src/EventListener/BuildView/FrontDisplayChannelContentMetaListener.php

@@ -7,6 +7,7 @@
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\ContextAwareTranslation;
 use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\View;
 use Libero\ViewsBundle\Views\ViewConverter;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -28,7 +29,7 @@ public function __construct(ViewConverter $converter, TranslatorInterface $trans
         $this->translator = $translator;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : View
     {
         $items = $view->getArgument('items') ?? [];
 

vendor-extra/JatsContentBundle/src/EventListener/BuildView/FrontItemTagsListener.php

@@ -8,6 +8,7 @@
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\ConvertsLists;
 use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\View;
 use Libero\ViewsBundle\Views\ViewConverter;
 use function array_filter;
@@ -26,7 +27,7 @@ public function __construct(ViewConverter $converter)
         $this->converter = $converter;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : View
     {
         /** @var DOMNodeList<Element> $keywordGroups */
         $keywordGroups = $object->ownerDocument->xpath()
@@ -40,7 +41,7 @@ protected function handle(Element $object, View $view) : View
             array_filter(
                 array_map(
                     function (View $tagList) : array {
-                        return $tagList->getArguments();
+                        return $tagList instanceof TemplateView ? $tagList->getArguments() : [];
                     },
                     $this->convertList($keywordGroups, '@LiberoPatterns/tag-list.html.twig', $view->getContext())
                 )

vendor-extra/JatsContentBundle/src/EventListener/BuildView/FrontSubjectGroupContentHeaderListener.php

@@ -9,6 +9,7 @@
 use Libero\ViewsBundle\Views\ContextAwareTranslation;
 use Libero\ViewsBundle\Views\ConvertsLists;
 use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\View;
 use Libero\ViewsBundle\Views\ViewConverter;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -28,7 +29,7 @@ public function __construct(ViewConverter $converter, TranslatorInterface $trans
         $this->translator = $translator;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : View
     {
         /** @var DOMNodeList<Element> $subjects */
         $subjects = $object->ownerDocument->xpath()->evaluate(
@@ -50,7 +51,7 @@ protected function handle(Element $object, View $view) : View
                     ),
                 ],
                 'items' => array_map(
-                    function (View $link) : array {
+                    function (TemplateView $link) : array {
                         return ['content' => $link->getArguments()];
                     },
                     $this->convertList($subjects, '@LiberoPatterns/link.html.twig', $view->getContext())

vendor-extra/JatsContentBundle/src/EventListener/BuildView/HeadingListener.php

@@ -7,6 +7,7 @@
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\ConvertsChildren;
 use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\View;
 use Libero\ViewsBundle\Views\ViewConverter;
 use function Libero\ViewsBundle\array_has_key;
@@ -22,7 +23,7 @@ public function __construct(ViewConverter $converter)
         $this->converter = $converter;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : View
     {
         if ($view->hasContext('level')) {
             $view = $view->withArgument('level', $view->getContext('level'));

vendor-extra/JatsContentBundle/src/EventListener/BuildView/ItalicListener.php

@@ -7,7 +7,7 @@
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\ConvertsChildren;
 use Libero\ViewsBundle\Views\OptionalTemplateListener;
-use Libero\ViewsBundle\Views\View;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\ViewConverter;
 use function Libero\ViewsBundle\array_has_key;
 
@@ -21,7 +21,7 @@ public function __construct(ViewConverter $converter)
         $this->converter = $converter;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : TemplateView
     {
         return $view->withArgument('text', $this->convertChildren($object, $view->getContext()));
     }

vendor-extra/JatsContentBundle/src/EventListener/BuildView/KeywordGroupTagListListener.php

@@ -9,6 +9,7 @@
 use Libero\ViewsBundle\Views\ContextAwareTranslation;
 use Libero\ViewsBundle\Views\ConvertsLists;
 use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\View;
 use Libero\ViewsBundle\Views\ViewConverter;
 use Symfony\Contracts\Translation\TranslatorInterface;
@@ -31,7 +32,7 @@ public function __construct(ViewConverter $converter, TranslatorInterface $trans
         $this->translationKeys = $translationKeys;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : View
     {
         $title = $object->ownerDocument->xpath()
             ->firstOf('jats:title', $object);
@@ -46,8 +47,13 @@ protected function handle(Element $object, View $view) : View
         $type = $object->getAttribute('kwd-group-type');
 
         if ($title instanceof Element) {
-            $title = $this->converter->convert($title, '@LiberoPatterns/heading.html.twig', $view->getContext())
-                ->getArguments();
+            $title = $this->converter->convert($title, '@LiberoPatterns/heading.html.twig', $view->getContext());
+
+            if (!$title instanceof TemplateView) {
+                return $view;
+            }
+
+            $title = $title->getArguments();
         } elseif (!isset($this->translationKeys[$type])) {
             return $view;
         } else {
@@ -60,7 +66,7 @@ protected function handle(Element $object, View $view) : View
                 'list',
                 [
                     'items' => array_map(
-                        function (View $link) : array {
+                        function (TemplateView $link) : array {
                             return ['content' => $link->getArguments()];
                         },
                         $this->convertList($keywords, '@LiberoPatterns/link.html.twig', $view->getContext())

vendor-extra/JatsContentBundle/src/EventListener/BuildView/LinkListener.php

@@ -7,6 +7,7 @@
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\ConvertsChildren;
 use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\View;
 use Libero\ViewsBundle\Views\ViewConverter;
 use function Libero\ViewsBundle\array_has_key;
@@ -24,7 +25,7 @@ public function __construct(ViewConverter $converter)
         $this->converter = $converter;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : View
     {
         return $view->withArgument('text', $this->convertChildren($object, $view->getContext()));
     }

vendor-extra/JatsContentBundle/src/EventListener/BuildView/ParagraphListener.php

@@ -7,7 +7,7 @@
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\ConvertsChildren;
 use Libero\ViewsBundle\Views\OptionalTemplateListener;
-use Libero\ViewsBundle\Views\View;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\ViewConverter;
 use function Libero\ViewsBundle\array_has_key;
 
@@ -23,7 +23,7 @@ public function __construct(ViewConverter $converter)
         $this->converter = $converter;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : TemplateView
     {
         return $view->withArgument('text', $this->convertChildren($object, $view->getContext()));
     }

vendor-extra/JatsContentBundle/src/EventListener/BuildView/SectionListener.php

@@ -9,7 +9,7 @@
 use FluentDOM\DOM\Node\NonDocumentTypeChildNode;
 use Libero\ViewsBundle\Views\ConvertsChildren;
 use Libero\ViewsBundle\Views\OptionalTemplateListener;
-use Libero\ViewsBundle\Views\View;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\ViewConverter;
 use function array_map;
 use function iterator_to_array;
@@ -27,7 +27,7 @@ public function __construct(ViewConverter $converter)
         $this->converter = $converter;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : TemplateView
     {
         if (!$view->hasContext('level')) {
             $view = $view->withContext(['level' => 1]);
@@ -54,7 +54,7 @@ protected function handle(Element $object, View $view) : View
         return $view->withArgument(
             'content',
             array_map(
-                function (NonDocumentTypeChildNode $child) use ($childContext) : View {
+                function (NonDocumentTypeChildNode $child) use ($childContext) : TemplateView {
                     return $this->converter->convert($child, null, $childContext);
                 },
                 iterator_to_array($children)

vendor-extra/JatsContentBundle/src/EventListener/BuildView/SubListener.php

@@ -7,7 +7,7 @@
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\ConvertsChildren;
 use Libero\ViewsBundle\Views\OptionalTemplateListener;
-use Libero\ViewsBundle\Views\View;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\ViewConverter;
 use function Libero\ViewsBundle\array_has_key;
 
@@ -21,7 +21,7 @@ public function __construct(ViewConverter $converter)
         $this->converter = $converter;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : TemplateView
     {
         return $view->withArgument('text', $this->convertChildren($object, $view->getContext()));
     }

vendor-extra/JatsContentBundle/src/EventListener/BuildView/SupListener.php

@@ -7,7 +7,7 @@
 use FluentDOM\DOM\Element;
 use Libero\ViewsBundle\Views\ConvertsChildren;
 use Libero\ViewsBundle\Views\OptionalTemplateListener;
-use Libero\ViewsBundle\Views\View;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\ViewConverter;
 use function Libero\ViewsBundle\array_has_key;
 
@@ -21,7 +21,7 @@ public function __construct(ViewConverter $converter)
         $this->converter = $converter;
     }
 
-    protected function handle(Element $object, View $view) : View
+    protected function handle(Element $object, TemplateView $view) : TemplateView
     {
         return $view->withArgument('text', $this->convertChildren($object, $view->getContext()));
     }

vendor-extra/JatsContentBundle/src/EventListener/ItemTagsListener.php

@@ -7,6 +7,7 @@
 use FluentDOM\DOM\Element;
 use Libero\LiberoPageBundle\Event\CreatePagePartEvent;
 use Libero\ViewsBundle\Views\ConvertsLists;
+use Libero\ViewsBundle\Views\TemplateView;
 use Libero\ViewsBundle\Views\ViewConverter;
 use function count;
 use const Libero\LiberoPatternsBundle\CONTENT_GRID_PRIMARY;
@@ -36,7 +37,7 @@ public function onCreatePagePart(CreatePagePartEvent $event) : void
 
         $itemTags = $this->converter->convert($front, '@LiberoPatterns/item-tags.html.twig', $context);
 
-        if (0 === count($itemTags->getArguments())) {
+        if (!$itemTags instanceof TemplateView || 0 === count($itemTags->getArguments())) {
             return;
         }
 

vendor-extra/JatsContentBundle/tests/EventListener/BodyListenerTest.php

@@ -6,7 +6,7 @@
 
 use Libero\JatsContentBundle\EventListener\BodyListener;
 use Libero\LiberoPageBundle\Event\CreatePagePartEvent;
-use Libero\ViewsBundle\Views\View;
+use Libero\ViewsBundle\Views\TemplateView;
 use PHPUnit\Framework\TestCase;
 use tests\Libero\LiberoPageBundle\PageTestCase;
 use tests\Libero\LiberoPageBundle\ViewConvertingTestCase;
@@ -101,8 +101,8 @@ public function it_adds_the_body_content(string $xml, array $context, array $exp
 
         $this->assertEquals(
             array_map(
-                function (array $block) : View {
-                    return new View(null, $block);
+                function (array $block) : TemplateView {
+                    return new TemplateView(null, $block);
                 },
                 $expectedBody
             ),