Skip to content

Commit 51df7d9

Browse files
committed
upgrade rst parser
1 parent 7be7dea commit 51df7d9

40 files changed

+378
-410
lines changed

_build/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/vendor/
22
/tests/_output
33
/tests/_outputJson
4+
/var/

_build/composer.lock

Lines changed: 148 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_build/notes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Changes needed in symfony.com
77
- `div.section` are now removed, so the `margin-top` needd to go on `<hX>`
88
- `<p>` added to `.. seealso::` directive
99
- `versionadded` dom changed
10+
- toc level `.toctree-lX` class has disappeared (was it needed ?)
1011

1112
Notes
1213
=====

_build/src/Command/ParseDoc.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace SymfonyDocs\Command;
44

55
use Doctrine\RST\Builder;
6+
use Doctrine\RST\Configuration;
67
use Symfony\Component\Console\Command\Command;
78
use Symfony\Component\Console\Helper\ProgressBar;
89
use Symfony\Component\Console\Input\InputInterface;
@@ -11,7 +12,8 @@
1112
use Symfony\Component\Console\Style\SymfonyStyle;
1213
use Symfony\Component\Filesystem\Filesystem;
1314
use Symfony\Component\Finder\Finder;
14-
use SymfonyDocs\HtmlKernel;
15+
use SymfonyDocs\KernelFactory;
16+
use SymfonyDocs\SymfonyDocConfiguration;
1517
use SymfonyDocs\JsonGenerator;
1618

1719
/**
@@ -72,9 +74,9 @@ protected function initialize(InputInterface $input, OutputInterface $output)
7274

7375
protected function execute(InputInterface $input, OutputInterface $output)
7476
{
75-
$kernel = new HtmlKernel();
76-
$builder = new Builder($kernel);
77-
$builder->addHook([$this, 'handleProgressBar']);
77+
$builder = KernelFactory::createKernel();
78+
79+
// $builder->addHook([$this, 'handleProgressBar']);
7880

7981
$this->finder->in($input->getOption('source-dir'))
8082
->exclude(['_build', '.github', '.platform', '_images'])

_build/src/Directive/AbstractAdmonitionDirective.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Doctrine\RST\Nodes\Node;
66
use Doctrine\RST\Nodes\WrapperNode;
77
use Doctrine\RST\Parser;
8-
use Doctrine\RST\SubDirective;
8+
use Doctrine\RST\Directives\SubDirective;
99

1010
abstract class AbstractAdmonitionDirective extends SubDirective
1111
{

_build/src/Directive/ClassDirective.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace SymfonyDocs\Directive;
44

5+
use Doctrine\RST\Nodes\ListNode;
56
use Doctrine\RST\Nodes\Node;
7+
use Doctrine\RST\Nodes\ParagraphNode;
68
use Doctrine\RST\Parser;
7-
use Doctrine\RST\SubDirective;
8-
use SymfonyDocs\Nodes\ListNode;
9-
use SymfonyDocs\Nodes\ParagraphNode;
9+
use Doctrine\RST\Directives\SubDirective;
1010

1111
class ClassDirective extends SubDirective
1212
{

_build/src/Directive/CodeBlockDirective.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace SymfonyDocs\Directive;
44

5-
use Doctrine\RST\Directive;
5+
use Doctrine\RST\Directives\Directive;
66
use Doctrine\RST\Nodes\CodeNode;
77
use Doctrine\RST\Nodes\Node;
88
use Doctrine\RST\Parser;

_build/src/Directive/ConfigurationBlockDirective.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use Doctrine\RST\Nodes\Node;
88
use Doctrine\RST\Nodes\RawNode;
99
use Doctrine\RST\Parser;
10-
use Doctrine\RST\SubDirective;
10+
use Doctrine\RST\Directives\SubDirective;
1111
use function strtoupper;
1212

1313
class ConfigurationBlockDirective extends SubDirective

_build/src/Directive/IndexDirective.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace SymfonyDocs\Directive;
44

5-
use Doctrine\RST\SubDirective;
5+
use Doctrine\RST\Directives\SubDirective;
66

77
class IndexDirective extends SubDirective
88
{

_build/src/Directive/RoleDirective.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Doctrine\RST\Nodes\Node;
66
use Doctrine\RST\Nodes\WrapperNode;
77
use Doctrine\RST\Parser;
8-
use Doctrine\RST\SubDirective;
8+
use Doctrine\RST\Directives\SubDirective;
99

1010
class RoleDirective extends SubDirective
1111
{

_build/src/Directive/SidebarDirective.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Doctrine\RST\Nodes\Node;
66
use Doctrine\RST\Nodes\WrapperNode;
77
use Doctrine\RST\Parser;
8-
use Doctrine\RST\SubDirective;
8+
use Doctrine\RST\Directives\SubDirective;
99

1010
class SidebarDirective extends SubDirective
1111
{

_build/src/Directive/VersionAddedDirective.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use Doctrine\RST\Nodes\Node;
66
use Doctrine\RST\Nodes\WrapperNode;
77
use Doctrine\RST\Parser;
8-
use Doctrine\RST\SubDirective;
8+
use Doctrine\RST\Directives\SubDirective;
99

1010
class VersionAddedDirective extends SubDirective
1111
{

0 commit comments

Comments
 (0)