update rst parser

nikophil · nikophil · commit 7be7dea10e50 · 2018-11-11T11:14:34.000+01:00
diff --git a/_build/composer.lock b/_build/composer.lock
diff --git a/_build/src/HtmlKernel.php b/_build/src/HtmlKernel.php
@@ -104,7 +104,8 @@ protected function createNodeFactory(): NodeFactoryInterface
             new NodeInstantiator(NodeTypes::TOC, SymfonyNodes\TocNode::class),
             new NodeInstantiator(NodeTypes::DOCUMENT, Document::class),
             new NodeInstantiator(NodeTypes::SEPARATOR, ParserNodes\SeparatorNode::class),
-            new NodeInstantiator(NodeTypes::QUOTE, ParserNodes\QuoteNode::class)
+            new NodeInstantiator(NodeTypes::QUOTE, ParserNodes\QuoteNode::class),
+            new NodeInstantiator(NodeTypes::DEFINITION_LIST, ParserNodes\DefinitionListNode::class)
         );
     }
 }
diff --git a/_build/src/Nodes/AnchorNode.php b/_build/src/Nodes/AnchorNode.php
@@ -6,7 +6,7 @@
 
 class AnchorNode extends Base
 {
-    public function render(): string
+    public function doRender(): string
     {
         return sprintf('<span id="%s"></span>', $this->value);
     }
diff --git a/_build/src/Nodes/CodeNode.php b/_build/src/Nodes/CodeNode.php
@@ -57,7 +57,7 @@ class CodeNode extends Base
 </div>
 TEMPLATE;
 
-    public function render(): string
+    public function doRender(): string
     {
         $nodeValue = $this->getValue();
         assert(is_string($nodeValue));
diff --git a/_build/src/Nodes/ParagraphNode.php b/_build/src/Nodes/ParagraphNode.php
@@ -10,7 +10,7 @@ class ParagraphNode extends Base
 {
     use ClassTrait;
 
-    public function render(): string
+    public function doRender(): string
     {
         if ($this->value instanceof Node) {
             $text = trim($this->value->render());
diff --git a/_build/src/Nodes/TableNode.php b/_build/src/Nodes/TableNode.php
@@ -7,7 +7,7 @@
 
 class TableNode extends Base
 {
-    public function render(): string
+    public function doRender(): string
     {
         $html = '<table class="docutils" border="1">';
 
diff --git a/_build/src/Nodes/TitleNode.php b/_build/src/Nodes/TitleNode.php
@@ -7,7 +7,7 @@
 
 class TitleNode extends Base
 {
-    public function render(): string
+    public function doRender(): string
     {
         $anchor = Environment::slugify((string) $this->value);
 
diff --git a/_build/src/Nodes/TocNode.php b/_build/src/Nodes/TocNode.php
@@ -11,7 +11,7 @@ class TocNode extends Base
     /** @var int */
     private $depth;
 
-    public function render(): string
+    public function doRender(): string
     {
         if (isset($this->options['hidden'])) {
             return '';
diff --git a/_build/tests/IntegrationTest.php b/_build/tests/IntegrationTest.php
@@ -6,6 +6,8 @@
 use Doctrine\RST\Parser;
 use Gajus\Dindent\Indenter;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
@@ -46,8 +48,8 @@ public function testIntegration(string $folder)
             );
         }
 
-        $jsonGenerator = new JsonGenerator($builder->getDocuments());
-        $jsonGenerator->generateJson(__DIR__.'/_output', __DIR__.'/_outputJson');
+        $jsonGenerator = new JsonGenerator($builder->getDocuments()->getAll());
+        $jsonGenerator->generateJson(__DIR__.'/_output', __DIR__.'/_outputJson', new ProgressBar(new NullOutput()));
 
         foreach ($finder as $htmlFile) {
             $relativePath   = $htmlFile->getRelativePathname();
@@ -236,17 +238,6 @@ public function parserUnitBlockProvider()
         ];
     }
 
-    public function testRefReferenceError()
-    {
-        $this->expectException(\RuntimeException::class);
-
-        $this->createBuilder()->build(
-            sprintf('%s/fixtures/source/ref-reference-error', __DIR__),
-            __DIR__.'/_output',
-            false // verbose
-        );
-    }
-
     private function createBuilder(): Builder
     {
         $kernel  = new HtmlKernel();
diff --git a/_build/tests/fixtures/expected/toctree/index.html b/_build/tests/fixtures/expected/toctree/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8" />
 </head>
 <body>
+<h1 id="toctree">Toctree<a class="headerlink" href="#toctree" title="Permalink to this headline">¶</a></h1>
 <div class="toctree-wrapper compound">
     <ul>
         <li class="toctree-l1"><a class="reference internal" href="file.html">Title</a>
@@ -25,6 +26,7 @@
 </div>
 <div class="toctree-wrapper compound">
     <ul>
+        <li class="toctree-l1"><a class="reference internal" href="index.html">Toctree</a></li>
         <li class="toctree-l1"><a class="reference internal" href="directory/another_file.html">Another file</a></li>
         <li class="toctree-l1"><a class="reference internal" href="file.html">Title</a>
             <ul>
@@ -40,6 +42,7 @@
                 <li class="toctree-l2"><a class="reference internal" href="file.html#sub-title">Sub title</a></li>
             </ul>
         </li>
+        <li class="toctree-l1"><a class="reference internal" href="index.html">Toctree</a></li>
         <li class="toctree-l1"><a class="reference internal" href="directory/another_file.html">Another file</a></li>
     </ul>
 </div>
diff --git a/_build/tests/fixtures/source/ref-reference-error/index.rst b/_build/tests/fixtures/source/ref-reference-error/index.rst
diff --git a/_build/tests/fixtures/source/toctree/index.rst b/_build/tests/fixtures/source/toctree/index.rst
@@ -1,3 +1,5 @@
+Toctree
+=======
 
 .. toctree::
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,8 @@ protected function createNodeFactory(): NodeFactoryInterface`
`104`	`104`	`new NodeInstantiator(NodeTypes::TOC, SymfonyNodes\TocNode::class),`
`105`	`105`	`new NodeInstantiator(NodeTypes::DOCUMENT, Document::class),`
`106`	`106`	`new NodeInstantiator(NodeTypes::SEPARATOR, ParserNodes\SeparatorNode::class),`
`107`		`- new NodeInstantiator(NodeTypes::QUOTE, ParserNodes\QuoteNode::class)`
	`107`	`+ new NodeInstantiator(NodeTypes::QUOTE, ParserNodes\QuoteNode::class),`
	`108`	`+ new NodeInstantiator(NodeTypes::DEFINITION_LIST, ParserNodes\DefinitionListNode::class)`
`108`	`109`	`);`
`109`	`110`	`}`
`110`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`class AnchorNode extends Base`
`8`	`8`	`{`
`9`		`- public function render(): string`
	`9`	`+ public function doRender(): string`
`10`	`10`	`{`
`11`	`11`	`return sprintf('<span id="%s"></span>', $this->value);`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ class CodeNode extends Base`
`57`	`57`	`</div>`
`58`	`58`	`TEMPLATE;`
`59`	`59`
`60`		`- public function render(): string`
	`60`	`+ public function doRender(): string`
`61`	`61`	`{`
`62`	`62`	`$nodeValue = $this->getValue();`
`63`	`63`	`assert(is_string($nodeValue));`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ class ParagraphNode extends Base`
`10`	`10`	`{`
`11`	`11`	`use ClassTrait;`
`12`	`12`
`13`		`- public function render(): string`
	`13`	`+ public function doRender(): string`
`14`	`14`	`{`
`15`	`15`	`if ($this->value instanceof Node) {`
`16`	`16`	`$text = trim($this->value->render());`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`class TableNode extends Base`
`9`	`9`	`{`
`10`		`- public function render(): string`
	`10`	`+ public function doRender(): string`
`11`	`11`	`{`
`12`	`12`	`$html = '<table class="docutils" border="1">';`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`class TitleNode extends Base`
`9`	`9`	`{`
`10`		`- public function render(): string`
	`10`	`+ public function doRender(): string`
`11`	`11`	`{`
`12`	`12`	`$anchor = Environment::slugify((string) $this->value);`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class TocNode extends Base`
`11`	`11`	`/** @var int */`
`12`	`12`	`private $depth;`
`13`	`13`
`14`		`- public function render(): string`
	`14`	`+ public function doRender(): string`
`15`	`15`	`{`
`16`	`16`	`if (isset($this->options['hidden'])) {`
`17`	`17`	`return '';`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+Toctree`
	`2`	`+=======`
`1`	`3`
`2`	`4`	`.. toctree::`
`3`	`5`