Add getters for docParser/HtmlRenderer/extensions

src/Block/Element/Document.php

@@ -23,7 +23,7 @@ class Document extends AbstractBlock
     /***
      * @var ReferenceMap
      */
-    private $referenceMap;
+    protected $referenceMap;
 
     public function __construct()
     {

src/Block/Element/FencedCode.php

@@ -23,22 +23,22 @@ class FencedCode extends AbstractBlock
     /**
      * @var string
      */
-    private $info;
+    protected $info;
 
     /**
      * @var int
      */
-    private $length;
+    protected $length;
 
     /**
      * @var string
      */
-    private $char;
+    protected $char;
 
     /**
      * @var int
      */
-    private $offset;
+    protected $offset;
 
     /**
      * @param int $length

src/Block/Element/ListBlock.php

@@ -25,12 +25,12 @@ class ListBlock extends AbstractBlock
     /**
      * @var bool
      */
-    private $tight = false;
+    protected $tight = false;
 
     /**
      * @var ListData
      */
-    private $data;
+    protected $data;
 
     public function __construct(ListData $listData)
     {

src/Block/Element/ListItem.php

@@ -22,7 +22,7 @@ class ListItem extends AbstractBlock
     /**
      * @var ListData
      */
-    private $data;
+    protected $data;
 
     public function __construct(ListData $listData)
     {

src/Block/Element/Paragraph.php

@@ -90,7 +90,7 @@ public function finalize(ContextInterface $context)
      *
      * @return bool
      */
-    private function parseReferences(ContextInterface $context, Cursor $cursor)
+    protected function parseReferences(ContextInterface $context, Cursor $cursor)
     {
         $referenceFound = false;
         while ($cursor->getCharacter() === '[' && $context->getReferenceParser()->parse($cursor)) {

src/Block/Element/ReferenceDefinition.php

@@ -23,7 +23,7 @@ class ReferenceDefinition extends AbstractBlock
     /**
      * @var Reference
      */
-    private $reference;
+    protected $reference;
 
     public function __construct(Reference $reference)
     {

src/Block/Parser/ListParser.php

@@ -84,7 +84,7 @@ public function parse(ContextInterface $context, Cursor $cursor)
      *
      * @return int
      */
-    private function calculateListMarkerPadding($marker, $spacesAfterMarker, $rest)
+    protected function calculateListMarkerPadding($marker, $spacesAfterMarker, $rest)
     {
         $markerLength = strlen($marker);
 

src/CommonMarkConverter.php

@@ -58,4 +58,20 @@ public function convertToHtml($commonMark)
 
         return $this->htmlRenderer->renderBlock($documentAST);
     }
+
+    /**
+     * @return DocParser
+     */
+    public function getDocParser()
+    {
+        return $this->docParser;
+    }
+
+    /**
+     * @return HtmlRenderer
+     */
+    public function getHtmlRenderer()
+    {
+        return $this->htmlRenderer;
+    }
 }

src/Context.php

@@ -62,7 +62,7 @@ class Context implements ContextInterface
     /**
      * @var callable|null
      */
-    private $unmatchedBlockCloser;
+    protected $unmatchedBlockCloser;
 
     public function __construct(Document $document, Environment $environment)
     {

src/Cursor.php

@@ -18,30 +18,30 @@ class Cursor
     /**
      * @var string
      */
-    private $line;
+    protected $line;
 
     /**
      * @var int
      */
-    private $length;
+    protected $length;
 
     /**
      * @var int
      *
      * It's possible for this to be 1 char past the end, meaning we've parsed all chars and have
      * reached the end.  In this state, any character-returning method MUST return null.
      */
-    private $currentPosition = 0;
+    protected $currentPosition = 0;
 
     /**
      * @var int
      */
-    private $previousPosition = 0;
+    protected $previousPosition = 0;
 
     /**
      * @var int|null
      */
-    private $firstNonSpaceCache;
+    protected $firstNonSpaceCache;
 
     /**
      * @param string $line

src/CursorState.php

@@ -16,27 +16,27 @@ class CursorState
     /**
      * @var string
      */
-    private $line;
+    protected $line;
 
     /**
      * @var int
      */
-    private $length;
+    protected $length;
 
     /**
      * @var int
      */
-    private $currentPosition;
+    protected $currentPosition;
 
     /**
      * @var int
      */
-    private $previousPosition;
+    protected $previousPosition;
 
     /**
      * @var int|null
      */
-    private $firstNonSpaceCache;
+    protected $firstNonSpaceCache;
 
     /**
      * @param string $line

src/DocParser.php

@@ -31,7 +31,7 @@ class DocParser
     /**
      * @var InlineParserEngine
      */
-    private $inlineParserEngine;
+    protected $inlineParserEngine;
 
     /**
      * @param Environment $parsers
@@ -55,7 +55,7 @@ public function getEnvironment()
      *
      * @return string[]
      */
-    private function preProcessInput($input)
+    protected function preProcessInput($input)
     {
         // Remove any /n which appears at the very end of the string
         if (substr($input, -1) == "\n") {
@@ -89,7 +89,7 @@ public function parse($input)
         return $context->getDocument();
     }
 
-    private function incorporateLine(ContextInterface $context)
+    protected function incorporateLine(ContextInterface $context)
     {
         $cursor = new Cursor($context->getLine());
         $oldTip = $context->getTip();
@@ -158,7 +158,7 @@ private function incorporateLine(ContextInterface $context)
         }
     }
 
-    private function processInlines(ContextInterface $context, AbstractBlock $block)
+    protected function processInlines(ContextInterface $context, AbstractBlock $block)
     {
         if ($block instanceof AbstractInlineContainer) {
             $cursor = new Cursor(trim($block->getStringContent()));
@@ -179,7 +179,7 @@ private function processInlines(ContextInterface $context, AbstractBlock $block)
      * @param ContextInterface $context
      * @param AbstractBlock $block
      */
-    private function breakOutOfLists(ContextInterface $context, AbstractBlock $block)
+    protected function breakOutOfLists(ContextInterface $context, AbstractBlock $block)
     {
         $b = $block;
         $lastList = null;

src/Environment.php

@@ -24,6 +24,11 @@
 
 class Environment
 {
+    /**
+     * @var ExtensionInterface[]
+     */
+    protected $extensions;
+
     /**
      * @var BlockParserInterface[]
      */
@@ -218,6 +223,8 @@ public function createInlineParserEngine()
      */
     public function addExtension(ExtensionInterface $extension)
     {
+        $this->extensions[] = $extension;
+
         // Block parsers
         foreach ($extension->getBlockParsers() as $blockParser) {
             $this->addBlockParser($blockParser);
@@ -244,6 +251,14 @@ public function addExtension(ExtensionInterface $extension)
         }
     }
 
+    /**
+     * @return ExtensionInterface[]
+     */
+    public function getExtensions()
+    {
+        return $this->extensions;
+    }
+
     /**
      * @return Environment
      */

src/HtmlElement.php

@@ -7,22 +7,22 @@ class HtmlElement
     /**
      * @var string
      */
-    private $tagName;
+    protected $tagName;
 
     /**
      * @var string[]
      */
-    private $attributes = array();
+    protected $attributes = array();
 
     /**
      * @var HtmlElement|HtmlElement[]|string
      */
-    private $contents;
+    protected $contents;
 
     /**
      * @var bool
      */
-    private $selfClosing = false;
+    protected $selfClosing = false;
 
     /**
      * @param string $tagName

src/HtmlRenderer.php

@@ -142,4 +142,12 @@ public function renderBlocks($blocks, $inTightList = false)
 
         return implode($this->options['blockSeparator'], $result);
     }
+
+    /**
+     * @return Environment
+     */
+    public function getEnvironment()
+    {
+        return $this->environment;
+    }
 }

src/Inline/Element/InlineCollection.php

@@ -21,7 +21,7 @@ class InlineCollection extends AbstractInline
     /**
      * @var ArrayCollection|AbstractInline[]
      */
-    private $inlines;
+    protected $inlines;
 
     public function __construct($inlines)
     {

src/Inline/Element/Newline.php

@@ -19,7 +19,7 @@ class Newline extends AbstractInline
     const HARDBREAK = 0;
     const SOFTBREAK = 1;
 
-    private $type;
+    protected $type;
 
     /**
      * @param int $breakType

src/Inline/Parser/CloseBracketParser.php

@@ -34,7 +34,7 @@ class CloseBracketParser extends AbstractInlineParser implements EnvironmentAwar
     /**
      * @var Environment
      */
-    private $environment;
+    protected $environment;
 
     /**
      * @return string[]
@@ -120,7 +120,7 @@ public function setEnvironment(Environment $environment)
      * @param int $start
      * @param int $end
      */
-    private function nullify(ArrayCollection $collection, $start, $end)
+    protected function nullify(ArrayCollection $collection, $start, $end)
     {
         for ($i = $start; $i < $end; $i++) {
             $collection->set($i, null);
@@ -135,7 +135,7 @@ private function nullify(ArrayCollection $collection, $start, $end)
      *
      * @return array|bool
      */
-    private function tryParseLink(Cursor $cursor, ReferenceMap $referenceMap, Delimiter $opener, $startPos)
+    protected function tryParseLink(Cursor $cursor, ReferenceMap $referenceMap, Delimiter $opener, $startPos)
     {
         // Check to see if we have a link/image
         // Inline link?
@@ -155,7 +155,7 @@ private function tryParseLink(Cursor $cursor, ReferenceMap $referenceMap, Delimi
      *
      * @return array|bool
      */
-    private function tryParseInlineLinkAndTitle(Cursor $cursor)
+    protected function tryParseInlineLinkAndTitle(Cursor $cursor)
     {
         $cursor->advance();
         $cursor->advanceToFirstNonSpace();
@@ -188,7 +188,7 @@ private function tryParseInlineLinkAndTitle(Cursor $cursor)
      *
      * @return Reference|null
      */
-    private function tryParseReference(Cursor $cursor, ReferenceMap $referenceMap, Delimiter $opener, $startPos)
+    protected function tryParseReference(Cursor $cursor, ReferenceMap $referenceMap, Delimiter $opener, $startPos)
     {
         $savePos = $cursor->saveState();
         $cursor->advanceToFirstNonSpace();
@@ -217,7 +217,7 @@ private function tryParseReference(Cursor $cursor, ReferenceMap $referenceMap, D
      *
      * @return AbstractWebResource
      */
-    private function createInline($url, InlineCollection $labelInlines, $title, $isImage)
+    protected function createInline($url, InlineCollection $labelInlines, $title, $isImage)
     {
         if ($isImage) {
             return new Image($url, $labelInlines, $title);

src/InlineParserContext.php

@@ -19,9 +19,9 @@
 
 class InlineParserContext
 {
-    private $cursor;
-    private $inlines;
-    private $delimiterStack;
+    protected $cursor;
+    protected $inlines;
+    protected $delimiterStack;
 
     public function __construct(Cursor $cursor)
     {