donami / ctable

vendor/anax/mvc/3pp/php-markdown/Michelf/Markdown.php

Doc Comments +26 added lines

@@ -25,6 +25,9 @@ 
 
 	### Simple Function Interface ###
 
+	/**
+	 * @param string $text
+	 */
 	public static function defaultTransform($text) {
 	#
 	# Initialize the parser and return the result of its transform method.
@@ -866,6 +869,10 @@ 
 
 	protected $list_level = 0;
 
+	/**
+	 * @param string $list_str
+	 * @param string $marker_any_re
+	 */
 	protected function processListItems($list_str, $marker_any_re) {
 	#
 	#	Process the contents of a single ordered or unordered list, splitting it
@@ -969,6 +976,9 @@ 
 	}
 
 
+	/**
+	 * @param string $code
+	 */
 	protected function makeCodeSpan($code) {
 	#
 	# Create a code span markup for $code. Called from handleSpanToken.
@@ -1461,6 +1471,9 @@ 
 	# hanlde UTF-8 if the default function does not exist.
 	protected $utf8_strlen = 'mb_strlen';
 	
+	/**
+	 * @param string $text
+	 */
 	protected function detab($text) {
 	#
 	# Replace tabs with the appropriate amount of space.
@@ -2018,6 +2031,12 @@ 
 		
 		return array($parsed, $text);
 	}
+
+	/**
+	 * @param string $text
+	 * @param string $hash_method
+	 * @param boolean $md_attr
+	 */
 	protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
 	#
 	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
@@ -2568,6 +2587,10 @@ 
 		
 		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
 	}
+
+	/**
+	 * @param string $alignname
+	 */
 	protected function _doTable_makeAlignAttr($alignname)
 	{
 		if (empty($this->table_align_class_tmpl))
@@ -2694,6 +2717,9 @@ 
 	}
 
 
+	/**
+	 * @return string
+	 */
 	protected function processDefListItems($list_str) {
 	#
 	#	Process the contents of a single definition list, splitting it

Spacing +196 added lines, -196 removed lines

@@ -21,7 +21,7 @@ 
 
 	### Version ###
 
-	const  MARKDOWNLIB_VERSION  =  "1.4.0";
+	const  MARKDOWNLIB_VERSION = "1.4.0";
 
 	### Simple Function Interface ###
 
@@ -35,7 +35,7 @@ 
 
 		# try to take parser from the static parser list
 		static $parser_list;
-		$parser =& $parser_list[$parser_class];
+		$parser = & $parser_list[$parser_class];
 
 		# create the parser it not already set
 		if (!$parser)
@@ -83,14 +83,14 @@ 
 		$this->prepareItalicsAndBold();
 	
 		$this->nested_brackets_re = 
-			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth).
+			str_repeat('(?>[^\[\]]+|\[', $this->nested_brackets_depth) .
 			str_repeat('\])*', $this->nested_brackets_depth);
 	
 		$this->nested_url_parenthesis_re = 
-			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth).
+			str_repeat('(?>[^()\s]+|\(', $this->nested_url_parenthesis_depth) .
 			str_repeat('(?>\)))*', $this->nested_url_parenthesis_depth);
 		
-		$this->escape_chars_re = '['.preg_quote($this->escape_chars).']';
+		$this->escape_chars_re = '[' . preg_quote($this->escape_chars) . ']';
 		
 		# Sort document, block, and span gamut in ascendent priority order.
 		asort($this->document_gamut);
@@ -188,7 +188,7 @@ 
 
 		# Link defs are in the form: ^[id]: url "optional title"
 		$text = preg_replace_callback('{
-							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
+							^[ ]{0,'.$less_than_tab . '}\[(.+)\][ ]?:	# id = $1
 							  [ ]*
 							  \n?				# maybe *one* newline
 							  [ ]*
@@ -217,7 +217,7 @@ 
 		$link_id = strtolower($matches[1]);
 		$url = $matches[2] == '' ? $matches[3] : $matches[2];
 		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
+		$this->titles[$link_id] = & $matches[4];
 		return ''; # String that will replace the block
 	}
 
@@ -241,9 +241,9 @@ 
 		# *  List "b" is made of tags which are always block-level;
 		#
 		$block_tags_a_re = 'ins|del';
-		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'.
-						   'script|noscript|form|fieldset|iframe|math|svg|'.
-						   'article|section|nav|aside|hgroup|header|footer|'.
+		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|' .
+						   'script|noscript|form|fieldset|iframe|math|svg|' .
+						   'article|section|nav|aside|hgroup|header|footer|' .
 						   'figure';
 
 		# Regular expression for the content of a block tag.
@@ -268,12 +268,12 @@ 
 				  [^<]+			# content without tag
 				|
 				  <\2			# nested opening tag
-					'.$attr.'	# attributes
+					'.$attr . '	# attributes
 					(?>
 					  />
 					|
-					  >', $nested_tags_level).	# end of opening tag
-					  '.*?'.					# last level nested tag content
+					  >', $nested_tags_level) . # end of opening tag
+					  '.*?' . # last level nested tag content
 			str_repeat('
 					  </\2\s*>	# closing nested tag
 					)
@@ -306,20 +306,20 @@ 
 			  # Match from `\n<tag>` to `</tag>\n`, handling nested tags 
 			  # in between.
 					
-						[ ]{0,'.$less_than_tab.'}
-						<('.$block_tags_b_re.')# start tag = $2
-						'.$attr.'>			# attributes followed by > and \n
-						'.$content.'		# content, support nesting
+						[ ]{0,'.$less_than_tab . '}
+						<('.$block_tags_b_re . ')# start tag = $2
+						'.$attr . '>			# attributes followed by > and \n
+						'.$content . '		# content, support nesting
 						</\2>				# the matching end tag
 						[ ]*				# trailing spaces/tabs
 						(?=\n+|\Z)	# followed by a newline or end of document
 
 			| # Special version for tags of group a.
 
-						[ ]{0,'.$less_than_tab.'}
-						<('.$block_tags_a_re.')# start tag = $3
-						'.$attr.'>[ ]*\n	# attributes followed by >
-						'.$content2.'		# content, support nesting
+						[ ]{0,'.$less_than_tab . '}
+						<('.$block_tags_a_re . ')# start tag = $3
+						'.$attr . '>[ ]*\n	# attributes followed by >
+						'.$content2 . '		# content, support nesting
 						</\3>				# the matching end tag
 						[ ]*				# trailing spaces/tabs
 						(?=\n+|\Z)	# followed by a newline or end of document
@@ -327,16 +327,16 @@ 
 			| # Special case just for <hr />. It was easier to make a special 
 			  # case than to make the other regex more complicated.
 			
-						[ ]{0,'.$less_than_tab.'}
+						[ ]{0,'.$less_than_tab . '}
 						<(hr)				# start tag = $2
-						'.$attr.'			# attributes
+						'.$attr . '			# attributes
 						/?>					# the matching end tag
 						[ ]*
 						(?=\n{2,}|\Z)		# followed by a blank line or end of document
 			
 			| # Special case for standalone HTML comments:
 			
-					[ ]{0,'.$less_than_tab.'}
+					[ ]{0,'.$less_than_tab . '}
 					(?s:
 						<!-- .*? -->
 					)
@@ -345,7 +345,7 @@ 
 			
 			| # PHP and ASP-style processor instructions (<? and <%)
 			
-					[ ]{0,'.$less_than_tab.'}
+					[ ]{0,'.$less_than_tab . '}
 					(?s:
 						<([?%])			# $2
 						.*?
@@ -456,7 +456,7 @@ 
 				[ ]*		# Tailing spaces
 				$			# End of line.
 			}mx',
-			"\n".$this->hashBlock("<hr$this->empty_element_suffix")."\n", 
+			"\n" . $this->hashBlock("<hr$this->empty_element_suffix") . "\n", 
 			$text);
 	}
 
@@ -520,7 +520,7 @@ 
 		$text = preg_replace_callback('{
 			(					# wrap whole match in $1
 			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
+				('.$this->nested_brackets_re . ')	# link text = $2
 			  \]
 
 			  [ ]?				# one optional space
@@ -539,14 +539,14 @@ 
 		$text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
+				('.$this->nested_brackets_re . ')	# link text = $2
 			  \]
 			  \(			# literal paren
 				[ \n]*
 				(?:
 					<(.+?)>	# href = $3
 				|
-					('.$this->nested_url_parenthesis_re.')	# href = $4
+					('.$this->nested_url_parenthesis_re . ')	# href = $4
 				)
 				[ \n]*
 				(			# $5
@@ -578,9 +578,9 @@ 
 		return $text;
 	}
 	protected function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
+		$whole_match = $matches[1];
+		$link_text   = $matches[2];
+		$link_id     = & $matches[3];
 
 		if ($link_id == "") {
 			# for shortcut links like [this][] or [this].
@@ -596,10 +596,10 @@ 
 			$url = $this->encodeAttribute($url);
 			
 			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
+			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 		
 			$link_text = $this->runSpanGamut($link_text);
@@ -612,17 +612,17 @@ 
 		return $result;
 	}
 	protected function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
+		$whole_match = $matches[1];
+		$link_text = $this->runSpanGamut($matches[2]);
+		$url = $matches[3] == '' ? $matches[4] : $matches[3];
+		$title = & $matches[7];
 
 		$url = $this->encodeAttribute($url);
 
 		$result = "<a href=\"$url\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 		
 		$link_text = $this->runSpanGamut($link_text);
@@ -642,7 +642,7 @@ 
 		$text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
+				('.$this->nested_brackets_re . ')		# alt text = $2
 			  \]
 
 			  [ ]?				# one optional space
@@ -663,7 +663,7 @@ 
 		$text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
+				('.$this->nested_brackets_re . ')		# alt text = $2
 			  \]
 			  \s?			# One optional whitespace character
 			  \(			# literal paren
@@ -671,7 +671,7 @@ 
 				(?:
 					<(\S*)>	# src url = $3
 				|
-					('.$this->nested_url_parenthesis_re.')	# src url = $4
+					('.$this->nested_url_parenthesis_re . ')	# src url = $4
 				)
 				[ \n]*
 				(			# $5
@@ -703,7 +703,7 @@ 
 			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
@@ -716,17 +716,17 @@ 
 		return $result;
 	}
 	protected function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
+		$whole_match = $matches[1];
+		$alt_text = $matches[2];
+		$url = $matches[3] == '' ? $matches[4] : $matches[3];
+		$title = & $matches[7];
 
 		$alt_text = $this->encodeAttribute($alt_text);
 		$url = $this->encodeAttribute($url);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; # $title already quoted
+			$result .= " title=\"$title\""; # $title already quoted
 		}
 		$result .= $this->empty_element_suffix;
 
@@ -770,12 +770,12 @@ 
 			return $matches[0];
 		
 		$level = $matches[2]{0} == '=' ? 1 : 2;
-		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
+		$block = "<h$level>" . $this->runSpanGamut($matches[1]) . "</h$level>";
 		return "\n" . $this->hashBlock($block) . "\n\n";
 	}
 	protected function _doHeaders_callback_atx($matches) {
 		$level = strlen($matches[1]);
-		$block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
+		$block = "<h$level>" . $this->runSpanGamut($matches[2]) . "</h$level>";
 		return "\n" . $this->hashBlock($block) . "\n\n";
 	}
 
@@ -801,8 +801,8 @@ 
 			$whole_list_re = '
 				(								# $1 = whole list
 				  (								# $2
-					([ ]{0,'.$less_than_tab.'})	# $3 = number of spaces
-					('.$marker_re.')			# $4 = first list item marker
+					([ ]{0,'.$less_than_tab . '})	# $3 = number of spaces
+					('.$marker_re . ')			# $4 = first list item marker
 					[ ]+
 				  )
 				  (?s:.+?)
@@ -813,13 +813,13 @@ 
 					  (?=\S)
 					  (?!						# Negative lookahead for another list item marker
 						[ ]*
-						'.$marker_re.'[ ]+
+						'.$marker_re . '[ ]+
 					  )
 					|
 					  (?=						# Lookahead for another kind of list
 					    \n
 						\3						# Must have the same indentation
-						'.$other_marker_re.'[ ]+
+						'.$other_marker_re . '[ ]+
 					  )
 				  )
 				)
@@ -831,14 +831,14 @@ 
 			if ($this->list_level) {
 				$text = preg_replace_callback('{
 						^
-						'.$whole_list_re.'
+						'.$whole_list_re . '
 					}mx',
 					array(&$this, '_doLists_callback'), $text);
 			}
 			else {
 				$text = preg_replace_callback('{
 						(?:(?<=\n)\n|\A\n?) # Must eat the newline
-						'.$whole_list_re.'
+						'.$whole_list_re . '
 					}mx',
 					array(&$this, '_doLists_callback'), $text);
 			}
@@ -855,13 +855,13 @@ 
 		$list = $matches[1];
 		$list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
 		
-		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
+		$marker_any_re = ($list_type == "ul" ? $marker_ul_re : $marker_ol_re);
 		
 		$list .= "\n";
 		$result = $this->processListItems($list, $marker_any_re);
 		
 		$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
-		return "\n". $result ."\n\n";
+		return "\n" . $result . "\n\n";
 	}
 
 	protected $list_level = 0;
@@ -900,12 +900,12 @@ 
 		$list_str = preg_replace_callback('{
 			(\n)?							# leading line = $1
 			(^[ ]*)							# leading whitespace = $2
-			('.$marker_any_re.'				# list marker and space = $3
+			('.$marker_any_re . '				# list marker and space = $3
 				(?:[ ]+|(?=\n))	# space only required if item is not empty
 			)
 			((?s:.*?))						# list item text   = $4
 			(?:(\n+(?=\n))|\n)				# tailing blank line = $5
-			(?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
+			(?= \n* (\z | \2 ('.$marker_any_re . ') (?:[ ]+|(?=\n))))
 			}xm',
 			array(&$this, '_processListItems_callback'), $list_str);
 
@@ -914,17 +914,17 @@ 
 	}
 	protected function _processListItems_callback($matches) {
 		$item = $matches[4];
-		$leading_line =& $matches[1];
-		$leading_space =& $matches[2];
+		$leading_line = & $matches[1];
+		$leading_space = & $matches[2];
 		$marker_space = $matches[3];
-		$tailing_blank_line =& $matches[5];
+		$tailing_blank_line = & $matches[5];
 
 		if ($leading_line || $tailing_blank_line || 
 			preg_match('/\n{2,}/', $item))
 		{
 			# Replace marker with the appropriate whitespace indentation
 			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
-			$item = $this->runBlockGamut($this->outdent($item)."\n");
+			$item = $this->runBlockGamut($this->outdent($item) . "\n");
 		}
 		else {
 			# Recursion for sub-lists:
@@ -945,11 +945,11 @@ 
 				(?:\n\n|\A\n?)
 				(	            # $1 = the code block -- one or more lines, starting with a space/tab
 				  (?>
-					[ ]{'.$this->tab_width.'}  # Lines must start with a tab or a tab-width of spaces
+					[ ]{'.$this->tab_width . '}  # Lines must start with a tab or a tab-width of spaces
 					.*\n+
 				  )+
 				)
-				((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
+				((?=^[ ]{0,'.$this->tab_width . '}\S)|\Z)	# Lookahead for non-space at line-start, or end of doc
 			}xm',
 			array(&$this, '_doCodeBlocks_callback'), $text);
 
@@ -965,7 +965,7 @@ 
 		$codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
 
 		$codeblock = "<pre><code>$codeblock\n</code></pre>";
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+		return "\n\n" . $this->hashBlock($codeblock) . "\n\n";
 	}
 
 
@@ -1011,7 +1011,7 @@ 
 				$token_relist[] = $strong_re;
 				
 				# Construct master expression from list.
-				$token_re = '{('. implode('|', $token_relist) .')}';
+				$token_re = '{(' . implode('|', $token_relist) . ')}';
 				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
 			}
 		}
@@ -1037,8 +1037,8 @@ 
 			#
 			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
 			$text_stack[0] .= $parts[0];
-			$token =& $parts[1];
-			$text =& $parts[2];
+			$token = & $parts[1];
+			$text = & $parts[2];
 			
 			if (empty($token)) {
 				# Reached end of text span: empty stack without emitting.
@@ -1065,7 +1065,7 @@ 
 				} else {
 					# Other closing marker: close one em or strong and
 					# change current token state to match the other
-					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
+					$token_stack[0] = str_repeat($token{0}, 3 - $token_len);
 					$tag = $token_len == 2 ? "strong" : "em";
 					$span = $text_stack[0];
 					$span = $this->runSpanGamut($span);
@@ -1159,7 +1159,7 @@ 
 		$bq = $matches[1];
 		# trim one level of quoting - trim whitespace-only lines
 		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-		$bq = $this->runBlockGamut($bq);		# recurse
+		$bq = $this->runBlockGamut($bq); # recurse
 
 		$bq = preg_replace('/^/m', "  ", $bq);
 		# These leading spaces cause problem with <pre> content, 
@@ -1167,7 +1167,7 @@ 
 		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx', 
 			array(&$this, '_doBlockQuotes_callback2'), $bq);
 
-		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
+		return "\n" . $this->hashBlock("<blockquote>\n$bq\n</blockquote>") . "\n\n";
 	}
 	protected function _doBlockQuotes_callback2($matches) {
 		$pre = $matches[1];
@@ -1302,7 +1302,7 @@ 
 			>
 			}xi',
 			array(&$this, '_doAutoLinks_email_callback'), $text);
-		$text = preg_replace_callback('{<(tel:([^\'">\s]+))>}i',array(&$this, '_doAutoLinks_tel_callback'), $text);
+		$text = preg_replace_callback('{<(tel:([^\'">\s]+))>}i', array(&$this, '_doAutoLinks_tel_callback'), $text);
 
 		return $text;
 	}
@@ -1342,7 +1342,7 @@ 
 	#
 		$addr = "mailto:" . $addr;
 		$chars = preg_split('/(?<!^)(?!$)/', $addr);
-		$seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
+		$seed = (int) abs(crc32($addr) / strlen($addr)); # Deterministic seed.
 		
 		foreach ($chars as $key => $char) {
 			$ord = ord($char);
@@ -1352,8 +1352,8 @@ 
 				# roughly 10% raw, 45% hex, 45% dec
 				# '@' *must* be encoded. I insist.
 				if ($r > 90 && $char != '@') /* do nothing */;
-				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
-				else              $chars[$key] = '&#'.$ord.';';
+				else if ($r < 45) $chars[$key] = '&#x' . dechex($ord) . ';';
+				else              $chars[$key] = '&#' . $ord . ';';
 			}
 		}
 		
@@ -1374,11 +1374,11 @@ 
 		
 		$span_re = '{
 				(
-					\\\\'.$this->escape_chars_re.'
+					\\\\'.$this->escape_chars_re . '
 				|
 					(?<![`\\\\])
 					`+						# code span marker
-			'.( $this->no_markup ? '' : '
+			'.($this->no_markup ? '' : '
 				|
 					<!--    .*?     -->		# comment
 				|
@@ -1394,7 +1394,7 @@ 
 					<[-a-zA-Z0-9:_]+\s*/> # xml-style empty tag
 				|
 					</[-a-zA-Z0-9:_]+\s*> # closing tag
-			').'
+			') . '
 				)
 				}xs';
 
@@ -1432,10 +1432,10 @@ 
 	#
 		switch ($token{0}) {
 			case "\\":
-				return $this->hashPart("&#". ord($token{1}). ";");
+				return $this->hashPart("&#" . ord($token{1}) . ";");
 			case "`":
 				# Search for end marker in remaining text.
-				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm', 
+				if (preg_match('/^(.*?[^`])' . preg_quote($token) . '(?!`)(.*)$/sm', 
 					$str, $matches))
 				{
 					$str = $matches[2];
@@ -1453,7 +1453,7 @@ 
 	#
 	# Remove one level of line-leading tabs or spaces
 	#
-		return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
+		return preg_replace('/^(\t|[ ]{1,' . $this->tab_width . '})/m', '', $text);
 	}
 
 
@@ -1676,10 +1676,10 @@ 
 		# compose attributes as string
 		$attr_str = "";
 		if (!empty($id)) {
-			$attr_str .= ' id="'.$id.'"';
+			$attr_str .= ' id="' . $id . '"';
 		}
 		if (!empty($classes)) {
-			$attr_str .= ' class="'.implode(" ", $classes).'"';
+			$attr_str .= ' class="' . implode(" ", $classes) . '"';
 		}
 		return $attr_str;
 	}
@@ -1694,7 +1694,7 @@ 
 
 		# Link defs are in the form: ^[id]: url "optional title"
 		$text = preg_replace_callback('{
-							^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?:	# id = $1
+							^[ ]{0,'.$less_than_tab . '}\[(.+)\][ ]?:	# id = $1
 							  [ ]*
 							  \n?				# maybe *one* newline
 							  [ ]*
@@ -1713,7 +1713,7 @@ 
 								[")]
 								[ ]*
 							)?	# title is optional
-					(?:[ ]* '.$this->id_class_attr_catch_re.' )?  # $5 = extra id & class attr
+					(?:[ ]* '.$this->id_class_attr_catch_re . ' )?  # $5 = extra id & class attr
 							(?:\n+|\Z)
 			}xm',
 			array(&$this, '_stripLinkDefinitions_callback'),
@@ -1724,8 +1724,8 @@ 
 		$link_id = strtolower($matches[1]);
 		$url = $matches[2] == '' ? $matches[3] : $matches[2];
 		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
-		$this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]);
+		$this->titles[$link_id] = & $matches[4];
+		$this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy = & $matches[5]);
 		return ''; # String that will replace the block
 	}
 
@@ -1770,7 +1770,7 @@ 
 		#
 		# Call the HTML-in-Markdown hasher.
 		#
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		list($text,) = $this->_hashHTMLBlocks_inMarkdown($text);
 		
 		return $text;
 	}
@@ -1819,10 +1819,10 @@ 
 				(					# $2: Capture whole tag.
 					</?					# Any opening or closing tag.
 						(?>				# Tag name.
-							'.$this->block_tags_re.'			|
-							'.$this->context_block_tags_re.'	|
-							'.$this->clean_tags_re.'        	|
-							(?!\s)'.$enclosing_tag_re.'
+							'.$this->block_tags_re . '			|
+							'.$this->context_block_tags_re . '	|
+							'.$this->clean_tags_re . '        	|
+							(?!\s)'.$enclosing_tag_re . '
 						)
 						(?:
 							(?=[\s"\'/a-zA-Z0-9])	# Allowed characters after tag name.
@@ -1839,27 +1839,27 @@ 
 					<\?.*?\?> | <%.*?%>	# Processing instruction
 				|
 					<!\[CDATA\[.*?\]\]>	# CData Block
-				'. ( !$span ? ' # If not in span.
+				'. (!$span ? ' # If not in span.
 				|
 					# Indented code block
 					(?: ^[ ]*\n | ^ | \n[ ]*\n )
-					[ ]{'.($indent+4).'}[^\n]* \n
+					[ ]{'.($indent + 4) . '}[^\n]* \n
 					(?>
-						(?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
+						(?: [ ]{'.($indent + 4) . '}[^\n]* | [ ]* ) \n
 					)*
 				|
 					# Fenced code block marker
 					(?<= ^ | \n )
-					[ ]{0,'.($indent+3).'}(?:~{3,}|`{3,})
+					[ ]{0,'.($indent + 3) . '}(?:~{3,}|`{3,})
 									[ ]*
 					(?:
 					\.?[-_:a-zA-Z0-9]+ # standalone class name
 					|
-						'.$this->id_class_attr_nocatch_re.' # extra attributes
+						'.$this->id_class_attr_nocatch_re . ' # extra attributes
 					)?
 					[ ]*
 					(?= \n )
-				' : '' ). ' # End (if not is span).
+				' : '') . ' # End (if not is span).
 				|
 					# Code span marker
 					# Note, this regex needs to go after backtick fenced
@@ -1870,8 +1870,8 @@ 
 			}xs';
 
 		
-		$depth = 0;		# Current depth inside the tag tree.
-		$parsed = "";	# Parsed text that will be returned.
+		$depth = 0; # Current depth inside the tag tree.
+		$parsed = ""; # Parsed text that will be returned.
 
 		#
 		# Loop through every tag until we find the closing tag of the parent
@@ -1912,11 +1912,11 @@ 
 			# Note: need to recheck the whole tag to disambiguate backtick
 			# fences from code spans
 			#
-			if (preg_match('{^\n?([ ]{0,'.($indent+3).'})(~{3,}|`{3,})[ ]*(?:\.?[-_:a-zA-Z0-9]+|'.$this->id_class_attr_nocatch_re.')?[ ]*\n?$}', $tag, $capture)) {
+			if (preg_match('{^\n?([ ]{0,' . ($indent + 3) . '})(~{3,}|`{3,})[ ]*(?:\.?[-_:a-zA-Z0-9]+|' . $this->id_class_attr_nocatch_re . ')?[ ]*\n?$}', $tag, $capture)) {
 				# Fenced code block marker: find matching end marker.
 				$fence_indent = strlen($capture[1]); # use captured indent in re
 				$fence_re = $capture[2]; # use captured fence in re
-				if (preg_match('{^(?>.*\n)*?[ ]{'.($fence_indent).'}'.$fence_re.'[ ]*(?:\n|$)}', $text,
+				if (preg_match('{^(?>.*\n)*?[ ]{' . ($fence_indent) . '}' . $fence_re . '[ ]*(?:\n|$)}', $text,
 					$matches)) 
 				{
 					# End marker found: pass text unchanged until marker.
@@ -1943,7 +1943,7 @@ 
 			else if ($tag{0} == "`") {
 				# Find corresponding end marker.
 				$tag_re = preg_quote($tag);
-				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)'.$tag_re.'(?!`)}',
+				if (preg_match('{^(?>.+?|\n(?!\n))*?(?<!`)' . $tag_re . '(?!`)}',
 					$text, $matches))
 				{
 					# End marker found: pass text unchanged until marker.
@@ -1960,10 +1960,10 @@ 
 			#            Opening Context Block tag (like ins and del) 
 			#               used as a block tag (tag is alone on it's line).
 			#
-			else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
-				(	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
+			else if (preg_match('{^<(?:' . $this->block_tags_re . ')\b}', $tag) ||
+				(preg_match('{^<(?:' . $this->context_block_tags_re . ')\b}', $tag) &&
 					preg_match($newline_before_re, $parsed) &&
-					preg_match($newline_after_re, $text)	)
+					preg_match($newline_after_re, $text))
 				)
 			{
 				# Need to parse tag and following text using the HTML parser.
@@ -1977,7 +1977,7 @@ 
 			# Check for: Clean tag (like script, math)
 			#            HTML Comments, processing instructions.
 			#
-			else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
+			else if (preg_match('{^<(?:' . $this->clean_tags_re . ')\b}', $tag) ||
 				$tag{1} == '!' || $tag{1} == '?')
 			{
 				# Need to parse tag and following text using the HTML parser.
@@ -1992,13 +1992,13 @@ 
 			#
 			else if ($enclosing_tag_re !== '' &&
 				# Same name as enclosing tag.
-				preg_match('{^</?(?:'.$enclosing_tag_re.')\b}', $tag))
+				preg_match('{^</?(?:' . $enclosing_tag_re . ')\b}', $tag))
 			{
 				#
 				# Increase/decrease nested tag count.
 				#
 				if ($tag{1} == '/')						$depth--;
-				else if ($tag{strlen($tag)-2} != '/')	$depth++;
+				else if ($tag{strlen($tag) - 2} != '/')	$depth++;
 
 				if ($depth < 0) {
 					#
@@ -2070,11 +2070,11 @@ 
 				)
 			}xs';
 		
-		$original_text = $text;		# Save original text in case of faliure.
+		$original_text = $text; # Save original text in case of faliure.
 		
-		$depth		= 0;	# Current depth inside the tag tree.
-		$block_text	= "";	# Temporary text holder for current text.
-		$parsed		= "";	# Parsed text that will be returned.
+		$depth = 0; # Current depth inside the tag tree.
+		$block_text = ""; # Temporary text holder for current text.
+		$parsed = ""; # Parsed text that will be returned.
 
 		#
 		# Get the name of the starting tag.
@@ -2113,7 +2113,7 @@ 
 			# Check for: Auto-close tag (like <hr/>)
 			#			 Comments and Processing Instructions.
 			#
-			if (preg_match('{^</?(?:'.$this->auto_close_tags_re.')\b}', $tag) ||
+			if (preg_match('{^</?(?:' . $this->auto_close_tags_re . ')\b}', $tag) ||
 				$tag{1} == '!' || $tag{1} == '?')
 			{
 				# Just add the tag to the block as if it was text.
@@ -2124,9 +2124,9 @@ 
 				# Increase/decrease nested tag count. Only do so if
 				# the tag's name match base tag's.
 				#
-				if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
+				if (preg_match('{^</?' . $base_tag_name_re . '\b}', $tag)) {
 					if ($tag{1} == '/')						$depth--;
-					else if ($tag{strlen($tag)-2} != '/')	$depth++;
+					else if ($tag{strlen($tag) - 2} != '/')	$depth++;
 				}
 				
 				#
@@ -2142,7 +2142,7 @@ 
 					# Check if text inside this tag must be parsed in span mode.
 					$this->mode = $attr_m[2] . $attr_m[3];
 					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
-						preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
+						preg_match('{^<(?:' . $this->contain_span_tags_re . ')\b}', $tag);
 					
 					# Calculate indent before tag.
 					if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
@@ -2216,7 +2216,7 @@ 
 		$text = preg_replace_callback('{
 			(					# wrap whole match in $1
 			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
+				('.$this->nested_brackets_re . ')	# link text = $2
 			  \]
 
 			  [ ]?				# one optional space
@@ -2235,14 +2235,14 @@ 
 		$text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  \[
-				('.$this->nested_brackets_re.')	# link text = $2
+				('.$this->nested_brackets_re . ')	# link text = $2
 			  \]
 			  \(			# literal paren
 				[ \n]*
 				(?:
 					<(.+?)>	# href = $3
 				|
-					('.$this->nested_url_parenthesis_re.')	# href = $4
+					('.$this->nested_url_parenthesis_re . ')	# href = $4
 				)
 				[ \n]*
 				(			# $5
@@ -2252,7 +2252,7 @@ 
 				  [ \n]*	# ignore any spaces/tabs between closing quote and )
 				)?			# title is optional
 			  \)
-			  (?:[ ]? '.$this->id_class_attr_catch_re.' )?	 # $8 = id/class attributes
+			  (?:[ ]? '.$this->id_class_attr_catch_re . ' )?	 # $8 = id/class attributes
 			)
 			}xs',
 			array(&$this, '_doAnchors_inline_callback'), $text);
@@ -2275,9 +2275,9 @@ 
 		return $text;
 	}
 	protected function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
+		$whole_match = $matches[1];
+		$link_text   = $matches[2];
+		$link_id     = & $matches[3];
 
 		if ($link_id == "") {
 			# for shortcut links like [this][] or [this].
@@ -2293,10 +2293,10 @@ 
 			$url = $this->encodeAttribute($url);
 			
 			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
+			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 			if (isset($this->ref_attr[$link_id]))
 				$result .= $this->ref_attr[$link_id];
@@ -2311,11 +2311,11 @@ 
 		return $result;
 	}
 	protected function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("a", $dummy =& $matches[8]);
+		$whole_match = $matches[1];
+		$link_text = $this->runSpanGamut($matches[2]);
+		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
+		$title = & $matches[7];
+		$attr  = $this->doExtraAttributes("a", $dummy = & $matches[8]);
 
 
 		$url = $this->encodeAttribute($url);
@@ -2323,7 +2323,7 @@ 
 		$result = "<a href=\"$url\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 		$result .= $attr;
 		
@@ -2344,7 +2344,7 @@ 
 		$text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
+				('.$this->nested_brackets_re . ')		# alt text = $2
 			  \]
 
 			  [ ]?				# one optional space
@@ -2365,7 +2365,7 @@ 
 		$text = preg_replace_callback('{
 			(				# wrap whole match in $1
 			  !\[
-				('.$this->nested_brackets_re.')		# alt text = $2
+				('.$this->nested_brackets_re . ')		# alt text = $2
 			  \]
 			  \s?			# One optional whitespace character
 			  \(			# literal paren
@@ -2373,7 +2373,7 @@ 
 				(?:
 					<(\S*)>	# src url = $3
 				|
-					('.$this->nested_url_parenthesis_re.')	# src url = $4
+					('.$this->nested_url_parenthesis_re . ')	# src url = $4
 				)
 				[ \n]*
 				(			# $5
@@ -2383,7 +2383,7 @@ 
 				  [ \n]*
 				)?			# title is optional
 			  \)
-			  (?:[ ]? '.$this->id_class_attr_catch_re.' )?	 # $8 = id/class attributes
+			  (?:[ ]? '.$this->id_class_attr_catch_re . ' )?	 # $8 = id/class attributes
 			)
 			}xs',
 			array(&$this, '_doImages_inline_callback'), $text);
@@ -2406,7 +2406,7 @@ 
 			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 			if (isset($this->ref_attr[$link_id]))
 				$result .= $this->ref_attr[$link_id];
@@ -2421,18 +2421,18 @@ 
 		return $result;
 	}
 	protected function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
+		$whole_match = $matches[1];
+		$alt_text = $matches[2];
 		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
-		$attr  = $this->doExtraAttributes("img", $dummy =& $matches[8]);
+		$title = & $matches[7];
+		$attr  = $this->doExtraAttributes("img", $dummy = & $matches[8]);
 
 		$alt_text = $this->encodeAttribute($alt_text);
 		$url = $this->encodeAttribute($url);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; # $title already quoted
+			$result .= " title=\"$title\""; # $title already quoted
 		}
 		$result .= $attr;
 		$result .= $this->empty_element_suffix;
@@ -2455,7 +2455,7 @@ 
 		$text = preg_replace_callback(
 			'{
 				(^.+?)								# $1: Header text
-				(?:[ ]+ '.$this->id_class_attr_catch_re.' )?	 # $3 = id/class attributes
+				(?:[ ]+ '.$this->id_class_attr_catch_re . ' )?	 # $3 = id/class attributes
 				[ ]*\n(=+|-+)[ ]*\n+				# $3: Header footer
 			}mx',
 			array(&$this, '_doHeaders_callback_setext'), $text);
@@ -2473,7 +2473,7 @@ 
 				(.+?)		# $2 = Header text
 				[ ]*
 				\#*			# optional closing #\'s (not counted)
-				(?:[ ]+ '.$this->id_class_attr_catch_re.' )?	 # $3 = id/class attributes
+				(?:[ ]+ '.$this->id_class_attr_catch_re . ' )?	 # $3 = id/class attributes
 				[ ]*
 				\n+
 			}xm',
@@ -2485,14 +2485,14 @@ 
 		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
 			return $matches[0];
 		$level = $matches[3]{0} == '=' ? 1 : 2;
-		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[2]);
-		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
+		$attr  = $this->doExtraAttributes("h$level", $dummy = & $matches[2]);
+		$block = "<h$level$attr>" . $this->runSpanGamut($matches[1]) . "</h$level>";
 		return "\n" . $this->hashBlock($block) . "\n\n";
 	}
 	protected function _doHeaders_callback_atx($matches) {
 		$level = strlen($matches[1]);
-		$attr  = $this->doExtraAttributes("h$level", $dummy =& $matches[3]);
-		$block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
+		$attr  = $this->doExtraAttributes("h$level", $dummy = & $matches[3]);
+		$block = "<h$level$attr>" . $this->runSpanGamut($matches[2]) . "</h$level>";
 		return "\n" . $this->hashBlock($block) . "\n\n";
 	}
 
@@ -2513,11 +2513,11 @@ 
 		$text = preg_replace_callback('
 			{
 				^							# Start of a line
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[ ]{0,'.$less_than_tab . '}	# Allowed whitespace.
 				[|]							# Optional leading pipe (present)
 				(.+) \n						# $1: Header row (at least one pipe)
 				
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[ ]{0,'.$less_than_tab . '}	# Allowed whitespace.
 				[|] ([ ]*[-:]+[-| :]*) \n	# $2: Header underline
 				
 				(							# $3: Cells
@@ -2541,10 +2541,10 @@ 
 		$text = preg_replace_callback('
 			{
 				^							# Start of a line
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[ ]{0,'.$less_than_tab . '}	# Allowed whitespace.
 				(\S.*[|].*) \n				# $1: Header row (at least one pipe)
 				
-				[ ]{0,'.$less_than_tab.'}	# Allowed whitespace.
+				[ ]{0,'.$less_than_tab . '}	# Allowed whitespace.
 				([-:]+[ ]*[|][-| :]*) \n	# $2: Header underline
 				
 				(							# $3: Cells
@@ -2559,8 +2559,8 @@ 
 		return $text;
 	}
 	protected function _doTable_leadingPipe_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
+		$head = $matches[1];
+		$underline = $matches[2];
 		$content	= $matches[3];
 		
 		# Remove leading pipe for each row.
@@ -2577,14 +2577,14 @@ 
 		return " class=\"$classname\"";
 	}
 	protected function _doTable_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
+		$head = $matches[1];
+		$underline = $matches[2];
+		$content = $matches[3];
 
 		# Remove any tailing pipes for each line.
-		$head		= preg_replace('/[|] *$/m', '', $head);
-		$underline	= preg_replace('/[|] *$/m', '', $underline);
-		$content	= preg_replace('/[|] *$/m', '', $content);
+		$head = preg_replace('/[|] *$/m', '', $head);
+		$underline = preg_replace('/[|] *$/m', '', $underline);
+		$content = preg_replace('/[|] *$/m', '', $content);
 		
 		# Reading alignement from header underline.
 		$separators	= preg_split('/ *[|] */', $underline);
@@ -2601,17 +2601,17 @@ 
 		
 		# Parsing span elements, including code spans, character escapes, 
 		# and inline HTML tags, so that pipes inside those gets ignored.
-		$head		= $this->parseSpan($head);
-		$headers	= preg_split('/ *[|] */', $head);
-		$col_count	= count($headers);
-		$attr       = array_pad($attr, $col_count, '');
+		$head = $this->parseSpan($head);
+		$headers = preg_split('/ *[|] */', $head);
+		$col_count = count($headers);
+		$attr = array_pad($attr, $col_count, '');
 		
 		# Write column headers.
 		$text = "<table>\n";
 		$text .= "<thead>\n";
 		$text .= "<tr>\n";
 		foreach ($headers as $n => $header)
-			$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+			$text .= "  <th$attr[$n]>" . $this->runSpanGamut(trim($header)) . "</th>\n";
 		$text .= "</tr>\n";
 		$text .= "</thead>\n";
 		
@@ -2630,7 +2630,7 @@ 
 			
 			$text .= "<tr>\n";
 			foreach ($row_cells as $n => $cell)
-				$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+				$text .= "  <td$attr[$n]>" . $this->runSpanGamut(trim($cell)) . "</td>\n";
 			$text .= "</tr>\n";
 		}
 		$text .= "</tbody>\n";
@@ -2650,10 +2650,10 @@ 
 		$whole_list_re = '(?>
 			(								# $1 = whole list
 			  (								# $2
-				[ ]{0,'.$less_than_tab.'}
+				[ ]{0,'.$less_than_tab . '}
 				((?>.*\S.*\n)+)				# $3 = defined term
 				\n?
-				[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+				[ ]{0,'.$less_than_tab . '}:[ ]+ # colon starting definition
 			  )
 			  (?s:.+?)
 			  (								# $4
@@ -2662,13 +2662,13 @@ 
 				  \n{2,}
 				  (?=\S)
 				  (?!						# Negative lookahead for another term
-					[ ]{0,'.$less_than_tab.'}
+					[ ]{0,'.$less_than_tab . '}
 					(?: \S.*\n )+?			# defined term
 					\n?
-					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+					[ ]{0,'.$less_than_tab . '}:[ ]+ # colon starting definition
 				  )
 				  (?!						# Negative lookahead for another definition
-					[ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
+					[ ]{0,'.$less_than_tab . '}:[ ]+ # colon starting definition
 				  )
 			  )
 			)
@@ -2676,7 +2676,7 @@ 
 
 		$text = preg_replace_callback('{
 				(?>\A\n?|(?<=\n\n))
-				'.$whole_list_re.'
+				'.$whole_list_re . '
 			}mx',
 			array(&$this, '_doDefLists_callback'), $text);
 
@@ -2708,7 +2708,7 @@ 
 		$list_str = preg_replace_callback('{
 			(?>\A\n?|\n\n+)					# leading line
 			(								# definition terms = $1
-				[ ]{0,'.$less_than_tab.'}	# leading whitespace
+				[ ]{0,'.$less_than_tab . '}	# leading whitespace
 				(?!\:[ ]|[ ])				# negative lookahead for a definition
 											#   mark (colon) or more whitespace.
 				(?> \S.* \n)+?				# actual term (not whitespace).	
@@ -2722,13 +2722,13 @@ 
 		$list_str = preg_replace_callback('{
 			\n(\n+)?						# leading line = $1
 			(								# marker space = $2
-				[ ]{0,'.$less_than_tab.'}	# whitespace before colon
+				[ ]{0,'.$less_than_tab . '}	# whitespace before colon
 				\:[ ]+						# definition mark (colon)
 			)
 			((?s:.+?))						# definition text = $3
 			(?= \n+ 						# stop at next definition mark,
 				(?:							# next term or end of text
-					[ ]{0,'.$less_than_tab.'} \:[ ]	|
+					[ ]{0,'.$less_than_tab . '} \:[ ]	|
 					<dt> | \z
 				)						
 			)					
@@ -2749,13 +2749,13 @@ 
 	protected function _processDefListItems_callback_dd($matches) {
 		$leading_line	= $matches[1];
 		$marker_space	= $matches[2];
-		$def			= $matches[3];
+		$def = $matches[3];
 
 		if ($leading_line || preg_match('/\n{2,}/', $def)) {
 			# Replace marker with the appropriate whitespace indentation
 			$def = str_repeat(' ', strlen($marker_space)) . $def;
 			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
-			$def = "\n". $def ."\n";
+			$def = "\n" . $def . "\n";
 		}
 		else {
 			$def = rtrim($def);
@@ -2786,7 +2786,7 @@ 
 				(?:
 					\.?([-_:a-zA-Z0-9]+) # 2: standalone class name
 				|
-					'.$this->id_class_attr_catch_re.' # 3: Extra attributes
+					'.$this->id_class_attr_catch_re . ' # 3: Extra attributes
 				)?
 				[ ]* \n # Whitespace and newline following marker.
 				
@@ -2806,8 +2806,8 @@ 
 		return $text;
 	}
 	protected function _doFencedCodeBlocks_callback($matches) {
-		$classname =& $matches[2];
-		$attrs     =& $matches[3];
+		$classname = & $matches[2];
+		$attrs     = & $matches[3];
 		$codeblock = $matches[4];
 		$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
 		$codeblock = preg_replace_callback('/^\n+/',
@@ -2816,15 +2816,15 @@ 
 		if ($classname != "") {
 			if ($classname{0} == '.')
 				$classname = substr($classname, 1);
-			$attr_str = ' class="'.$this->code_class_prefix.$classname.'"';
+			$attr_str = ' class="' . $this->code_class_prefix . $classname . '"';
 		} else {
 			$attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs);
 		}
 		$pre_attr_str  = $this->code_attr_on_pre ? $attr_str : '';
 		$code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
-		$codeblock  = "<pre$pre_attr_str><code$code_attr_str>$codeblock</code></pre>";
+		$codeblock = "<pre$pre_attr_str><code$code_attr_str>$codeblock</code></pre>";
 		
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+		return "\n\n" . $this->hashBlock($codeblock) . "\n\n";
 	}
 	protected function _doFencedCodeBlocks_newlines($matches) {
 		return str_repeat("<br$this->empty_element_suffix", 
@@ -2900,7 +2900,7 @@ 
 
 		# Link defs are in the form: [^id]: url "optional title"
 		$text = preg_replace_callback('{
-			^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?:	# note_id = $1
+			^[ ]{0,'.$less_than_tab . '}\[\^(.+?)\][ ]?:	# note_id = $1
 			  [ ]*
 			  \n?					# maybe *one* newline
 			(						# text = $2 (no blank lines allowed)
@@ -2947,7 +2947,7 @@ 
 		if (!empty($this->footnotes_ordered)) {
 			$text .= "\n\n";
 			$text .= "<div class=\"footnotes\">\n";
-			$text .= "<hr". $this->empty_element_suffix ."\n";
+			$text .= "<hr" . $this->empty_element_suffix . "\n";
 			$text .= "<ol>\n\n";
 
 			$attr = "";
@@ -3007,7 +3007,7 @@ 
 		# Create footnote marker only if it has a corresponding footnote *and*
 		# the footnote hasn't been used by another marker.
 		if (isset($this->footnotes[$node_id])) {
-			$num =& $this->footnotes_numbers[$node_id];
+			$num = & $this->footnotes_numbers[$node_id];
 			if (!isset($num)) {
 				# Transfer footnote content to the ordered list and give it its
 				# number
@@ -3035,12 +3035,12 @@ 
 			$node_id = $this->encodeAttribute($node_id);
 			
 			return
-				"<sup id=\"fnref$ref_count_mark:$node_id\">".
-				"<a href=\"#fn:$node_id\"$attr>$num</a>".
+				"<sup id=\"fnref$ref_count_mark:$node_id\">" .
+				"<a href=\"#fn:$node_id\"$attr>$num</a>" .
 				"</sup>";
 		}
 		
-		return "[^".$matches[1]."]";
+		return "[^" . $matches[1] . "]";
 	}
 		
 	
@@ -3054,7 +3054,7 @@ 
 
 		# Link defs are in the form: [id]*: url "optional title"
 		$text = preg_replace_callback('{
-			^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?:	# abbr_id = $1
+			^[ ]{0,'.$less_than_tab . '}\*\[(.+?)\][ ]?:	# abbr_id = $1
 			(.*)					# text = $2 (no blank lines allowed)	
 			}xm',
 			array(&$this, '_stripAbbreviations_callback'),
@@ -3079,10 +3079,10 @@ 
 		if ($this->abbr_word_re) {
 			// cannot use the /x modifier because abbr_word_re may 
 			// contain significant spaces:
-			$text = preg_replace_callback('{'.
-				'(?<![\w\x1A])'.
-				'(?:'.$this->abbr_word_re.')'.
-				'(?![\w\x1A])'.
+			$text = preg_replace_callback('{' .
+				'(?<![\w\x1A])' .
+				'(?:' . $this->abbr_word_re . ')' .
+				'(?![\w\x1A])' .
 				'}', 
 				array(&$this, '_doAbbreviations_callback'), $text);
 		}

vendor/anax/mvc/3pp/php-markdown/Michelf/MarkdownInterface.php

Doc Comments +4 added lines

@@ -29,6 +29,10 @@
   # Main function. Performs some preprocessing on the input text
   # and pass it through the document gamut.
   #
+
+  /**
+   * @return string
+   */
   public function transform($text);
 
 }

vendor/anax/mvc/src/Content/CTextFilter.php

Doc Comments +3 added lines, -3 removed lines

@@ -276,7 +276,7 @@ 
      *
      * Usage example: [BASEURL]
      *
-     * @return array with all the options.
+     * @return string with all the options.
      */
     protected function shortCodeBaseurl()
     {
@@ -290,7 +290,7 @@ 
      *
      * Usage example: [RELURL]
      *
-     * @return array with all the options.
+     * @return string with all the options.
      */
     protected function shortCodeRelurl()
     {
@@ -303,7 +303,7 @@ 
     *
     * Usage example: [RELURL]
     *
-    * @return array with all the options.
+    * @return string with all the options.
     */
     protected function shortCodeAsset()
     {

Spacing +3 added lines, -3 removed lines

@@ -97,7 +97,7 @@ 
     {
         return preg_replace_callback(
             '#\b(?<![href|src]=[\'"])https?://[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|/))#',
-            function ($matches) {
+            function($matches) {
                 return "<a href=\'{$matches[0]}\'>{$matches[0]}</a>";
             },
             $text
@@ -154,7 +154,7 @@ 
 
         return preg_replace_callback(
             $patterns,
-            function ($matches) {
+            function($matches) {
                 switch ($matches[1]) {
 
                     case 'FIGURE':
@@ -201,7 +201,7 @@ 
                 $res[$match] = true;
             } else {
                 $key = substr($match, 0, $pos);
-                $val = trim(substr($match, $pos+1), '"');
+                $val = trim(substr($match, $pos + 1), '"');
                 $res[$key] = $val;
             }
         }

vendor/anax/mvc/src/DI/CDIArray.php

Doc Comments -4 removed lines

@@ -30,7 +30,6 @@ 
     /**
      * Construct.
      *
-     * @param array $options to configure options.
      */
     public function offsetSet($offset, $value)
     {
@@ -46,7 +45,6 @@ 
     /**
      * Construct.
      *
-     * @param array $options to configure options.
      */
     public function offsetExists($offset)
     {
@@ -58,7 +56,6 @@ 
     /**
      * Construct.
      *
-     * @param array $options to configure options.
      */
     public function offsetUnset($offset)
     {
@@ -70,7 +67,6 @@ 
     /**
      * Construct.
      *
-     * @param array $options to configure options.
      */
     public function offsetGet($offset)
     {

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
      * Properties
      *
      */
-    public $data = [];        // Store all configuration options here
+    public $data = []; // Store all configuration options here
 
 
 

vendor/anax/mvc/src/Loader/CPsr4Autoloader.php

Doc Comments +2 added lines, -2 removed lines

@@ -116,7 +116,7 @@ 
      * Loads the class file for a given class name.
      *
      * @param string $class The fully-qualified class name.
-     * @return mixed The mapped file name on success, or boolean false on
+     * @return string|false The mapped file name on success, or boolean false on
      * failure.
      */
     public function loadClass($class)
@@ -165,7 +165,7 @@ 
      * @param string $prefix         The namespace prefix.
      * @param string $relative_class The relative class name.
      *
-     * @return mixed Boolean false if no mapped file can be loaded, or the
+     * @return false|string Boolean false if no mapped file can be loaded, or the
      * name of the mapped file that was loaded.
      */
     protected function loadMappedFile($prefix, $relative_class)

vendor/anax/mvc/src/Log/CLogger.php

Doc Comments +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     /**
      * Logs with an arbitrary level.
      *
-     * @param mixed $level
+     * @param string $level
      * @param string $message
      * @param array $context
      * @return null

Spacing +5 added lines, -5 removed lines

@@ -51,18 +51,18 @@
      */
     public function setContext($context = 'development') {
 
-        switch($context) {
+        switch ($context) {
             
             case 'production':
 
                 break;
             
             case 'development':
-                error_reporting(-1);              // Report all type of errors
-                ini_set('display_errors', 1);     // Display all errors 
-                ini_set('output_buffering', 0);   // Do not buffer output
+                error_reporting(-1); // Report all type of errors
+                ini_set('display_errors', 1); // Display all errors 
+                ini_set('output_buffering', 0); // Do not buffer output
 
-                set_exception_handler(function ($exception) {
+                set_exception_handler(function($exception) {
                     echo "Anax: Uncaught exception: <p>" . 
                         $exception->getMessage() . "</p><pre>" . 
                         $exception->getTraceAsString() . "</pre>";

vendor/anax/mvc/src/MVC/CDispatcherBasic.php

Doc Comments +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
     /**
      * Check if a controller exists with this name.
      *
-     * @return void
+     * @return boolean
      */
     public function isValidController()
     {

Spacing +4 added lines, -4 removed lines

@@ -16,10 +16,10 @@
      * Properties
      *
      */
-    private $controllerName;    // Name of controller
-    private $controller;        // Actual controller
-    private $action;            // Name of action
-    private $params;            // Params
+    private $controllerName; // Name of controller
+    private $controller; // Actual controller
+    private $action; // Name of action
+    private $params; // Params
 
 
 

vendor/anax/mvc/src/Request/CRequestBasic.php

Doc Comments +2 added lines, -2 removed lines

@@ -252,7 +252,7 @@ 
     /**
      * Set variable in the server array.
      *
-     * @param mixed  $key   the key an the , or an key-value array
+     * @param string  $key   the key an the , or an key-value array
      * @param string $value the value of the key
      *
      * @return $this
@@ -286,7 +286,7 @@ 
     /**
      * Set variable in the get array.
      *
-     * @param mixed  $key   the key an the , or an key-value array
+     * @param string  $key   the key an the , or an key-value array
      * @param string $value the value of the key
      *
      * @return $this

Spacing +8 added lines, -8 removed lines

@@ -16,19 +16,19 @@ 
     */
     private $requestUri; // Request URI from $_SERVER
     private $scriptName; // Scriptname from $_SERVER, actual scriptname part
-    private $path;       // Scriptname from $_SERVER, path-part
+    private $path; // Scriptname from $_SERVER, path-part
 
-    private $route;      // The route
+    private $route; // The route
     private $routeParts; // The route as an array
 
 
     private $currentUrl; // Current url
-    private $siteUrl;    // Url to this site, http://dbwebb.se
-    private $baseUrl;    // Url to root dir, siteUrl . /some/installation/directory/
+    private $siteUrl; // Url to this site, http://dbwebb.se
+    private $baseUrl; // Url to root dir, siteUrl . /some/installation/directory/
 
     private $server; // Mapped to $_SERVER
-    private $get;    // Mapped to $_GET
-    private $post;   // Mapped to $_POST
+    private $get; // Mapped to $_GET
+    private $post; // Mapped to $_POST
 
 
 
@@ -54,8 +54,8 @@ 
     public function setGlobals($globals = [])
     {
         $this->server = isset($globals['server']) ? array_merge($_SERVER, $globals['server']) : $_SERVER;
-        $this->get    = isset($globals['get'])    ? array_merge($_GET, $globals['get'])       : $_GET;
-        $this->post   = isset($globals['post'])   ? array_merge($_POST, $globals['post'])     : $_POST;
+        $this->get    = isset($globals['get']) ? array_merge($_GET, $globals['get']) : $_GET;
+        $this->post   = isset($globals['post']) ? array_merge($_POST, $globals['post']) : $_POST;
     }
 
 

vendor/anax/mvc/src/Route/CRouterBasic.php

Doc Comments +1 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
      * Add an internal (not exposed to url-matching) route to the router.
      *
      * @param string $rule   for this route
-     * @param mixed  $action null, string or callable to implement a controller for the route
+     * @param \Closure  $action null, string or callable to implement a controller for the route
      *
      * @return class as new route
      */
@@ -68,7 +68,6 @@ 
      * Add an internal (not exposed to url-matching) route to the router.
      *
      * @param string $rule   for this route
-     * @param mixed  $action null, string or callable to implement a controller for the route
      *
      * @return class as new route
      */

Spacing +3 added lines, -3 removed lines

@@ -16,9 +16,9 @@
      * Properties
      *
      */
-    private $routes;                    // All the routes
-    private $internalRoutes;            // All internal routes
-    private $defaultRoute    = null;    // A default rout to catch all
+    private $routes; // All the routes
+    private $internalRoutes; // All internal routes
+    private $defaultRoute = null; // A default rout to catch all