Skip to content
This repository was archived by the owner on Nov 21, 2019. It is now read-only.

Commit 9c3b607

Browse files
thewilkybarkidthewilkybarkid
authored
Replace ViewConverterRegistry with EventDispatchingViewConverter (#57)
* Replace ViewConverterRegistry with EventDispatchingViewConverter * Name fixes * Can simplify test * Test the whole view * Refactor the simplification * Not meant * Test event * Rename event
1 parent 877a356 commit 9c3b607

File tree

56 files changed

+776
-624
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+776
-624
lines changed

‎composer.lock

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor-extra/JatsContentBundle/src/ViewConverter/BoldVisitor.php renamed to ‎vendor-extra/JatsContentBundle/src/EventListener/BuildView/BoldListener.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22

33
declare(strict_types=1);
44

5-
namespace Libero\JatsContentBundle\ViewConverter;
5+
namespace Libero\JatsContentBundle\EventListener\BuildView;
66

77
use FluentDOM\DOM\Element;
88
use Libero\ViewsBundle\Views\ConvertsChildren;
9-
use Libero\ViewsBundle\Views\OptionalTemplateVisitor;
9+
use Libero\ViewsBundle\Views\OptionalTemplateListener;
1010
use Libero\ViewsBundle\Views\View;
1111
use Libero\ViewsBundle\Views\ViewConverter;
12-
use Libero\ViewsBundle\Views\ViewConverterVisitor;
1312
use function Libero\ViewsBundle\array_has_key;
1413

15-
final class BoldVisitor implements ViewConverterVisitor
14+
final class BoldListener
1615
{
1716
use ConvertsChildren;
18-
use OptionalTemplateVisitor;
17+
use OptionalTemplateListener;
1918

2019
public function __construct(ViewConverter $converter)
2120
{

‎vendor-extra/JatsContentBundle/src/ViewConverter/FrontArticleTitleContentHeaderVisitor.php renamed to ‎vendor-extra/JatsContentBundle/src/EventListener/BuildView/FrontArticleTitleContentHeaderListener.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22

33
declare(strict_types=1);
44

5-
namespace Libero\JatsContentBundle\ViewConverter;
5+
namespace Libero\JatsContentBundle\EventListener\BuildView;
66

77
use FluentDOM\DOM\Element;
8-
use Libero\ViewsBundle\Views\SimplifiedVisitor;
8+
use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
99
use Libero\ViewsBundle\Views\View;
1010
use Libero\ViewsBundle\Views\ViewConverter;
11-
use Libero\ViewsBundle\Views\ViewConverterVisitor;
1211
use function Libero\ViewsBundle\array_has_key;
1312

14-
final class FrontArticleTitleContentHeaderVisitor implements ViewConverterVisitor
13+
final class FrontArticleTitleContentHeaderListener
1514
{
16-
use SimplifiedVisitor;
15+
use SimplifiedViewConverterListener;
1716

1817
private $converter;
1918

‎vendor-extra/JatsContentBundle/src/ViewConverter/FrontItemTagsVisitor.php renamed to ‎vendor-extra/JatsContentBundle/src/EventListener/BuildView/FrontItemTagsListener.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,24 @@
22

33
declare(strict_types=1);
44

5-
namespace Libero\JatsContentBundle\ViewConverter;
5+
namespace Libero\JatsContentBundle\EventListener\BuildView;
66

77
use DOMNodeList;
88
use FluentDOM\DOM\Element;
99
use Libero\ViewsBundle\Views\ConvertsLists;
10-
use Libero\ViewsBundle\Views\SimplifiedVisitor;
10+
use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
1111
use Libero\ViewsBundle\Views\View;
1212
use Libero\ViewsBundle\Views\ViewConverter;
13-
use Libero\ViewsBundle\Views\ViewConverterVisitor;
1413
use function array_filter;
1514
use function array_map;
1615
use function array_values;
1716
use function count;
1817
use function Libero\ViewsBundle\array_has_key;
1918

20-
final class FrontItemTagsVisitor implements ViewConverterVisitor
19+
final class FrontItemTagsListener
2120
{
2221
use ConvertsLists;
23-
use SimplifiedVisitor;
22+
use SimplifiedViewConverterListener;
2423

2524
public function __construct(ViewConverter $converter)
2625
{

‎vendor-extra/JatsContentBundle/src/ViewConverter/FrontSubjectGroupContentHeaderVisitor.php renamed to ‎vendor-extra/JatsContentBundle/src/EventListener/BuildView/FrontSubjectGroupContentHeaderListener.php

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,25 @@
22

33
declare(strict_types=1);
44

5-
namespace Libero\JatsContentBundle\ViewConverter;
5+
namespace Libero\JatsContentBundle\EventListener\BuildView;
66

77
use DOMNodeList;
88
use FluentDOM\DOM\Element;
9+
use Libero\ViewsBundle\Views\ContextAwareTranslation;
910
use Libero\ViewsBundle\Views\ConvertsLists;
10-
use Libero\ViewsBundle\Views\SimplifiedVisitor;
11-
use Libero\ViewsBundle\Views\TranslatingVisitor;
11+
use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
1212
use Libero\ViewsBundle\Views\View;
1313
use Libero\ViewsBundle\Views\ViewConverter;
14-
use Libero\ViewsBundle\Views\ViewConverterVisitor;
1514
use Symfony\Contracts\Translation\TranslatorInterface;
1615
use function array_map;
1716
use function count;
1817
use function Libero\ViewsBundle\array_has_key;
1918

20-
final class FrontSubjectGroupContentHeaderVisitor implements ViewConverterVisitor
19+
final class FrontSubjectGroupContentHeaderListener
2120
{
21+
use ContextAwareTranslation;
2222
use ConvertsLists;
23-
use SimplifiedVisitor;
24-
use TranslatingVisitor;
25-
26-
private $converter;
27-
private $translator;
23+
use SimplifiedViewConverterListener;
2824

2925
public function __construct(ViewConverter $converter, TranslatorInterface $translator)
3026
{

‎vendor-extra/JatsContentBundle/src/ViewConverter/HeadingVisitor.php renamed to ‎vendor-extra/JatsContentBundle/src/EventListener/BuildView/HeadingListener.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22

33
declare(strict_types=1);
44

5-
namespace Libero\JatsContentBundle\ViewConverter;
5+
namespace Libero\JatsContentBundle\EventListener\BuildView;
66

77
use FluentDOM\DOM\Element;
88
use Libero\ViewsBundle\Views\ConvertsChildren;
9-
use Libero\ViewsBundle\Views\SimplifiedVisitor;
9+
use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
1010
use Libero\ViewsBundle\Views\View;
1111
use Libero\ViewsBundle\Views\ViewConverter;
12-
use Libero\ViewsBundle\Views\ViewConverterVisitor;
1312
use function Libero\ViewsBundle\array_has_key;
1413
use function Libero\ViewsBundle\string_is;
1514

16-
final class HeadingVisitor implements ViewConverterVisitor
15+
final class HeadingListener
1716
{
1817
use ConvertsChildren;
19-
use SimplifiedVisitor;
18+
use SimplifiedViewConverterListener;
2019

2120
public function __construct(ViewConverter $converter)
2221
{

‎vendor-extra/JatsContentBundle/src/ViewConverter/ItalicVisitor.php renamed to ‎vendor-extra/JatsContentBundle/src/EventListener/BuildView/ItalicListener.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22

33
declare(strict_types=1);
44

5-
namespace Libero\JatsContentBundle\ViewConverter;
5+
namespace Libero\JatsContentBundle\EventListener\BuildView;
66

77
use FluentDOM\DOM\Element;
88
use Libero\ViewsBundle\Views\ConvertsChildren;
9-
use Libero\ViewsBundle\Views\OptionalTemplateVisitor;
9+
use Libero\ViewsBundle\Views\OptionalTemplateListener;
1010
use Libero\ViewsBundle\Views\View;
1111
use Libero\ViewsBundle\Views\ViewConverter;
12-
use Libero\ViewsBundle\Views\ViewConverterVisitor;
1312
use function Libero\ViewsBundle\array_has_key;
1413

15-
final class ItalicVisitor implements ViewConverterVisitor
14+
final class ItalicListener
1615
{
1716
use ConvertsChildren;
18-
use OptionalTemplateVisitor;
17+
use OptionalTemplateListener;
1918

2019
public function __construct(ViewConverter $converter)
2120
{

‎vendor-extra/JatsContentBundle/src/ViewConverter/KeywordGroupTagListVisitor.php renamed to ‎vendor-extra/JatsContentBundle/src/EventListener/BuildView/KeywordGroupTagListListener.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@
22

33
declare(strict_types=1);
44

5-
namespace Libero\JatsContentBundle\ViewConverter;
5+
namespace Libero\JatsContentBundle\EventListener\BuildView;
66

77
use DOMNodeList;
88
use FluentDOM\DOM\Element;
9+
use Libero\ViewsBundle\Views\ContextAwareTranslation;
910
use Libero\ViewsBundle\Views\ConvertsLists;
10-
use Libero\ViewsBundle\Views\SimplifiedVisitor;
11-
use Libero\ViewsBundle\Views\TranslatingVisitor;
11+
use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
1212
use Libero\ViewsBundle\Views\View;
1313
use Libero\ViewsBundle\Views\ViewConverter;
14-
use Libero\ViewsBundle\Views\ViewConverterVisitor;
1514
use Symfony\Contracts\Translation\TranslatorInterface;
1615
use function array_map;
1716
use function count;
1817
use function Libero\ViewsBundle\array_has_key;
1918

20-
final class KeywordGroupTagListVisitor implements ViewConverterVisitor
19+
final class KeywordGroupTagListListener
2120
{
21+
use ContextAwareTranslation;
2222
use ConvertsLists;
23-
use SimplifiedVisitor;
24-
use TranslatingVisitor;
23+
use SimplifiedViewConverterListener;
2524

2625
private $translationKeys;
2726

‎vendor-extra/JatsContentBundle/src/ViewConverter/LinkVisitor.php renamed to ‎vendor-extra/JatsContentBundle/src/EventListener/BuildView/LinkListener.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,20 @@
22

33
declare(strict_types=1);
44

5-
namespace Libero\JatsContentBundle\ViewConverter;
5+
namespace Libero\JatsContentBundle\EventListener\BuildView;
66

77
use FluentDOM\DOM\Element;
88
use Libero\ViewsBundle\Views\ConvertsChildren;
9-
use Libero\ViewsBundle\Views\SimplifiedVisitor;
9+
use Libero\ViewsBundle\Views\SimplifiedViewConverterListener;
1010
use Libero\ViewsBundle\Views\View;
1111
use Libero\ViewsBundle\Views\ViewConverter;
12-
use Libero\ViewsBundle\Views\ViewConverterVisitor;
1312
use function Libero\ViewsBundle\array_has_key;
1413
use function Libero\ViewsBundle\string_is;
1514

16-
final class LinkVisitor implements ViewConverterVisitor
15+
final class LinkListener
1716
{
1817
use ConvertsChildren;
19-
use SimplifiedVisitor;
18+
use SimplifiedViewConverterListener;
2019

2120
private $converter;
2221

‎vendor-extra/JatsContentBundle/src/ViewConverter/ParagraphVisitor.php renamed to ‎vendor-extra/JatsContentBundle/src/EventListener/BuildView/ParagraphListener.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@
22

33
declare(strict_types=1);
44

5-
namespace Libero\JatsContentBundle\ViewConverter;
5+
namespace Libero\JatsContentBundle\EventListener\BuildView;
66

77
use FluentDOM\DOM\Element;
88
use Libero\ViewsBundle\Views\ConvertsChildren;
9-
use Libero\ViewsBundle\Views\OptionalTemplateVisitor;
9+
use Libero\ViewsBundle\Views\OptionalTemplateListener;
1010
use Libero\ViewsBundle\Views\View;
1111
use Libero\ViewsBundle\Views\ViewConverter;
12-
use Libero\ViewsBundle\Views\ViewConverterVisitor;
1312
use function Libero\ViewsBundle\array_has_key;
1413

15-
final class ParagraphVisitor implements ViewConverterVisitor
14+
final class ParagraphListener
1615
{
1716
use ConvertsChildren;
18-
use OptionalTemplateVisitor;
17+
use OptionalTemplateListener;
1918

2019
private $converter;
2120

0 commit comments

Comments
 (0)