Updated league/commonmark to the latest version due to security issues. Switched to strict mode. Fixed some minor type related issues.

Martin Brecht-Precht · Martin Brecht-Precht · commit 7545a3f0f298 · 2019-04-02T13:51:27.000+02:00
diff --git a/composer.json b/composer.json
@@ -32,6 +32,6 @@
 		"markenwerk/stack-util": "~1.0",
 		"markenwerk/string-builder": "^1.0.4",
 		"mustangostang/spyc": ">=0.6.1",
-		"league/commonmark": "^0.13"
+		"league/commonmark": "^0.18"
 	}
 }
diff --git a/src/Dispatcher/CommonmarkDispatcher.php b/src/Dispatcher/CommonmarkDispatcher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Dispatcher;
 
 use League\CommonMark\DocParser;
diff --git a/src/Dispatcher/CommonmarkUtil/DocumentProcessor.php b/src/Dispatcher/CommonmarkUtil/DocumentProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Dispatcher\CommonmarkUtil;
 
 use League\CommonMark\Block\Element\Document;
diff --git a/src/Dispatcher/CommonmarkUtil/MarkdomEventBridge.php b/src/Dispatcher/CommonmarkUtil/MarkdomEventBridge.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Dispatcher\CommonmarkUtil;
 
 use League\CommonMark\Block\Element\FencedCode;
diff --git a/src/Dispatcher/CommonmarkUtil/PlaintextWalker.php b/src/Dispatcher/CommonmarkUtil/PlaintextWalker.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Dispatcher\CommonmarkUtil;
 
 use League\CommonMark\Inline\Element\Code;
diff --git a/src/Dispatcher/EventDispatcher/SimpleMarkdomEventDispatcher.php b/src/Dispatcher/EventDispatcher/SimpleMarkdomEventDispatcher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Dispatcher\EventDispatcher;
 
 use Markdom\Common\BlockType;
@@ -319,7 +321,7 @@ public function onLineBreakContent(bool $hard): void
 	 * @param string $title
 	 * @return void
 	 */
-	public function onLinkContentBegin(string $uri, string $title): void
+	public function onLinkContentBegin(string $uri, ?string $title = null): void
 	{
 		$this->onContentBegin(ContentType::TYPE_LINK);
 		$this->markdomHandler->onLinkContentBegin($uri, $title);
diff --git a/src/Dispatcher/Exception/DispatcherException.php b/src/Dispatcher/Exception/DispatcherException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Dispatcher\Exception;
 
 /**
diff --git a/src/Dispatcher/HtmlProcessor/HtmlProcessorInterface.php b/src/Dispatcher/HtmlProcessor/HtmlProcessorInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Dispatcher\HtmlProcessor;
 
 use League\CommonMark\Block\Element\HtmlBlock;
diff --git a/src/Dispatcher/HtmlProcessor/HtmlTextProcessor.php b/src/Dispatcher/HtmlProcessor/HtmlTextProcessor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Dispatcher\HtmlProcessor;
 
 use League\CommonMark\Block\Element\HtmlBlock;
diff --git a/src/Dispatcher/JsonDispatcher.php b/src/Dispatcher/JsonDispatcher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Dispatcher;
 
 /**
diff --git a/src/Dispatcher/PhpObjectDispatcher.php b/src/Dispatcher/PhpObjectDispatcher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Dispatcher;
 
 use Markdom\Dispatcher\EventDispatcher\SimpleMarkdomEventDispatcher;
diff --git a/src/Dispatcher/XmlDispatcher.php b/src/Dispatcher/XmlDispatcher.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Dispatcher;
 
 use Markdom\Dispatcher\EventDispatcher\SimpleMarkdomEventDispatcher;
@@ -144,6 +146,9 @@ private function processListItems(\DOMNodeList $listItems)
 	{
 		for ($i = 0, $n = $listItems->length; $i < $n; $i++) {
 			$node = $listItems->item($i);
+			if ($node === null) {
+				continue;
+			}
 			$this->eventDispatcher->onListItemBegin();
 			$this->processBlocks($node->childNodes);
 			$this->eventDispatcher->onListItemEnd();
diff --git a/src/Handler/CommonmarkHandler.php b/src/Handler/CommonmarkHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler;
 
 use Markdom\Common\BlockType;
diff --git a/src/Handler/CommonmarkUtil/HandlerDelimiter.php b/src/Handler/CommonmarkUtil/HandlerDelimiter.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler\CommonmarkUtil;
 
 /**
diff --git a/src/Handler/DebugHandler.php b/src/Handler/DebugHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler;
 
 use Markdom\HandlerInterface\HandlerInterface;
diff --git a/src/Handler/Exception/HandlerException.php b/src/Handler/Exception/HandlerException.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler\Exception;
 
 /**
diff --git a/src/Handler/HtmlHandler.php b/src/Handler/HtmlHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler;
 
 use Markdom\Common\EmphasisLevel;
@@ -32,7 +34,7 @@ class HtmlHandler implements HandlerInterface
 	/**
 	 * @var bool
 	 */
-	private $escapeHtml = false;
+	private $escapeHtml = true;
 
 	/**
 	 * @var bool
diff --git a/src/Handler/HtmlTagBuilder/HtmlTagBuilder.php b/src/Handler/HtmlTagBuilder/HtmlTagBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler\HtmlTagBuilder;
 
 use Markdom\Common\HeadingLevel;
@@ -17,15 +19,15 @@ class HtmlTagBuilder implements TagBuilderInterface
 	 * @param string $type
 	 * @param string $value
 	 * @param array $attributes
-	 * @param string $variant
+	 * @param mixed $variant
 	 * @return string
 	 * @throws HandlerException
 	 */
 	public function buildTag(
 		string $type,
 		?string $value = null,
 		?array $attributes = array(),
-		?string $variant = null
+		$variant = null
 	): string {
 		switch ($type) {
 			case self::TYPE_CODE_BLOCK:
diff --git a/src/Handler/HtmlTagBuilder/TagBuilderInterface.php b/src/Handler/HtmlTagBuilder/TagBuilderInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler\HtmlTagBuilder;
 
 /**
@@ -39,14 +41,14 @@ interface TagBuilderInterface
 	 * @param string $type
 	 * @param string $value
 	 * @param array $attributes
-	 * @param string $variant
+	 * @param mixed $variant
 	 * @return string
 	 */
 	public function buildTag(
 		string $type,
 		?string $value = null,
 		?array $attributes = array(),
-		?string $variant = null
+		$variant = null
 	): string;
 
 }
diff --git a/src/Handler/HtmlTagBuilder/XhtmlTagBuilder.php b/src/Handler/HtmlTagBuilder/XhtmlTagBuilder.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler\HtmlTagBuilder;
 
 use Markdom\Handler\Exception\HandlerException;
@@ -16,15 +18,15 @@ class XhtmlTagBuilder extends HtmlTagBuilder
 	 * @param string $type
 	 * @param string $value
 	 * @param array $attributes
-	 * @param string $variant
+	 * @param mixed $variant
 	 * @return string
 	 * @throws HandlerException
 	 */
 	public function buildTag(
 		string $type,
 		?string $value = null,
 		?array $attributes = array(),
-		?string $variant = null
+		$variant = null
 	): string {
 		switch ($type) {
 			case self::TYPE_DIVISION:
diff --git a/src/Handler/JsonHandler.php b/src/Handler/JsonHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler;
 
 /**
diff --git a/src/Handler/PhpObjectHandler.php b/src/Handler/PhpObjectHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler;
 
 use Markdom\Handler\TypeNameTranslator\KeyNameTranslator;
diff --git a/src/Handler/TypeNameTranslator/KeyNameTranslator.php b/src/Handler/TypeNameTranslator/KeyNameTranslator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler\TypeNameTranslator;
 
 /**
diff --git a/src/Handler/XhtmlHandler.php b/src/Handler/XhtmlHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler;
 
 use Markdom\Handler\HtmlTagBuilder\XhtmlTagBuilder;
diff --git a/src/Handler/XmlHandler.php b/src/Handler/XmlHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler;
 
 use Markdom\Handler\TypeNameTranslator\KeyNameTranslator;
diff --git a/src/Handler/YamlHandler.php b/src/Handler/YamlHandler.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Markdom\Handler;
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@`
`32`	`32`	`"markenwerk/stack-util": "~1.0",`
`33`	`33`	`"markenwerk/string-builder": "^1.0.4",`
`34`	`34`	`"mustangostang/spyc": ">=0.6.1",`
`35`		`- "league/commonmark": "^0.13"`
	`35`	`+ "league/commonmark": "^0.18"`
`36`	`36`	`}`
`37`	`37`	`}`
-Original file line number
+Diff line change
@@ @@ -1,5 +1,7 @@ @@
 <?php
 +declare(strict_types=1);
++
 namespace Markdom\Dispatcher\Exception;
 /**