fixup! IBX-7987: Added extension point to skip nodes while extracting…

… text

src/bundle/Resources/config/settings/fieldtype_services.yaml

@@ -73,12 +73,18 @@ services:
     Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor\NodeFilterInterface:
         alias: Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter\AggregateFilter
 
+    Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor\NodeFilterFactoryInterface:
+        alias: Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter\NodeFilterFactory
+
+    Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter\NodeFilterFactory: ~
+
     Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter\AggregateFilter:
         arguments:
             $filters: !tagged ibexa.field_type.richtext.text_extractor.node_filter
 
     ibexa.field_type.richtext.text_extractor.node_filter.template:
         class: Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter\NodePathFilter
+        factory: ['@Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor\NodeFilterFactoryInterface', 'createPathFilter']
         arguments: ['eztemplate', 'ezconfig']
         tags:
             - { name: ibexa.field_type.richtext.text_extractor.node_filter }

src/contracts/RichText/TextExtractor/NodeFilterFactoryInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor;
+
+interface NodeFilterFactoryInterface
+{
+    public function createPathFilter(string ...$path): NodeFilterInterface;
+}

src/lib/RichText/TextExtractor/NodeFilter/NodeFilterFactory.php

@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter;
+
+use Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor\NodeFilterFactoryInterface;
+use Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor\NodeFilterInterface;
+
+final class NodeFilterFactory implements NodeFilterFactoryInterface
+{
+    public function createPathFilter(string ...$path): NodeFilterInterface
+    {
+        return new NodePathFilter(...$path);
+    }
+}

tests/lib/RichText/TextExtractor/NodeFilter/AggregateFilterTest.php

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\FieldTypeRichText\RichText\TextExtractor\NodeFilter;
+
+use DOMNode;
+use Ibexa\Contracts\FieldTypeRichText\RichText\TextExtractor\NodeFilterInterface;
+use Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter\AggregateFilter;
+use PHPUnit\Framework\TestCase;
+
+final class AggregateFilterTest extends TestCase
+{
+    public function testFilter(): void
+    {
+        $node = $this->createMock(DOMNode::class);
+
+        $filterA = $this->createMock(NodeFilterInterface::class);
+        $filterA->expects(self::once())->method('filter')->with($node)->willReturn(false);
+        $filterB = $this->createMock(NodeFilterInterface::class);
+        $filterB->expects(self::once())->method('filter')->with($node)->willReturn(true);
+        $filterC = $this->createMock(NodeFilterInterface::class);
+        $filterC->expects(self::never())->method('filter');
+
+        $aggregateFilter = new AggregateFilter([$filterA, $filterB, $filterC]);
+
+        self::assertTrue($aggregateFilter->filter($node));
+    }
+}

tests/lib/RichText/TextExtractor/NodeFilter/NodePathFilterTest.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\FieldTypeRichText\RichText\TextExtractor\NodeFilter;
+
+use DOMDocument;
+use DOMNode;
+use DOMNodeList;
+use DOMXPath;
+use Ibexa\FieldTypeRichText\RichText\TextExtractor\NodeFilter\NodePathFilter;
+use PHPUnit\Framework\TestCase;
+use RuntimeException;
+
+final class NodePathFilterTest extends TestCase
+{
+    public function testFilter(): void
+    {
+        $document = new DOMDocument();
+        $document->loadXML('<a><b><c></c></b></a>');
+
+        $nodeB = $this->getNode($document, '//b');
+        $nodeC = $this->getNode($document, '//c');
+
+        $filter = new NodePathFilter('b', 'c');
+
+        self::assertTrue($filter->filter($nodeB));
+        self::assertFalse($filter->filter($nodeC));
+    }
+
+    private function getNode(DOMDocument $document, string $expression): DOMNode
+    {
+        $xpath = new DOMXPath($document);
+
+        $results = $xpath->query($expression);
+        if ($results instanceof DOMNodeList) {
+            /** @var \DOMNode */
+            return $results->item(0);
+        }
+
+        throw new RuntimeException("Expression '$expression' did not return a node.");
+    }
+}