Skip to content

Commit

Permalink
fix all tests
Browse files Browse the repository at this point in the history
  • Loading branch information
nikophil committed Nov 17, 2018
1 parent dfd98e0 commit b23444a
Show file tree
Hide file tree
Showing 45 changed files with 190 additions and 336 deletions.
3 changes: 3 additions & 0 deletions notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ Notes
- we're assuming there is only one toctree per page...
- `rst` does not exist in highlight php
- `varnish` = C ? (highlight php)
- `RoleDirective` ?
- `IndexDirective` ?
- toctree maxdepth ?
21 changes: 9 additions & 12 deletions src/Directive/AbstractAdmonitionDirective.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

namespace SymfonyDocs\Directive;

use Doctrine\RST\Directives\SubDirective;
use Doctrine\RST\Nodes\Node;
use Doctrine\RST\Nodes\WrapperNode;
use Doctrine\RST\Parser;
use Doctrine\RST\Directives\SubDirective;

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

final public function processSub(Parser $parser, ?Node $document, string $variable, string $data, array $options): ?Node
{
return new WrapperNode(
$document,
sprintf(
'<div class="admonition-%s admonition-wrapper"><div class="%s"></div><div class="admonition admonition-%s"><p class="admonition-title">%s</p>',
$this->name,
$this->name,
$this->name,
$this->text
),
'</div></div>'
$wrapperDiv = $parser->renderTemplate(
'directives/admonition.html.twig',
[
'name' => $this->name,
'text' => $this->text,
]
);

return $parser->getNodeFactory()->createWrapperNode($document, $wrapperDiv, '</div></div>');
}

final public function getName(): string
Expand Down
2 changes: 1 addition & 1 deletion src/Directive/ClassDirective.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function processSub(Parser $parser, ?Node $document, string $variable, st
);
}

$document->setClass($data);
// $document->setClass($data);

return $document;
}
Expand Down
29 changes: 13 additions & 16 deletions src/Directive/ConfigurationBlockDirective.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

namespace SymfonyDocs\Directive;

use Doctrine\RST\Document;
use Doctrine\RST\Directives\SubDirective;
use Doctrine\RST\Nodes\CodeNode;
use Doctrine\RST\Nodes\Node;
use Doctrine\RST\Nodes\RawNode;
use Doctrine\RST\Parser;
use Doctrine\RST\Directives\SubDirective;
use function strtoupper;

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

public function processSub(Parser $parser, ?Node $document, string $variable, string $data, array $options): ?Node
{
if (!$document instanceof Document) {
return null;
}

$html = '<div class="configuration-block"><ul class="simple">';

$blocks = [];
foreach ($document->getNodes() as $node) {
if (!$node instanceof CodeNode) {
continue;
}

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

$html .= '<li>';
$html .= sprintf('<em>%s</em>', strtoupper($language));
$html .= trim($node->render());
$html .= '</li>';
$blocks[] = [
'language' => strtoupper($language),
'code' => $node->render(),
];
}

$html .= '</ul>';
$html .= '</div>';
$wrapperDiv = $parser->renderTemplate(
'directives/configuration-block.html.twig',
[
'blocks' => $blocks,
]
);

return new RawNode($html);
return $parser->getNodeFactory()->createWrapperNode(null, $wrapperDiv, '</div>');
}
}
21 changes: 0 additions & 21 deletions src/Directive/RoleDirective.php

This file was deleted.

14 changes: 8 additions & 6 deletions src/Directive/SidebarDirective.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

namespace SymfonyDocs\Directive;

use Doctrine\RST\Directives\SubDirective;
use Doctrine\RST\Nodes\Node;
use Doctrine\RST\Nodes\WrapperNode;
use Doctrine\RST\Parser;
use Doctrine\RST\Directives\SubDirective;

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

public function processSub(Parser $parser, ?Node $document, string $variable, string $data, array $options): ?Node
{
return new WrapperNode(
$document,
sprintf('<div class="admonition-wrapper"><div class="sidebar"></div><div class="admonition admonition-sidebar"><p class="sidebar-title">%s</p>', $data),
'</div></div>'
$wrapperDiv = $parser->renderTemplate(
'directives/sidebar.html.twig',
[
'title' => $data,
]
);

return $parser->getNodeFactory()->createWrapperNode($document, $wrapperDiv, '</div></div>');
}
}
14 changes: 8 additions & 6 deletions src/Directive/VersionAddedDirective.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@

namespace SymfonyDocs\Directive;

use Doctrine\RST\Directives\SubDirective;
use Doctrine\RST\Nodes\Node;
use Doctrine\RST\Nodes\WrapperNode;
use Doctrine\RST\Parser;
use Doctrine\RST\Directives\SubDirective;

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

public function processSub(Parser $parser, ?Node $document, string $variable, string $data, array $options): ?Node
{
return new WrapperNode(
$document,
sprintf('<div class="versionadded"><div><span class="versionmodified">New in version %s: </span>', $data),
'</div></div>'
$wrapperDiv = $parser->renderTemplate(
'directives/version-added.html.twig',
[
'version' => $data,
]
);

return $parser->getNodeFactory()->createWrapperNode($document, $wrapperDiv, '</div></div>');
}
}
1 change: 0 additions & 1 deletion src/KernelFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ private static function getDirectives(): array
new SymfonyDoirectives\ConfigurationBlockDirective(),
new SymfonyDoirectives\IndexDirective(),
new SymfonyDoirectives\NoteDirective(),
new SymfonyDoirectives\RoleDirective(),
new SymfonyDoirectives\SeeAlsoDirective(),
new SymfonyDoirectives\SidebarDirective(),
new SymfonyDoirectives\TipDirective(),
Expand Down
25 changes: 0 additions & 25 deletions src/Nodes/ClassTrait.php

This file was deleted.

108 changes: 0 additions & 108 deletions src/Nodes/SfCodeNode.php

This file was deleted.

46 changes: 0 additions & 46 deletions src/Nodes/SpanNode.php

This file was deleted.

Loading

0 comments on commit b23444a

Please sign in to comment.