Skip to content

Commit 5e144d8

Browse files
committed
fix all tests
1 parent e2ad74a commit 5e144d8

Some content is hidden

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

45 files changed

+190
-336
lines changed

_build/notes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,6 @@ Notes
2525
- we're assuming there is only one toctree per page...
2626
- `rst` does not exist in highlight php
2727
- `varnish` = C ? (highlight php)
28+
- `RoleDirective` ?
29+
- `IndexDirective` ?
30+
- toctree maxdepth ?

_build/src/Directive/AbstractAdmonitionDirective.php

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
namespace SymfonyDocs\Directive;
44

5+
use Doctrine\RST\Directives\SubDirective;
56
use Doctrine\RST\Nodes\Node;
6-
use Doctrine\RST\Nodes\WrapperNode;
77
use Doctrine\RST\Parser;
8-
use Doctrine\RST\Directives\SubDirective;
98

109
abstract class AbstractAdmonitionDirective extends SubDirective
1110
{
@@ -23,17 +22,15 @@ public function __construct(string $name, string $text)
2322

2423
final public function processSub(Parser $parser, ?Node $document, string $variable, string $data, array $options): ?Node
2524
{
26-
return new WrapperNode(
27-
$document,
28-
sprintf(
29-
'<div class="admonition-%s admonition-wrapper"><div class="%s"></div><div class="admonition admonition-%s"><p class="admonition-title">%s</p>',
30-
$this->name,
31-
$this->name,
32-
$this->name,
33-
$this->text
34-
),
35-
'</div></div>'
25+
$wrapperDiv = $parser->renderTemplate(
26+
'directives/admonition.html.twig',
27+
[
28+
'name' => $this->name,
29+
'text' => $this->text,
30+
]
3631
);
32+
33+
return $parser->getNodeFactory()->createWrapperNode($document, $wrapperDiv, '</div></div>');
3734
}
3835

3936
final public function getName(): string

_build/src/Directive/ClassDirective.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function processSub(Parser $parser, ?Node $document, string $variable, st
2727
);
2828
}
2929

30-
$document->setClass($data);
30+
// $document->setClass($data);
3131

3232
return $document;
3333
}

_build/src/Directive/ConfigurationBlockDirective.php

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
namespace SymfonyDocs\Directive;
44

5-
use Doctrine\RST\Document;
5+
use Doctrine\RST\Directives\SubDirective;
66
use Doctrine\RST\Nodes\CodeNode;
77
use Doctrine\RST\Nodes\Node;
8-
use Doctrine\RST\Nodes\RawNode;
98
use Doctrine\RST\Parser;
10-
use Doctrine\RST\Directives\SubDirective;
119
use function strtoupper;
1210

1311
class ConfigurationBlockDirective extends SubDirective
@@ -19,28 +17,27 @@ public function getName(): string
1917

2018
public function processSub(Parser $parser, ?Node $document, string $variable, string $data, array $options): ?Node
2119
{
22-
if (!$document instanceof Document) {
23-
return null;
24-
}
25-
26-
$html = '<div class="configuration-block"><ul class="simple">';
27-
20+
$blocks = [];
2821
foreach ($document->getNodes() as $node) {
2922
if (!$node instanceof CodeNode) {
3023
continue;
3124
}
3225

3326
$language = $node->getLanguage() ?? 'Unknown';
3427

35-
$html .= '<li>';
36-
$html .= sprintf('<em>%s</em>', strtoupper($language));
37-
$html .= trim($node->render());
38-
$html .= '</li>';
28+
$blocks[] = [
29+
'language' => strtoupper($language),
30+
'code' => $node->render(),
31+
];
3932
}
4033

41-
$html .= '</ul>';
42-
$html .= '</div>';
34+
$wrapperDiv = $parser->renderTemplate(
35+
'directives/configuration-block.html.twig',
36+
[
37+
'blocks' => $blocks,
38+
]
39+
);
4340

44-
return new RawNode($html);
41+
return $parser->getNodeFactory()->createWrapperNode(null, $wrapperDiv, '</div>');
4542
}
4643
}

_build/src/Directive/RoleDirective.php

Lines changed: 0 additions & 21 deletions
This file was deleted.

_build/src/Directive/SidebarDirective.php

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

33
namespace SymfonyDocs\Directive;
44

5+
use Doctrine\RST\Directives\SubDirective;
56
use Doctrine\RST\Nodes\Node;
6-
use Doctrine\RST\Nodes\WrapperNode;
77
use Doctrine\RST\Parser;
8-
use Doctrine\RST\Directives\SubDirective;
98

109
class SidebarDirective extends SubDirective
1110
{
@@ -16,10 +15,13 @@ public function getName(): string
1615

1716
public function processSub(Parser $parser, ?Node $document, string $variable, string $data, array $options): ?Node
1817
{
19-
return new WrapperNode(
20-
$document,
21-
sprintf('<div class="admonition-wrapper"><div class="sidebar"></div><div class="admonition admonition-sidebar"><p class="sidebar-title">%s</p>', $data),
22-
'</div></div>'
18+
$wrapperDiv = $parser->renderTemplate(
19+
'directives/sidebar.html.twig',
20+
[
21+
'title' => $data,
22+
]
2323
);
24+
25+
return $parser->getNodeFactory()->createWrapperNode($document, $wrapperDiv, '</div></div>');
2426
}
2527
}

_build/src/Directive/VersionAddedDirective.php

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

33
namespace SymfonyDocs\Directive;
44

5+
use Doctrine\RST\Directives\SubDirective;
56
use Doctrine\RST\Nodes\Node;
6-
use Doctrine\RST\Nodes\WrapperNode;
77
use Doctrine\RST\Parser;
8-
use Doctrine\RST\Directives\SubDirective;
98

109
class VersionAddedDirective extends SubDirective
1110
{
@@ -16,10 +15,13 @@ public function getName(): string
1615

1716
public function processSub(Parser $parser, ?Node $document, string $variable, string $data, array $options): ?Node
1817
{
19-
return new WrapperNode(
20-
$document,
21-
sprintf('<div class="versionadded"><div><span class="versionmodified">New in version %s: </span>', $data),
22-
'</div></div>'
18+
$wrapperDiv = $parser->renderTemplate(
19+
'directives/version-added.html.twig',
20+
[
21+
'version' => $data,
22+
]
2323
);
24+
25+
return $parser->getNodeFactory()->createWrapperNode($document, $wrapperDiv, '</div></div>');
2426
}
2527
}

_build/src/KernelFactory.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ private static function getDirectives(): array
3535
new SymfonyDoirectives\ConfigurationBlockDirective(),
3636
new SymfonyDoirectives\IndexDirective(),
3737
new SymfonyDoirectives\NoteDirective(),
38-
new SymfonyDoirectives\RoleDirective(),
3938
new SymfonyDoirectives\SeeAlsoDirective(),
4039
new SymfonyDoirectives\SidebarDirective(),
4140
new SymfonyDoirectives\TipDirective(),

_build/src/Nodes/ClassTrait.php

Lines changed: 0 additions & 25 deletions
This file was deleted.

_build/src/Nodes/SfCodeNode.php

Lines changed: 0 additions & 108 deletions
This file was deleted.

_build/src/Nodes/SpanNode.php

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)