Update code for doctrine/rst-parser 0.6

Author: wouterj

src/BuildResult.php

@@ -26,7 +26,7 @@ public function __construct(Builder $builder)
     {
         $this->builder = $builder;
         $this->errors = [];
-        foreach ($builder->getErrorManager()->getErrors() as $error) {
+        foreach ($builder->getConfiguration()->getErrorManager()->getErrors() as $error) {
             $this->errors[] = $error->asString();
         }
     }

src/Command/BuildDocsCommand.php

@@ -140,9 +140,7 @@ protected function initialize(InputInterface $input, OutputInterface $output)
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $builder = new Builder(
-            KernelFactory::createKernel($this->buildConfig, $this->urlChecker ?? null)
-        );
+        $builder = KernelFactory::createKernel($this->buildConfig, $this->urlChecker ?? null)->createBuilder();
 
         $configuration = $builder->getConfiguration();
         $configuration->setOutputFormat($input->getOption('error-output-format'));
@@ -153,7 +151,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $this->buildConfig->getOutputDir()
         );
 
-        $buildErrors = $builder->getErrorManager()->getErrors();
+        $buildErrors = $configuration->getErrorManager()->getErrors();
 
         $missingFiles = $this->missingFilesChecker->getMissingFiles();
         foreach ($missingFiles as $missingFile) {

src/DocBuilder.php

@@ -23,7 +23,7 @@ public function build(BuildConfig $config): BuildResult
         $configFileParser = new ConfigFileParser($config, new NullOutput());
         $configFileParser->processConfigFile($config->getContentDir());
 
-        $builder = new Builder(KernelFactory::createKernel($config));
+        $builder = KernelFactory::createKernel($config)->createBuilder();
         $builder->build($config->getContentDir(), $config->getOutputDir());
 
         $buildResult = new BuildResult($builder);

src/DocsKernel.php

@@ -17,6 +17,7 @@
 use Doctrine\RST\Event\PreNodeRenderEvent;
 use Doctrine\RST\Event\PreParseDocumentEvent;
 use Doctrine\RST\Kernel;
+use Doctrine\RST\Parser;
 use SymfonyDocsBuilder\Listener\AdmonitionListener;
 use SymfonyDocsBuilder\Listener\AssetsCopyListener;
 use SymfonyDocsBuilder\Listener\CopyImagesListener;
@@ -32,16 +33,27 @@ public function __construct(BuildConfig $buildConfig, ?Configuration $configurat
         $this->buildConfig = $buildConfig;
     }
 
+    public function createBuilder(): Builder
+    {
+        return new Builder($this->getConfiguration(), $this);
+    }
+
     public function initBuilder(Builder $builder): void
     {
+        $configuration = $builder->getConfiguration();
         $this->initializeListeners(
-            $builder->getConfiguration()->getEventManager(),
-            $builder->getErrorManager()
+            $configuration->getEventManager(),
+            $configuration->getErrorManager()
         );
 
         $builder->setScannerFinder($this->buildConfig->createFileFinder());
     }
 
+    public function createParser(): Parser
+    {
+        return new Parser($this->getConfiguration(), $this);
+    }
+
     private function initializeListeners(EventManager $eventManager, ErrorManager $errorManager)
     {
         $eventManager->addEventListener(

src/KernelFactory.php

@@ -13,20 +13,16 @@
 
 use Doctrine\RST\Configuration as RSTParserConfiguration;
 use Doctrine\RST\HTML\Directives\ClassDirective;
-use Doctrine\RST\Kernel;
 use SymfonyDocsBuilder\CI\UrlChecker;
 use SymfonyDocsBuilder\Directive as SymfonyDirectives;
 use SymfonyDocsBuilder\Reference as SymfonyReferences;
 use SymfonyDocsBuilder\Twig\AssetsExtension;
 use SymfonyDocsBuilder\Twig\TocExtension;
 use function Symfony\Component\String\u;
 
-/**
- * Class KernelFactory.
- */
 final class KernelFactory
 {
-    public static function createKernel(BuildConfig $buildConfig, ?UrlChecker $urlChecker = null): Kernel
+    public static function createKernel(BuildConfig $buildConfig, ?UrlChecker $urlChecker = null): DocsKernel
     {
         $configuration = new RSTParserConfiguration();
         // needed to avoid outputting parser errors on the console output or the webpage contents

src/Renderers/SpanNodeRenderer.php

@@ -112,6 +112,11 @@ public function escape(string $span): string
         return $this->decoratedSpanNodeRenderer->escape($span);
     }
 
+    public function interpretedText(string $text): string
+    {
+        return $this->decoratedSpanNodeRenderer->interpretedText($text);
+    }
+
     private function isExternalUrl($url): bool
     {
         return u($url)->containsAny('://');

src/SymfonyHTMLFormat.php

@@ -76,4 +76,9 @@ function (SpanNode $node) {
 
         return $nodeRendererFactories;
     }
+
+    public function getTextRoles(): array
+    {
+        return [];
+    }
 }

tests/IntegrationTest.php

@@ -99,8 +99,8 @@ public function testParseUnitBlock(string $blockName)
 
         $kernel = KernelFactory::createKernel($this->createBuildConfig(sprintf('%s/fixtures/source/blocks', __DIR__)));
         // necessary because this initializes some listeners on the kernel
-        $builder = new Builder($kernel);
-        $parser = new Parser($kernel);
+        $builder = $kernel->createBuilder();
+        $parser = $kernel->createParser();
 
         $sourceFile = sprintf('%s/fixtures/source/blocks/%s.rst', __DIR__, $blockName);
 

tests/fixtures/expected/main/index.html

@@ -11,9 +11,8 @@
 <h1 id="some-test-docs"><a class="headerlink" href="#some-test-docs" title="Permalink to this headline">Some Test Docs!</a></h1>
 <img src="_images/symfony-logo.png" />
 <div class="toctree-wrapper toc-size-md"><ul class="toctree toctree-level-1 toctree-length-2"><li><a href="datetime.html">DateTimeType Field</a><ul class="toctree toctree-level-2 toctree-length-4"><li><a href="datetime.html#field-options">Field Options</a></li><li><a href="datetime.html#overridden-options">Overridden Options</a></li><li><a href="datetime.html#field-variables">Field Variables</a></li><li><a href="datetime.html#url-checker-errors">Url checker errors</a></li></ul></li><li><a href="form/form_type.html">FormType Documentation</a></li></ul></div>
-<span id="reference-forms-type-date-format"></span>
 <div class="section">
-<h2 id="a-header"><a class="headerlink" href="#a-header" title="Permalink to this headline">A header</a></h2>
+<h2 id="reference-forms-type-date-format"><a class="headerlink" href="#reference-forms-type-date-format" title="Permalink to this headline">A header</a></h2>
 <p>Some info...</p>
 </div>
 </div>