Allow JATS keyword groups with only a title (#48)

* Allow JATS keyword groups with only a title

* Always array_values()

Author: thewilkybarkid

vendor-extra/ContentPageBundle/tests/ViewConvertingTestCase.php

@@ -32,4 +32,24 @@ function () : View {
             }
         );
     }
+
+    final protected function createFilteringConverter(ViewConverter $converter, callable $filter) : ViewConverter
+    {
+        return new CallbackViewConverter(
+            function (
+                NonDocumentTypeChildNode $node,
+                ?string $template = null,
+                array $context = []
+            ) use (
+                $converter,
+                $filter
+            ) : View {
+                if (false === $filter($node, $template, $context)) {
+                    return new View(null);
+                }
+
+                return $converter->convert($node, $template, $context);
+            }
+        );
+    }
 }

vendor-extra/JatsContentBundle/src/ViewConverter/FrontItemTagsVisitor.php

@@ -11,7 +11,9 @@
 use Libero\ViewsBundle\Views\View;
 use Libero\ViewsBundle\Views\ViewConverter;
 use Libero\ViewsBundle\Views\ViewConverterVisitor;
+use function array_filter;
 use function array_map;
+use function array_values;
 use function count;
 
 final class FrontItemTagsVisitor implements ViewConverterVisitor
@@ -28,21 +30,28 @@ protected function doVisit(Element $object, View $view) : View
     {
         /** @var DOMNodeList|Element[] $keywordGroups */
         $keywordGroups = $object->ownerDocument->xpath()
-            ->evaluate('jats:article-meta/jats:kwd-group[@kwd-group-type]', $object);
+            ->evaluate('jats:article-meta/jats:kwd-group', $object);
 
         if (0 === count($keywordGroups)) {
             return $view;
         }
 
-        return $view->withArgument(
-            'groups',
-            array_map(
-                function (View $tagList) : array {
-                    return $tagList->getArguments();
-                },
-                $this->convertList($keywordGroups, '@LiberoPatterns/tag-list.html.twig', $view->getContext())
+        $groups = array_values(
+            array_filter(
+                array_map(
+                    function (View $tagList) : array {
+                        return $tagList->getArguments();
+                    },
+                    $this->convertList($keywordGroups, '@LiberoPatterns/tag-list.html.twig', $view->getContext())
+                )
             )
         );
+
+        if (0 === count($groups)) {
+            return $view;
+        }
+
+        return $view->withArgument('groups', $groups);
     }
 
     protected function expectedTemplate() : string

vendor-extra/JatsContentBundle/tests/ViewConverter/FrontItemTagsVisitorTest.php

@@ -4,6 +4,8 @@
 
 namespace tests\Libero\JatsContentBundle\ViewConverter;
 
+use FluentDOM\DOM\Element;
+use FluentDOM\DOM\Node\NonDocumentTypeChildNode;
 use Libero\JatsContentBundle\ViewConverter\FrontItemTagsVisitor;
 use Libero\ViewsBundle\Views\View;
 use PHPUnit\Framework\TestCase;
@@ -111,9 +113,16 @@ public function it_does_nothing_if_there_is_already_groups_set() : void
     /**
      * @test
      */
-    public function it_sets_the_groups_argument_with_groups_with_a_type() : void
+    public function it_sets_the_groups_argument_with_converted_kwd_groups() : void
     {
-        $visitor = new FrontItemTagsVisitor($this->createDumpingConverter());
+        $visitor = new FrontItemTagsVisitor(
+            $this->createFilteringConverter(
+                $this->createDumpingConverter(),
+                function (NonDocumentTypeChildNode $node, ?string $template = null, array $context = []) : bool {
+                    return $node instanceof Element && $node->hasAttribute('kwd-group-type');
+                }
+            )
+        );
 
         $element = $this->loadElement(
             <<<XML
@@ -157,4 +166,45 @@ public function it_sets_the_groups_argument_with_groups_with_a_type() : void
         );
         $this->assertSame(['qux' => 'quux'], $view->getContext());
     }
+
+    /**
+     * @test
+     */
+    public function it_does_not_set_the_groups_argument_if_no_kwd_groups_convert() : void
+    {
+        $visitor = new FrontItemTagsVisitor(
+            $this->createFilteringConverter(
+                $this->createDumpingConverter(),
+                function (NonDocumentTypeChildNode $node, ?string $template = null, array $context = []) : bool {
+                    return false;
+                }
+            )
+        );
+
+        $element = $this->loadElement(
+            <<<XML
+<?xml version="1.0" encoding="UTF-8"?>
+<jats:front xmlns:jats="http://jats.nlm.nih.gov">
+    <jats:article-meta>
+        <jats:kwd-group kwd-group-type="foo">
+            <jats:kwd>foo</jats:kwd>
+        </jats:kwd-group>
+        <jats:kwd-group>
+            <jats:kwd>bar</jats:kwd>
+        </jats:kwd-group>
+        <jats:kwd-group kwd-group-type="baz">
+            <jats:kwd>baz</jats:kwd>
+        </jats:kwd-group>
+    </jats:article-meta>
+</jats:front>
+XML
+        );
+
+        $context = ['qux' => 'quux'];
+        $view = $visitor->visit($element, new View('@LiberoPatterns/item-tags.html.twig', [], $context));
+
+        $this->assertSame('@LiberoPatterns/item-tags.html.twig', $view->getTemplate());
+        $this->assertEmpty($view->getArguments());
+        $this->assertSame(['qux' => 'quux'], $view->getContext());
+    }
 }