code style fixes and trait consistency

Author: cebe

CHANGELOG.md

@@ -39,13 +39,13 @@ Version 1.1.0 on 06. Mar. 2015
 - Lines containing "0" where skipped or considered empty in some cases (@tanakahisateru)
 - #54 escape characters are now also considered inside of urls
 
-Version 1.0.1 on 25. Okt. 2014
+Version 1.0.1 on 25. Oct. 2014
 ------------------------------
 
 - Fixed the `bin/markdown` script to work with composer autoloader (c497bada0e15f61873ba6b2e29f4bb8b3ef2a489)
 - #74 fixed a bug that caused a bunch of broken characters when non-ASCII input was given. Parser now handles UTF-8 input correctly. Other encodings are currently untested, UTF-8 is recommended.
 
-Version 1.0.0 on 12. Okt. 2014
+Version 1.0.0 on 12. Oct. 2014
 ------------------------------
 
 This is the first stable release of version 1.0 which is incompatible to the 0.9.x branch regarding the internal API which is used when extending the Markdown parser. The external API has no breaking changes. The rendered Markdown however has changed in some edge cases and some rendering issues have been fixed.
@@ -58,7 +58,7 @@ You can try it out on the website: <http://markdown.cebe.cc/try>
 
 The parser is now also regsitered on the [Babelmark 2 page](http://johnmacfarlane.net/babelmark2/?normalize=1&text=Hello+**World**!) by [John MacFarlane](http://johnmacfarlane.net/) which you can use to compare Markdown output of different parsers.
 
-Version 1.0.0-rc on 10. Okt. 2014
+Version 1.0.0-rc on 10. Oct. 2014
 ---------------------------------
 
 - #21 speed up inline parsing using [strpbrk](http://www.php.net/manual/de/function.strpbrk.php) about 20% speedup compared to parsing before.

Parser.php

@@ -21,7 +21,7 @@ abstract class Parser
 	public $maximumNestingLevel = 32;
 
 	/**
-	 * @var string the current context the parser is in.
+	 * @var array the current context the parser is in.
 	 * TODO remove in favor of absy
 	 */
 	protected $context = [];

inline/EmphStrongTrait.php

@@ -54,8 +54,8 @@ protected function parseEmphStrong($text)
 				return [['text', $text[0]], 1];
 			}
 
-			if ($marker == '*' && preg_match('/^[*]((?:[^*]|[*][*][^*]+?[*][*])+?)[*](?![*][^*])/s', $text, $matches) ||
-				$marker == '_' && preg_match('/^_((?:[^_]|__[^_]*__)+?)_(?!_[^_])\b/us', $text, $matches)) {
+			if ($marker === '*' && preg_match('/^[*]((?:[^*]|[*][*][^*]+?[*][*])+?)[*](?![*][^*])/s', $text, $matches) ||
+				$marker === '_' && preg_match('/^_((?:[^_]|__[^_]*__)+?)_(?!_[^_])\b/us', $text, $matches)) {
 				return [
 					[
 						'emph',
@@ -77,4 +77,7 @@ protected function renderEmph($block)
 	{
 		return '<em>' . $this->renderAbsy($block[1]) . '</em>';
 	}
+
+    abstract protected function parseInline($text);
+    abstract protected function renderAbsy($blocks);
 }

inline/StrikeoutTrait.php

@@ -34,4 +34,7 @@ protected function renderStrike($block)
 	{
 		return '<del>' . $this->renderAbsy($block[1]) . '</del>';
 	}
+
+    abstract protected function parseInline($text);
+    abstract protected function renderAbsy($blocks);
 }