Icybee / Patron

lib/Engine.php

Doc Comments +7 added lines, -1 removed lines

@@ -207,6 +207,9 @@ 
 		return $rc;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function get_file()
 	{
 		foreach ($this->trace as $trace)
@@ -235,6 +238,9 @@ 
 
 	protected $templates = [];
 
+	/**
+	 * @param string $name
+	 */
 	public function addTemplate($name, $template)
 	{
 		if (isset($this->templates[$name]))
@@ -319,7 +325,7 @@ 
 	/**
 	 * Calls a template.
 	 *
-	 * @param $name
+	 * @param string $name
 	 * @param array $args
 	 *
 	 * @return string

Spacing +12 added lines, -12 removed lines

@@ -89,7 +89,7 @@ 
 	 * @param string $expression
 	 * @param bool $silent
 	 */
-	public function evaluate($expression, $silent=false, $context=null)
+	public function evaluate($expression, $silent = false, $context = null)
 	{
 		$evaluator = $this->evaluator;
 
@@ -127,7 +127,7 @@ 
 		array_shift($this->trace);
 	}
 
-	public function error($alert, array $args=[])
+	public function error($alert, array $args = [])
 	{
 		if ($alert instanceof \ICanBoogie\Exception\Config)
 		{
@@ -280,7 +280,7 @@ 
 		}
 
 		$tries = [];
-		$template_pathname = $template_resolver->resolve($name, [ '.patron', '.html' ], $tries);
+		$template_pathname = $template_resolver->resolve($name, ['.patron', '.html'], $tries);
 
 		if ($template_pathname)
 		{
@@ -288,7 +288,7 @@ 
 		}
 
 		$template_name = TemplateName::from($name);
-		$template_pathname = $template_resolver->resolve($template_name->as_partial, [ '.patron', '.html' ], $tries);
+		$template_pathname = $template_resolver->resolve($template_name->as_partial, ['.patron', '.html'], $tries);
 
 		if ($template_pathname)
 		{
@@ -303,7 +303,7 @@ 
 		$content = file_get_contents($pathname);
 		$nodes = $this->get_compiled($content);
 
-		return new Template($nodes, [ 'file' => $pathname ]);
+		return new Template($nodes, ['file' => $pathname]);
 	}
 
 	protected function get_template($name)
@@ -324,14 +324,14 @@ 
 	 *
 	 * @return string
 	 */
-	public function callTemplate($name, array $args=[])
+	public function callTemplate($name, array $args = [])
 	{
 		$template = $this->get_template($name);
 
 		if (!$template)
 		{
 			$er = 'Unknown template %name';
-			$params = [ '%name' => $name ];
+			$params = ['%name' => $name];
 
 			if ($this->templates)
 			{
@@ -344,7 +344,7 @@ 
 			return null;
 		}
 
-		$this->trace_enter([ 'template', $name, $template ]);
+		$this->trace_enter(['template', $name, $template]);
 
 		$this->context['self']['arguments'] = $args;
 
@@ -367,7 +367,7 @@ 
 
 	protected function init_context()
 	{
-		$this->context = new \BlueTihi\Context([ 'self' => null, 'this' => null ]);
+		$this->context = new \BlueTihi\Context(['self' => null, 'this' => null]);
 	}
 
 	/*
@@ -390,7 +390,7 @@ 
 		return $compiler($template);
 	}
 
-	public function __invoke($template, $bind=null, array $options=[])
+	public function __invoke($template, $bind = null, array $options = [])
 	{
 		if (!$template)
 		{
@@ -450,12 +450,12 @@ 
 				$template = $this->get_compiled($template);
 			}
 
-			$template = new Template($template, [ 'file' => $file ]);
+			$template = new Template($template, ['file' => $file]);
 		}
 
 		if ($template->file)
 		{
-			$this->trace_enter([ 'file', $template->file ]);
+			$this->trace_enter(['file', $template->file]);
 		}
 
 		$rc = '';

Braces +6 added lines, -12 removed lines

@@ -134,12 +134,10 @@ 
 			$this->errors[] = '<div class="alert alert-error alert-danger">' . $alert->getMessage() . '</div>';
 
 			return;
-		}
-		else if ($alert instanceof \Exception)
+		} else if ($alert instanceof \Exception)
 		{
 			$alert = class_exists('ICanBoogie\Debug') ? Debug::format_alert($alert) : (string) $alert;
-		}
-		else
+		} else
 		{
 			$alert = \ICanBoogie\format($alert, $args);
 		}
@@ -189,8 +187,7 @@ 
 		if ($e instanceof \ICanBoogie\HTTP\Exception)
 		{
 			throw $e;
-		}
-		else if ($e instanceof \ICanBoogie\ActiveRecord\Exception)
+		} else if ($e instanceof \ICanBoogie\ActiveRecord\Exception)
 		{
 			throw $e;
 		}
@@ -267,8 +264,7 @@ 
 			if ($template_resolver instanceof Render\BasicTemplateResolver)
 			{
 				$basic_template_resolver = $template_resolver;
-			}
-			else if ($template_resolver instanceof Render\TemplateResolverDecorator)
+			} else if ($template_resolver instanceof Render\TemplateResolverDecorator)
 			{
 				$basic_template_resolver = $template_resolver->find_renderer(Render\BasicTemplateResolver::class);
 			}
@@ -470,14 +466,12 @@ 
 			try
 			{
 				$rc .= $node($this, $this->context);
-			}
-			catch (\Exception $e)
+			} catch (\Exception $e)
 			{
 				if (class_exists('ICanBoogie\Debug'))
 				{
 					$rc .= Debug::format_alert($e);
-				}
-				else
+				} else
 				{
 					$rc .= $e;
 				}

lib/Evaluator.php

Doc Comments +5 added lines

@@ -58,6 +58,7 @@ 
 
 	/**
 	 * Tokenize Javascript style function chain into an array of identifiers and functions
+	 * @param string $str
 	 */
 	protected function tokenize($str)
 	{
@@ -264,6 +265,10 @@ 
 		return $parts;
 	}
 
+	/**
+	 * @param string $expression
+	 * @param boolean $silent
+	 */
 	protected function evaluate($context, $expression, $tokens, $silent, $previous_identifier='__context__')
 	{
 		$expression_path = [];

Spacing +8 added lines, -9 removed lines

@@ -49,7 +49,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __invoke($context, $expression, $silent=false)
+	public function __invoke($context, $expression, $silent = false)
 	{
 		$tokens = $this->tokenize($expression);
 
@@ -82,7 +82,7 @@ 
 
 		$parts = [];
 
-		for ($i = 0 ; $i < $length ; $i++)
+		for ($i = 0; $i < $length; $i++)
 		{
 			$c = $str{$i};
 
@@ -264,7 +264,7 @@ 
 		return $parts;
 	}
 
-	protected function evaluate($context, $expression, $tokens, $silent, $previous_identifier='__context__')
+	protected function evaluate($context, $expression, $tokens, $silent, $previous_identifier = '__context__')
 	{
 		$expression_path = [];
 
@@ -280,8 +280,7 @@ 
 				{
 					if (!is_array($context) && !is_object($context))
 					{
-						throw new \InvalidArgumentException(\ICanBoogie\format
-						(
+						throw new \InvalidArgumentException(\ICanBoogie\format(
 							'Unexpected variable type: %type (%value) for %identifier in expression %expression, should be either an array or an object', [
 
 								'%type' => gettype($context),
@@ -326,7 +325,7 @@ 
 
 					if ($args_evaluate)
 					{
-						$this->error('we should evaluate %eval', [ '%eval' => $args_evaluate ]);
+						$this->error('we should evaluate %eval', ['%eval' => $args_evaluate]);
 					}
 
 					#
@@ -335,7 +334,7 @@ 
 
 					if (is_object($context) && method_exists($context, $method))
 					{
-						$context = call_user_func_array([ $context, $method ], $args);
+						$context = call_user_func_array([$context, $method], $args);
 
 						break;
 					}
@@ -394,7 +393,7 @@ 
 					{
 						if (is_object($context) && method_exists($context, '__call'))
 						{
-							$context = call_user_func_array([ $context, $method ], $args);
+							$context = call_user_func_array([$context, $method], $args);
 
 							break;
 						}
@@ -461,7 +460,7 @@ 
 	 *
 	 * @return mixed The extracted value.
 	 */
-	protected function extract_value($container, $identifier, &$exists=false)
+	protected function extract_value($container, $identifier, &$exists = false)
 	{
 		$exists = false;
 

Braces +8 added lines, -16 removed lines

@@ -113,8 +113,7 @@ 
 					{
 						continue;
 					}
-				}
-				else if (!$quote)
+				} else if (!$quote)
 				{
 					$quote = $c;
 
@@ -211,12 +210,10 @@ 
 								if (is_numeric($part))
 								{
 									$part = (int) $part;
-								}
-								else if (is_float($part))
+								} else if (is_float($part))
 								{
 									$part = (float) $part;
-								}
-								else
+								} else
 								{
 									$part = constant($part);
 								}
@@ -359,19 +356,16 @@ 
 							if (function_exists('str' . $method))
 							{
 								$callback = 'str' . $method;
-							}
-							else if (function_exists('str_' . $method))
+							} else if (function_exists('str_' . $method))
 							{
 								$callback = 'str_' . $method;
 							}
-						}
-						else if (is_array($context) || is_object($context))
+						} else if (is_array($context) || is_object($context))
 						{
 							if (function_exists('ICanBoogie\array_' . $method))
 							{
 								$callback = 'ICanBoogie\array_' . $method;
-							}
-							else if (function_exists('array_' . $method))
+							} else if (function_exists('array_' . $method))
 							{
 								$callback = 'array_' . $method;
 							}
@@ -425,13 +419,11 @@ 
 						if ($callback == 'array_shift')
 						{
 							$context = array_shift($context);
-						}
-						else
+						} else
 						{
 							$context = call_user_func_array($callback, $args);
 						}
-					}
-					else
+					} else
 					{
 						$context = call_user_func_array($callback, $args);
 					}

lib/Hooks.php

Unused Use Statements -1 removed lines

@@ -12,7 +12,6 @@
 namespace Patron;
 
 use Brickrouge\Pager;
-
 use ICanBoogie\Core;
 use ICanBoogie\Render\TemplateName;
 

Spacing +7 added lines, -9 removed lines

@@ -43,7 +43,7 @@ 
 	{
 		$count = null;
 		$limit = null;
-		$page =  null;
+		$page = null;
 		$range = null;
 		$noarrows = null;
 		$with = null;
@@ -166,10 +166,8 @@ 
 
 		if (!is_array($entries) && !is_object($entries))
 		{
-			$patron->error
-			(
-				'Invalid source for %param. Source must either be an array or a traversable object. Given: !entries', array
-				(
+			$patron->error(
+				'Invalid source for %param. Source must either be an array or a traversable object. Given: !entries', array(
 					'%param' => 'in', '!entries' => $entries
 				)
 			);
@@ -330,7 +328,7 @@ 
 
 			if ($name != 'when')
 			{
-				$patron->error('Unexpected child: :node', [ ':node' => $node ]);
+				$patron->error('Unexpected child: :node', [':node' => $node]);
 
 				return null;
 			}
@@ -716,16 +714,16 @@ 
 	{
 		$app->events->attach(function(MarkupCollection\AlterEvent $event, MarkupCollection $markups) use ($app) {
 
-			foreach((array) $app->configs['patron.markups'] as $name => $definition)
+			foreach ((array) $app->configs['patron.markups'] as $name => $definition)
 			{
-				$markups[$name] = $definition + [ 1 => [ ] ];
+				$markups[$name] = $definition + [1 => []];
 			}
 
 		});
 
 		$app->events->attach(function(FunctionCollection\AlterEvent $event, FunctionCollection $markups) use ($app) {
 
-			foreach((array) $app->configs['patron.functions'] as $name => $definition)
+			foreach ((array) $app->configs['patron.functions'] as $name => $definition)
 			{
 				$markups[$name] = $definition;
 			}

Braces +3 added lines, -6 removed lines

@@ -260,8 +260,7 @@ 
 		if ($args['equals'] !== null)
 		{
 			$true = $args['select'] == $args['equals'];
-		}
-		else
+		} else
 		{
 			$true = !empty($args['test']);
 		}
@@ -407,12 +406,10 @@ 
 			$patron->error('Ambiguous selection');
 
 			return null;
-		}
-		else if ($select)
+		} else if ($select)
 		{
 			$value = $select;
-		}
-		else
+		} else
 		{
 			$value = $patron($template);
 		}

lib/HTMLParser.php

Doc Comments +3 added lines

@@ -87,6 +87,9 @@
 		return $tree;
 	}
 
+	/**
+	 * @return string
+	 */
 	protected function escapeSpecials($html)
 	{
 		#

Spacing +13 added lines, -17 removed lines

@@ -23,7 +23,7 @@ 
 	protected $error_handler;
 	protected $namespace;
 
-	public function __construct(array $tags=[])
+	public function __construct(array $tags = [])
 	{
 		$tags += [
 
@@ -38,7 +38,7 @@ 
 		$this->error_handler = $tags[self::T_ERROR_HANDLER];
 	}
 
-	public function parse($html, $namespace=null, $encoding='utf-8')
+	public function parse($html, $namespace = null, $encoding = 'utf-8')
 	{
 		$this->encoding = $encoding;
 		$this->namespace = $namespace;
@@ -63,8 +63,7 @@ 
 		# note that i+2 might end with a '/' indicating an auto-closing markup
 		#
 
-		$this->matches = preg_split
-		(
+		$this->matches = preg_split(
 			'#<(/?)' . $namespace . '([^>]*)>#', $html, -1, PREG_SPLIT_DELIM_CAPTURE
 		);
 
@@ -93,13 +92,13 @@ 
 		# here we escape comments
 		#
 
-		$html = preg_replace_callback('#<\!--.+-->#sU', [ $this, 'escapeSpecials_callback' ], $html);
+		$html = preg_replace_callback('#<\!--.+-->#sU', [$this, 'escapeSpecials_callback'], $html);
 
 		#
 		# and processing options
 		#
 
-		$html = preg_replace_callback('#<\?.+\?>#sU', [ $this, 'escapeSpecials_callback' ], $html);
+		$html = preg_replace_callback('#<\?.+\?>#sU', [$this, 'escapeSpecials_callback'], $html);
 
 		return $html;
 	}
@@ -110,10 +109,9 @@ 
 
 		$text = $m[0];
 
-		$text = str_replace
-		(
-			[ '<', '>' ],
-			[ "\x01", "\x02" ],
+		$text = str_replace(
+			['<', '>'],
+			["\x01", "\x02"],
 			$text
 		);
 
@@ -122,10 +120,9 @@ 
 
 	protected function unescapeSpecials($tree)
 	{
-		return is_array($tree) ? array_map([ $this, 'unescapeSpecials' ], $tree) : str_replace
-		(
-			[ "\x01", "\x02" ],
-			[ '<', '>' ],
+		return is_array($tree) ? array_map([$this, 'unescapeSpecials'], $tree) : str_replace(
+			["\x01", "\x02"],
+			['<', '>'],
 			$tree
 		);
 	}
@@ -246,15 +243,14 @@ 
 			$args[$m[1]] = html_entity_decode($m[2], ENT_QUOTES, $this->encoding);
 		}
 
-		return [ 'name' => $name, 'args' => $args ];
+		return ['name' => $name, 'args' => $args];
 	}
 
 	protected function error($markup, $expected)
 	{
 		$this->malformed = true;
 
-		call_user_func
-		(
+		call_user_func(
 			$this->error_handler, $expected
 			? 'unexpected closing markup %markup, should be %expected'
 			: 'unexpected closing markup %markup, when none was opened', [

Braces +2 added lines, -4 removed lines

@@ -170,8 +170,7 @@ 
 						#
 
 						$nodes[] = $this->parseMarkup(substr($value, 0, -1));
-					}
-					else if ($closing)
+					} else if ($closing)
 					{
 						#
 						# closing markup
@@ -185,8 +184,7 @@ 
 						}
 
 						return $nodes;
-					}
-					else
+					} else
 					{
 						#
 						# this is an open markup with possible children

lib/markdown/markdown.php

Doc Comments +7 added lines

@@ -1044,6 +1044,10 @@ 
 
 	var $list_level = 0;
 
+	/**
+	 * @param string $list_str
+	 * @param string $marker_any_re
+	 */
 	function processListItems($list_str, $marker_any_re) {
 	#
 	#	Process the contents of a single ordered or unordered list, splitting it
@@ -1644,6 +1648,9 @@ 
 	# hanlde UTF-8 if the default function does not exist.
 	var $utf8_strlen = 'mb_strlen';
 
+	/**
+	 * @param string $text
+	 */
 	function detab($text) {
 	#
 	# Replace tabs with the appropriate amount of space.

Indentation +2 added lines, -2 removed lines

@@ -87,10 +87,10 @@
 	# - Add paragraph tag around the excerpt, but remove it for the excerpt rss.
 	if (MARKDOWN_WP_POSTS) {
 		remove_filter('the_content',     'wpautop');
-        remove_filter('the_content_rss', 'wpautop');
+		remove_filter('the_content_rss', 'wpautop');
 		remove_filter('the_excerpt',     'wpautop');
 		add_filter('the_content',     'mdwp_MarkdownPost', 6);
-        add_filter('the_content_rss', 'mdwp_MarkdownPost', 6);
+		add_filter('the_content_rss', 'mdwp_MarkdownPost', 6);
 		add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6);
 		add_filter('get_the_excerpt', 'trim', 7);
 		add_filter('the_excerpt',     'mdwp_add_p');

Spacing +104 added lines, -107 removed lines

@@ -11,7 +11,7 @@ 
 # <http://daringfireball.net/projects/markdown/>
 #
 
-define( 'MARKDOWN_VERSION',  "1.0.1o" ); # Sun 8 Jan 2012
+define('MARKDOWN_VERSION', "1.0.1o"); # Sun 8 Jan 2012
 
 
 #
@@ -19,18 +19,18 @@ 
 #
 
 # Change to ">" for HTML output
-@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
+@define('MARKDOWN_EMPTY_ELEMENT_SUFFIX', " />");
 
 # Define the width of a tab for code blocks.
-@define( 'MARKDOWN_TAB_WIDTH',     4 );
+@define('MARKDOWN_TAB_WIDTH', 4);
 
 # Optional title attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_TITLE',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_TITLE',     "" );
+@define('MARKDOWN_FN_LINK_TITLE', "");
+@define('MARKDOWN_FN_BACKLINK_TITLE', "");
 
 # Optional class attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_CLASS',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_CLASS',     "" );
+@define('MARKDOWN_FN_LINK_CLASS', "");
+@define('MARKDOWN_FN_BACKLINK_CLASS', "");
 
 
 #
@@ -38,8 +38,8 @@ 
 #
 
 # Change to false to remove Markdown from posts and/or comments.
-@define( 'MARKDOWN_WP_POSTS',      true );
-@define( 'MARKDOWN_WP_COMMENTS',   true );
+@define('MARKDOWN_WP_POSTS', true);
+@define('MARKDOWN_WP_COMMENTS', true);
 
 
 
@@ -47,7 +47,7 @@ 
 
 if (!defined('MARKDOWN_PARSER_CLASS'))
 {
-	define( 'MARKDOWN_PARSER_CLASS',  'MarkdownExtra_Parser' );
+	define('MARKDOWN_PARSER_CLASS', 'MarkdownExtra_Parser');
 }
 
 function Markdown($text) {
@@ -86,19 +86,19 @@ 
 	# - Run Markdown on excerpt, then remove all tags.
 	# - Add paragraph tag around the excerpt, but remove it for the excerpt rss.
 	if (MARKDOWN_WP_POSTS) {
-		remove_filter('the_content',     'wpautop');
+		remove_filter('the_content', 'wpautop');
         remove_filter('the_content_rss', 'wpautop');
-		remove_filter('the_excerpt',     'wpautop');
-		add_filter('the_content',     'mdwp_MarkdownPost', 6);
+		remove_filter('the_excerpt', 'wpautop');
+		add_filter('the_content', 'mdwp_MarkdownPost', 6);
         add_filter('the_content_rss', 'mdwp_MarkdownPost', 6);
 		add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6);
 		add_filter('get_the_excerpt', 'trim', 7);
-		add_filter('the_excerpt',     'mdwp_add_p');
+		add_filter('the_excerpt', 'mdwp_add_p');
 		add_filter('the_excerpt_rss', 'mdwp_strip_p');
 
-		remove_filter('content_save_pre',  'balanceTags', 50);
-		remove_filter('excerpt_save_pre',  'balanceTags', 50);
-		add_filter('the_content',  	  'balanceTags', 50);
+		remove_filter('content_save_pre', 'balanceTags', 50);
+		remove_filter('excerpt_save_pre', 'balanceTags', 50);
+		add_filter('the_content', 'balanceTags', 50);
 		add_filter('get_the_excerpt', 'balanceTags', 9);
 	}
 
@@ -128,7 +128,7 @@ 
 		add_filter('pre_comment_content', 'Markdown', 6);
 		add_filter('pre_comment_content', 'mdwp_hide_tags', 8);
 		add_filter('pre_comment_content', 'mdwp_show_tags', 12);
-		add_filter('get_comment_text',    'Markdown', 6);
+		add_filter('get_comment_text', 'Markdown', 6);
 		add_filter('get_comment_excerpt', 'Markdown', 6);
 		add_filter('get_comment_excerpt', 'mdwp_strip_p', 7);
 
@@ -136,13 +136,13 @@ 
 		$mdwp_hidden_tags = explode(' ',
 			'<p> </p> <pre> </pre> <ol> </ol> <ul> </ul> <li> </li>');
 		$mdwp_placeholders = explode(' ', str_rot13(
-			'pEj07ZbbBZ U1kqgh4w4p pre2zmeN6K QTi31t9pre ol0MP1jzJR '.
+			'pEj07ZbbBZ U1kqgh4w4p pre2zmeN6K QTi31t9pre ol0MP1jzJR ' .
 			'ML5IjmbRol ulANi1NsGY J7zRLJqPul liA8ctl16T K9nhooUHli'));
 	}
 
 	function mdwp_add_p($text) {
 		if (!preg_match('{^$|^<(p|ul|ol|dl|pre|blockquote)>}i', $text)) {
-			$text = '<p>'.$text.'</p>';
+			$text = '<p>' . $text . '</p>';
 			$text = preg_replace('{\n{2,}}', "</p>\n\n<p>", $text);
 		}
 		return $text;
@@ -193,13 +193,13 @@ 
 	@include_once 'smartypants.php';
 	# Fake Textile class. It calls Markdown instead.
 	class Textile {
-		function TextileThis($text, $lite='', $encode='') {
+		function TextileThis($text, $lite = '', $encode = '') {
 			if ($lite == '' && $encode == '')    $text = Markdown($text);
 			if (function_exists('SmartyPants'))  $text = SmartyPants($text);
 			return $text;
 		}
 		# Fake restricted version: restrictions are not supported for now.
-		function TextileRestricted($text, $lite='', $noimage='') {
+		function TextileRestricted($text, $lite = '', $noimage = '') {
 			return $this->TextileThis($text, $lite);
 		}
 		# Workaround to ensure compatibility with TextPattern 4.0.3.
@@ -248,14 +248,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->early_gamut); // @olvlv
@@ -342,13 +342,11 @@ 
 		return $text . "\n";
 	}
 
-	public $early_gamut = array
-	(
+	public $early_gamut = array(
 		'doFencedCodeBlocks' => 5
 	);
 
-	var $document_gamut = array
-	(
+	var $document_gamut = array(
 		# Strip link definitions, store in hashes.
 		"stripLinkDefinitions" => 20,
 
@@ -359,8 +357,7 @@ 
 	 * @var array These are all the transformations that form block-level tags like paragraphs, headers, and
 	 * list items.
 	 */
-	public $block_gamut = array
-	(
+	public $block_gamut = array(
 		"doHeaders"         => 10,
 		"doHorizontalRules" => 20,
 
@@ -378,7 +375,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
 							  [ ]*
@@ -407,7 +404,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
 	}
 
@@ -431,7 +428,7 @@ 
 		# *  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|'.
+		$block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|' .
 						   'script|noscript|form|fieldset|iframe|math';
 
 		# Regular expression for the content of a block tag.
@@ -456,12 +453,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
 					)
@@ -494,20 +491,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
@@ -515,16 +512,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:
 						<!-- .*? -->
 					)
@@ -533,7 +530,7 @@ 
 
 			| # PHP and ASP-style processor instructions (<? and <%)
 
-					[ ]{0,'.$less_than_tab.'}
+					[ ]{0,'.$less_than_tab . '}
 					(?s:
 						<([?%])			# $2
 						.*?
@@ -634,7 +631,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);
 	}
 
@@ -698,7 +695,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
@@ -717,14 +714,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
@@ -756,9 +753,9 @@ 
 		return $text;
 	}
 	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].
@@ -774,10 +771,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);
@@ -790,17 +787,17 @@ 
 		return $result;
 	}
 	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);
@@ -820,7 +817,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
@@ -841,7 +838,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
@@ -849,7 +846,7 @@ 
 				(?:
 					<(\S*)>	# src url = $3
 				|
-					('.$this->nested_url_parenthesis_re.')	# src url = $4
+					('.$this->nested_url_parenthesis_re . ')	# src url = $4
 				)
 				[ \n]*
 				(			# $5
@@ -881,7 +878,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);
@@ -894,17 +891,17 @@ 
 		return $result;
 	}
 	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;
 
@@ -948,12 +945,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";
 	}
 	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";
 	}
 
@@ -979,8 +976,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:.+?)
@@ -991,13 +988,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 . '[ ]+
 					  )
 				  )
 				)
@@ -1009,14 +1006,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);
 			}
@@ -1033,13 +1030,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";
 	}
 
 	var $list_level = 0;
@@ -1078,12 +1075,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);
 
@@ -1092,17 +1089,17 @@ 
 	}
 	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:
@@ -1123,11 +1120,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);
 
@@ -1156,7 +1153,7 @@ 
 		}
 
 		$codeblock = "<pre class=\"$class\"><code>$codeblock\n</code></pre>";
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+		return "\n\n" . $this->hashBlock($codeblock) . "\n\n";
 	}
 
 	/**
@@ -1204,7 +1201,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;
 			}
 		}
@@ -1230,8 +1227,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.
@@ -1258,7 +1255,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);
@@ -1352,7 +1349,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,
@@ -1360,7 +1357,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";
 	}
 	function _doBlockQuotes_callback2($matches) {
 		$pre = $matches[1];
@@ -1462,7 +1459,7 @@ 
 			# Ampersand-encoding based entirely on Nat Irons's Amputator
 			# MT plugin: <http://bumppo.net/projects/amputator/>
 			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
-								'&amp;', $text);;
+								'&amp;', $text); ;
 		}
 		# Encode remaining <'s
 		$text = str_replace('<', '&lt;', $text);
@@ -1528,7 +1525,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);
@@ -1538,8 +1535,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 . ';';
 			}
 		}
 
@@ -1560,11 +1557,11 @@ 
 
 		$span_re = '{
 				(
-					\\\\'.$this->escape_chars_re.'
+					\\\\'.$this->escape_chars_re . '
 				|
 					(?<![`\\\\])
 					`+						# code span marker
-			'.( $this->no_markup ? '' : '
+			'.($this->no_markup ? '' : '
 				|
 					<!--    .*?     -->		# comment
 				|
@@ -1576,7 +1573,7 @@ 
 						(?>[^"\'>]+|"[^"]*"|\'[^\']*\')*
 					)?
 					>
-			').'
+			') . '
 				)
 				}xs';
 
@@ -1615,10 +1612,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];
@@ -1636,7 +1633,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);
 	}
 
 

Braces +30 added lines, -23 removed lines

@@ -194,8 +194,12 @@ 
 	# Fake Textile class. It calls Markdown instead.
 	class Textile {
 		function TextileThis($text, $lite='', $encode='') {
-			if ($lite == '' && $encode == '')    $text = Markdown($text);
-			if (function_exists('SmartyPants'))  $text = SmartyPants($text);
+			if ($lite == '' && $encode == '') {
+				$text = Markdown($text);
+			}
+			if (function_exists('SmartyPants')) {
+				$text = SmartyPants($text);
+			}
 			return $text;
 		}
 		# Fake restricted version: restrictions are not supported for now.
@@ -413,7 +417,9 @@ 
 
 
 	function hashHTMLBlocks($text) {
-		if ($this->no_markup)  return $text;
+		if ($this->no_markup) {
+			return $text;
+		}
 
 		$less_than_tab = $this->tab_width - 1;
 
@@ -689,7 +695,9 @@ 
 	#
 	# Turn Markdown link shortcuts into XHTML <a> tags.
 	#
-		if ($this->in_anchor) return $text;
+		if ($this->in_anchor) {
+			return $text;
+		}
 		$this->in_anchor = true;
 
 		#
@@ -783,8 +791,7 @@ 
 			$link_text = $this->runSpanGamut($link_text);
 			$result .= ">$link_text</a>";
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			$result = $whole_match;
 		}
 		return $result;
@@ -885,8 +892,7 @@ 
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			# If there's no such link ID, leave intact:
 			$result = $whole_match;
 		}
@@ -944,8 +950,9 @@ 
 	}
 	function _doHeaders_callback_setext($matches) {
 		# Terrible hack to check we haven't found an empty list item.
-		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
-			return $matches[0];
+		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1])) {
+					return $matches[0];
+		}
 
 		$level = $matches[2]{0} == '=' ? 1 : 2;
 		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
@@ -1012,8 +1019,7 @@ 
 						'.$whole_list_re.'
 					}mx',
 					array(&$this, '_doLists_callback'), $text);
-			}
-			else {
+			} else {
 				$text = preg_replace_callback('{
 						(?:(?<=\n)\n|\A\n?) # Must eat the newline
 						'.$whole_list_re.'
@@ -1103,8 +1109,7 @@ 
 			# Replace marker with the appropriate whitespace indentation
 			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
 			$item = $this->runBlockGamut($this->outdent($item)."\n");
-		}
-		else {
+		} else {
 			# Recursion for sub-lists:
 			$item = $this->doLists($this->outdent($item));
 			$item = preg_replace('/\n+$/', '', $item);
@@ -1149,8 +1154,7 @@ 
 			$class = $format_match[1];
 			$codeblock = substr($codeblock, strlen($format_match[0]));
 			$codeblock = $this->format_codeblock($codeblock, $class);
-		}
-		else
+		} else
 		{
 			$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
 		}
@@ -1389,8 +1393,7 @@ 
 				$value = preg_replace('/^([ ]*)/', "<p>", $value);
 				$value .= "</p>";
 				$grafs[$key] = $this->unhash($value);
-			}
-			else {
+			} else {
 				# Is a block.
 				# Modify elements of @grafs in-place...
 				$graf = $value;
@@ -1538,8 +1541,11 @@ 
 				# 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.';';
+				}
 			}
 		}
 
@@ -1597,8 +1603,7 @@ 
 			if (isset($parts[1])) {
 				$output .= $this->handleSpanToken($parts[1], $parts[2]);
 				$str = $parts[2];
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -1681,7 +1686,9 @@ 
 	# function that will loosely count the number of UTF-8 characters with a
 	# regular expression.
 	#
-		if (function_exists($this->utf8_strlen)) return;
+		if (function_exists($this->utf8_strlen)) {
+			return;
+		}
 		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
 			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
 			$text, $m);');

lib/markdown/markdown_extras.php

Doc Comments +9 added lines

@@ -375,6 +375,12 @@ 
 
 		return array($parsed, $text);
 	}
+
+	/**
+	 * @param string $text
+	 * @param string $hash_method
+	 * @param boolean $md_attr
+	 */
 	function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
 	#
 	# Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
@@ -804,6 +810,9 @@ 
 	}
 
 
+	/**
+	 * @return string
+	 */
 	function processDefListItems($list_str) {
 	#
 	#	Process the contents of a single definition list, splitting it

Spacing +73 added lines, -73 removed lines

@@ -142,7 +142,7 @@ 
 		#
 		# Call the HTML-in-Markdown hasher.
 		#
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		list($text,) = $this->_hashHTMLBlocks_inMarkdown($text);
 
 		return $text;
 	}
@@ -191,10 +191,10 @@ 
 				(					# $2: Capture hole 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.
@@ -214,25 +214,25 @@ 
 				|
 					# Code span marker
 					`+
-				'. ( !$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).'}~~~+[ ]*\n
-				' : '' ). ' # End (if not is span).
+					[ ]{0,'.($indent) . '}~~~+[ ]*\n
+				' : '') . ' # End (if not is span).
 				)
 			}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
@@ -274,7 +274,7 @@ 
 			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.
@@ -289,10 +289,10 @@ 
 			#
 			# Check for: Fenced code block marker.
 			#
-			else if (preg_match('{^\n?[ ]{0,'.($indent+3).'}~}', $tag)) {
+			else if (preg_match('{^\n?[ ]{0,' . ($indent + 3) . '}~}', $tag)) {
 				# Fenced code block marker: find matching end marker.
 				$tag_re = preg_quote(trim($tag));
-				if (preg_match('{^(?>.*\n)+?[ ]{0,'.($indent).'}'.$tag_re.'[ ]*\n}', $text,
+				if (preg_match('{^(?>.*\n)+?[ ]{0,' . ($indent) . '}' . $tag_re . '[ ]*\n}', $text,
 					$matches))
 				{
 					# End marker found: pass text unchanged until marker.
@@ -317,10 +317,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.
@@ -334,7 +334,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.
@@ -349,13 +349,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) {
 					#
@@ -427,11 +427,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.
@@ -470,7 +470,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.
@@ -481,9 +481,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++;
 				}
 
 				#
@@ -499,7 +499,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)) {
@@ -608,14 +608,14 @@ 
 		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
 			return $matches[0];
 		$level = $matches[3]{0} == '=' ? 1 : 2;
-		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
-		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
+		$attr  = $this->_doHeaders_attr($id = & $matches[2]);
+		$block = "<h$level$attr>" . $this->runSpanGamut($matches[1]) . "</h$level>";
 		return "\n" . $this->hashBlock($block) . "\n\n";
 	}
 	function _doHeaders_callback_atx($matches) {
 		$level = strlen($matches[1]);
-		$attr  = $this->_doHeaders_attr($id =& $matches[3]);
-		$block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
+		$attr  = $this->_doHeaders_attr($id = & $matches[3]);
+		$block = "<h$level$attr>" . $this->runSpanGamut($matches[2]) . "</h$level>";
 		return "\n" . $this->hashBlock($block) . "\n\n";
 	}
 
@@ -636,11 +636,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
@@ -664,10 +664,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
@@ -682,8 +682,8 @@ 
 		return $text;
 	}
 	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.
@@ -692,17 +692,17 @@ 
 		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
 	}
 	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);
+		$separators = preg_split('/ *[|] */', $underline);
 		foreach ($separators as $n => $s) {
 			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
 			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
@@ -712,16 +712,16 @@ 
 
 		# 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);
+		$head = $this->parseSpan($head);
+		$headers = preg_split('/ *[|] */', $head);
+		$col_count = count($headers);
 
 		# 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";
 
@@ -740,7 +740,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";
@@ -760,10 +760,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
@@ -772,13 +772,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
 				  )
 			  )
 			)
@@ -786,7 +786,7 @@ 
 
 		$text = preg_replace_callback('{
 				(?>\A\n?|(?<=\n\n))
-				'.$whole_list_re.'
+				'.$whole_list_re . '
 			}mx',
 			array(&$this, '_doDefLists_callback'), $text);
 
@@ -818,7 +818,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).
@@ -832,13 +832,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
 				)
 			)
@@ -859,13 +859,13 @@ 
 	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);
@@ -934,7 +934,7 @@ 
 
 		$codeblock = '<pre' . ($class ? ' class="' . $class . '"' : '') . '><code>' . $codeblock . '</code></pre>';
 
-		return "\n\n".$this->hashBlock($codeblock)."\n\n";
+		return "\n\n" . $this->hashBlock($codeblock) . "\n\n";
 	}
 
 	function _doFencedCodeBlocks_newlines($matches)
@@ -1011,7 +1011,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)
@@ -1058,7 +1058,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 = " rev=\"footnote\"";
@@ -1132,12 +1132,12 @@ 
 			$node_id = $this->encodeAttribute($node_id);
 
 			return
-				"<sup id=\"fnref:$node_id\">".
-				"<a href=\"#fn:$node_id\"$attr>$num</a>".
+				"<sup id=\"fnref:$node_id\">" .
+				"<a href=\"#fn:$node_id\"$attr>$num</a>" .
 				"</sup>";
 		}
 
-		return "[^".$matches[1]."]";
+		return "[^" . $matches[1] . "]";
 	}
 
 
@@ -1151,7 +1151,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'),
@@ -1176,10 +1176,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);
 		}

Braces +59 added lines, -38 removed lines

@@ -84,8 +84,9 @@ 
 		$this->footnote_counter = 1;
 
 		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
-			if ($this->abbr_word_re)
-				$this->abbr_word_re .= '|';
+			if ($this->abbr_word_re) {
+							$this->abbr_word_re .= '|';
+			}
 			$this->abbr_word_re .= preg_quote($abbr_word);
 			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
 		}
@@ -174,7 +175,9 @@ 
 	#
 	# Returns an array of that form: ( processed text , remaining text )
 	#
-		if ($text === '') return array('', '');
+		if ($text === '') {
+			return array('', '');
+		}
 
 		# Regex to check for the presense of newlines around a block tag.
 		$newline_before_re = '/(?:^\n?|\n\n)*$/';
@@ -280,8 +283,7 @@ 
 					# End marker found: pass text unchanged until marker.
 					$parsed .= $tag . $matches[0];
 					$text = substr($text, strlen($matches[0]));
-				}
-				else {
+				} else {
 					# Unmatched marker: just skip it.
 					$parsed .= $tag;
 				}
@@ -298,8 +300,7 @@ 
 					# End marker found: pass text unchanged until marker.
 					$parsed .= $tag . $matches[0];
 					$text = substr($text, strlen($matches[0]));
-				}
-				else {
+				} else {
 					# No end marker: just skip it.
 					$parsed .= $tag;
 				}
@@ -354,8 +355,11 @@ 
 				#
 				# Increase/decrease nested tag count.
 				#
-				if ($tag{1} == '/')						$depth--;
-				else if ($tag{strlen($tag)-2} != '/')	$depth++;
+				if ($tag{1} == '/') {
+					$depth--;
+				} else if ($tag{strlen($tag)-2} != '/') {
+					$depth++;
+				}
 
 				if ($depth < 0) {
 					#
@@ -367,8 +371,7 @@ 
 				}
 
 				$parsed .= $tag;
-			}
-			else {
+			} else {
 				$parsed .= $tag;
 			}
 		} while ($depth >= 0);
@@ -386,7 +389,9 @@ 
 	#
 	# Returns an array of that form: ( processed text , remaining text )
 	#
-		if ($text === '') return array('', '');
+		if ($text === '') {
+			return array('', '');
+		}
 
 		# Regex to match `markdown` attribute inside of a tag.
 		$markdown_attr_re = '
@@ -437,8 +442,9 @@ 
 		# Get the name of the starting tag.
 		# (This pattern makes $base_tag_name_re safe without quoting.)
 		#
-		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
-			$base_tag_name_re = $matches[1];
+		if (preg_match('/^<([\w:$]*)\b/', $text, $matches)) {
+					$base_tag_name_re = $matches[1];
+		}
 
 		#
 		# Loop through every tag until we find the corresponding closing tag.
@@ -475,15 +481,17 @@ 
 			{
 				# Just add the tag to the block as if it was text.
 				$block_text .= $tag;
-			}
-			else {
+			} else {
 				#
 				# 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 ($tag{1} == '/')						$depth--;
-					else if ($tag{strlen($tag)-2} != '/')	$depth++;
+					if ($tag{1} == '/') {
+						$depth--;
+					} else if ($tag{strlen($tag)-2} != '/') {
+						$depth++;
+					}
 				}
 
 				#
@@ -530,13 +538,17 @@ 
 					}
 
 					# Append tag content to parsed text.
-					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
-					else				$parsed .= "$block_text";
+					if (!$span_mode) {
+						$parsed .= "\n\n$block_text\n\n";
+					} else {
+						$parsed .= "$block_text";
+					}
 
 					# Start over a new block.
 					$block_text = "";
+				} else {
+					$block_text .= $tag;
 				}
-				else $block_text .= $tag;
 			}
 
 		} while ($depth > 0);
@@ -601,12 +613,15 @@ 
 		return $text;
 	}
 	function _doHeaders_attr($attr) {
-		if (empty($attr))  return "";
+		if (empty($attr)) {
+			return "";
+		}
 		return " id=\"$attr\"";
 	}
 	function _doHeaders_callback_setext($matches) {
-		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
-			return $matches[0];
+		if ($matches[3] == '-' && preg_match('{^- }', $matches[1])) {
+					return $matches[0];
+		}
 		$level = $matches[3]{0} == '=' ? 1 : 2;
 		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
 		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
@@ -704,10 +719,15 @@ 
 		# Reading alignement from header underline.
 		$separators	= preg_split('/ *[|] */', $underline);
 		foreach ($separators as $n => $s) {
-			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
-			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
-			else if (preg_match('/^ *:-+ *$/', $s))	$attr[$n] = ' align="left"';
-			else									$attr[$n] = '';
+			if (preg_match('/^ *-+: *$/', $s)) {
+				$attr[$n] = ' align="right"';
+			} else if (preg_match('/^ *:-+: *$/', $s)) {
+				$attr[$n] = ' align="center"';
+			} else if (preg_match('/^ *:-+ *$/', $s)) {
+				$attr[$n] = ' align="left"';
+			} else {
+				$attr[$n] = '';
+			}
 		}
 
 		# Parsing span elements, including code spans, character escapes,
@@ -720,8 +740,9 @@ 
 		$text = "<table>\n";
 		$text .= "<thead>\n";
 		$text .= "<tr>\n";
-		foreach ($headers as $n => $header)
-			$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+		foreach ($headers as $n => $header) {
+					$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+		}
 		$text .= "</tr>\n";
 		$text .= "</thead>\n";
 
@@ -739,8 +760,9 @@ 
 			$row_cells = array_pad($row_cells, $col_count, '');
 
 			$text .= "<tr>\n";
-			foreach ($row_cells as $n => $cell)
-				$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+			foreach ($row_cells as $n => $cell) {
+							$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+			}
 			$text .= "</tr>\n";
 		}
 		$text .= "</tbody>\n";
@@ -866,8 +888,7 @@ 
 			$def = str_repeat(' ', strlen($marker_space)) . $def;
 			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
 			$def = "\n". $def ."\n";
-		}
-		else {
+		} else {
 			$def = rtrim($def);
 			$def = $this->runSpanGamut($this->outdent($def));
 		}
@@ -925,8 +946,7 @@ 
 		{
 			$codeblock = $this->format_codeblock($codeblock, $class);
 			$codeblock = $this->unhash($codeblock);
-		}
-		else
+		} else
 		{
 			$codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
 			$codeblock = preg_replace_callback('/^\n+/', array($this, '_doFencedCodeBlocks_newlines'), $codeblock);
@@ -1161,8 +1181,9 @@ 
 	function _stripAbbreviations_callback($matches) {
 		$abbr_word = $matches[1];
 		$abbr_desc = $matches[2];
-		if ($this->abbr_word_re)
-			$this->abbr_word_re .= '|';
+		if ($this->abbr_word_re) {
+					$this->abbr_word_re .= '|';
+		}
 		$this->abbr_word_re .= preg_quote($abbr_word);
 		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
 		return ''; # String that will replace the block

lib/textmark/textmark.php

Doc Comments +13 added lines

@@ -219,6 +219,9 @@ 
 		return $text;
 	}
 
+	/**
+	 * @param string $text
+	 */
 	private function doSourcePublish($text)
 	{
 		return Patron($text);
@@ -796,6 +799,9 @@ 
 	 **
 	 */
 
+	/**
+	 * @param string $markup
+	 */
 	function createElement($markup, $attrs, $body=NULL)
 	{
 		$rc = array();
@@ -934,6 +940,10 @@ 
 	# PHP source highlighter
 	#
 
+	/**
+	 * @param string $text
+	 * @param string $marker
+	 */
 	function doSourceCommentLine($text, $marker)
 	{
 		$lines = explode("\n", $text);
@@ -983,6 +993,9 @@ 
 	const QUOTE_DOUBLE = '"';
 	const ESCAPE = '\\';
 
+	/**
+	 * @param string $text
+	 */
 	function doSourceString($text)
 	{
 		$out = NULL;

Indentation +1 added lines, -1 removed lines

@@ -1124,7 +1124,7 @@
 			'break',
 			'class',
 			'const',
-            'endif',
+			'endif',
 			'case',
 			'true',
 			'self',

Spacing +80 added lines, -106 removed lines

@@ -27,18 +27,18 @@ 
  @define('txt_registered',		  '®');
  @define('txt_copyright',		  '©');
  */
-@define('txt_apostrophe',		  '\'');
-@define('txt_quote_double_open',  '« ');
+@define('txt_apostrophe', '\'');
+@define('txt_quote_double_open', '« ');
 @define('txt_quote_double_close', ' »');
-@define('txt_prime',			  'ʹ');
-@define('txt_prime_double', 	  'ʺ');
-@define('txt_ellipsis', 		  '…');
-@define('txt_emdash',			  '—');
-@define('txt_endash',			  '–');
-@define('txt_dimension',		  '×');
-@define('txt_trademark',		  '™');
-@define('txt_registered',		  '®');
-@define('txt_copyright',		  '©');
+@define('txt_prime', 'ʹ');
+@define('txt_prime_double', 'ʺ');
+@define('txt_ellipsis', '…');
+@define('txt_emdash', '—');
+@define('txt_endash', '–');
+@define('txt_dimension', '×');
+@define('txt_trademark', '™');
+@define('txt_registered', '®');
+@define('txt_copyright', '©');
 
 class Textmark_Parser extends MarkdownExtra_Parser
 {
@@ -52,14 +52,12 @@ 
 
 	function __construct()
 	{
-		$this->early_gamut += array
-		(
+		$this->early_gamut += array(
 			'doShell' => 5,
 			'doURL' => 6
 		);
 
-		$this->span_gamut += array
-		(
+		$this->span_gamut += array(
 			'doGlyphs' => 70,
 			'doSpan' => 71
 		);
@@ -69,8 +67,7 @@ 
 
 	public function doShell($text)
 	{
-		return preg_replace_callback
-		(
+		return preg_replace_callback(
 			'{^\$\s+([^\n]+)\n}xm', array($this, 'doShell_callback'), $text
 		);
 
@@ -269,8 +266,7 @@ 
 
 		*/
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'{
 				^h([1-6])\.	# $1 = string of h?
 				[ ]*
@@ -325,10 +321,10 @@ 
 
 		$c = "(?:{$clas}|{$styl}|{$lnge}|{$hlgn})*";
 
-		$qtags = array('\*\*','\*','\?\?','-','__','_','%','\+','~','\^');
+		$qtags = array('\*\*', '\*', '\?\?', '-', '__', '_', '%', '\+', '~', '\^');
 		$pnct = ".,\"'?!;:";
 
-		foreach($qtags as $f) {
+		foreach ($qtags as $f) {
 			$text = preg_replace_callback("/
 				(^|(?<=[\s>$pnct\(])|[{[])
 				($f)(?!$f)
@@ -367,7 +363,7 @@ 
 
 			if (($pre and !$tail) or ($tail and !$pre))
 			{
-				$out = $pre.$out.$tail;
+				$out = $pre . $out . $tail;
 			}
 
 			//		$this->dump($out);
@@ -380,23 +376,22 @@ 
 	{
 		//		echo l('doGlyphs: "\1"<br />', \ICanBoogie\escape($text));
 
-		$glyph_search = array
-		(
+		$glyph_search = array(
 		//		'/(\w)\'(\w)/', 									 // apostrophe's
-			'/(\s)\'(\d+\w?)\b(?!\')/u', 						 // back in '88
+			'/(\s)\'(\d+\w?)\b(?!\')/u', // back in '88
 		//		'/(\S)\'(?=\s|[[:punct:]]|<|$)/',						 //  single closing
 		//		'/\'/', 											 //  single opening
-			'/(\S)\"(?=\s|[[:punct:]]|<|$)/u',						 //  double closing
-			'/"/',												 //  double opening
-			'/\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/u',		 //  3+ uppercase acronym
-			'/(?<=\s|^|[>(;-])([A-Z]{3,})([a-z]*)(?=\s|[[:punct:]]|<|$)/u',  //  3+ uppercase
-			'/([^.]?)\.{3}/u',									 //  ellipsis
-			'/(\s?)--(\s?)/u',									 //  em dash
-			'/\s-(?:\s|$)/u',									 //  en dash
-			'/(\d+)( ?)x( ?)(?=\d+)/u',							 //  dimension sign
-			'/(\b ?|\s|^)[([]TM[])]/iu', 						 //  trademark
-			'/(\b ?|\s|^)[([]R[])]/iu',							 //  registered
-			'/(\b ?|\s|^)[([]C[])]/iu',							 //  copyright
+			'/(\S)\"(?=\s|[[:punct:]]|<|$)/u', //  double closing
+			'/"/', //  double opening
+			'/\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/u', //  3+ uppercase acronym
+			'/(?<=\s|^|[>(;-])([A-Z]{3,})([a-z]*)(?=\s|[[:punct:]]|<|$)/u', //  3+ uppercase
+			'/([^.]?)\.{3}/u', //  ellipsis
+			'/(\s?)--(\s?)/u', //  em dash
+			'/\s-(?:\s|$)/u', //  en dash
+			'/(\d+)( ?)x( ?)(?=\d+)/u', //  dimension sign
+			'/(\b ?|\s|^)[([]TM[])]/iu', //  trademark
+			'/(\b ?|\s|^)[([]R[])]/iu', //  registered
+			'/(\b ?|\s|^)[([]C[])]/iu', //  copyright
 
 		#
 		# the following is for french language
@@ -405,23 +400,22 @@ 
 			'#\s(\!|\?|\:|\;|\-)#u',
 		);
 
-		$glyph_replace = array
-		(
+		$glyph_replace = array(
 		//		'$1'.$txt_apostrophe.'$2',			 // apostrophe's
-			'$1'.txt_apostrophe.'$2',			 // back in '88
+			'$1' . txt_apostrophe . '$2', // back in '88
 		//		'$1'.$txt_quote_single_close,		 //  single closing
 		//		$txt_quote_single_open, 			 //  single opening
-			'$1'.txt_quote_double_close,		 //  double closing
-		txt_quote_double_open, 			 //  double opening
-			'<acronym title="$2">$1</acronym>',  //  3+ uppercase acronym
-			'<span class="caps">$1</span>$2',	 //  3+ uppercase
-			'$1'.txt_ellipsis, 				 //  ellipsis
-			'$1'.txt_emdash.'$2',				 //  em dash
-			' '.txt_endash.' ',				 //  en dash
-			'$1$2'.txt_dimension.'$3', 		 //  dimension sign
-			'$1'.txt_trademark,				 //  trademark
-			'$1'.txt_registered,				 //  registered
-			'$1'.txt_copyright,				 //  copyright
+			'$1' . txt_quote_double_close, //  double closing
+		txt_quote_double_open, //  double opening
+			'<acronym title="$2">$1</acronym>', //  3+ uppercase acronym
+			'<span class="caps">$1</span>$2', //  3+ uppercase
+			'$1' . txt_ellipsis, //  ellipsis
+			'$1' . txt_emdash . '$2', //  em dash
+			' ' . txt_endash . ' ', //  en dash
+			'$1$2' . txt_dimension . '$3', //  dimension sign
+			'$1' . txt_trademark, //  trademark
+			'$1' . txt_registered, //  registered
+			'$1' . txt_copyright, //  copyright
 
 		#
 		# the following is for french language
@@ -465,8 +459,7 @@ 
 
 			$style = NULL;
 
-			if (preg_match
-			(
+			if (preg_match(
 				'{
 					(						# the whole thing is saved in $1
 					^p						# start
@@ -581,14 +574,13 @@ 
 		# First, handle reference-style labeled images: ![alt text][id]
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'{
 			(										# wrap whole match in $1
 			  !										# start
 			  (\<|\||\>|\=)?							# alignment = $2
 			  \[
-				('.$this->nested_brackets_re.')		# alt text = $3
+				('.$this->nested_brackets_re . ')		# alt text = $3
 			  \]
 
 			  [ ]?				# one optional space
@@ -611,7 +603,7 @@ 
 			  !
 			  	(\<|\||\>|\=)?							# alignment = $2
 			  \[
-				('.$this->nested_brackets_re.')		# alt text = $3
+				('.$this->nested_brackets_re . ')		# alt text = $3
 			  \]
 			  \s?			# One optional whitespace character
 			  \(			# literal paren
@@ -619,7 +611,7 @@ 
 				(?:
 					<(\S*)>	# src url = $4
 				|
-					('.$this->nested_url_parenthesis_re.')	# src url = $5
+					('.$this->nested_url_parenthesis_re . ')	# src url = $5
 				)
 				[ ]*
 				(			# $6
@@ -695,10 +687,8 @@ 
 
 		if (isset($parts[1]))
 		{
-			$entry = $module->model()->loadRange
-			(
-			0, 1, 'WHERE `' . $module->getConstant('TITLE') . '` = ? AND `' . $module->getConstant('ALBUM') . '` = ?', array
-			(
+			$entry = $module->model()->loadRange(
+			0, 1, 'WHERE `' . $module->getConstant('TITLE') . '` = ? AND `' . $module->getConstant('ALBUM') . '` = ?', array(
 			$parts[1], $parts[0]
 			)
 			)
@@ -707,10 +697,8 @@ 
 		}
 		else
 		{
-			$entry = $module->model()->loadRange
-			(
-			0, 1, 'WHERE `slug` = ? OR `title` = ?', array
-			(
+			$entry = $module->model()->loadRange(
+			0, 1, 'WHERE `slug` = ? OR `title` = ?', array(
 			$id, $id
 			)
 			)
@@ -725,8 +713,7 @@ 
 			return parent::_doImages_reference_callback($matches);
 		}
 
-		$params = array
-		(
+		$params = array(
 			'src' => $entry->path,
 			'alt' => \ICanBoogie\escape($alt),
 			'width' => $entry->width,
@@ -755,11 +742,11 @@ 
 	{
 		//		\ICanBoogie\log('<pre>in \1: \2</pre>', __FUNCTION__, $matches);
 
-		$whole_match	= $matches[1];
+		$whole_match = $matches[1];
 		$align = $matches[2];
-		$alt_text		= $matches[3];
+		$alt_text = $matches[3];
 		$url			= $matches[4] == '' ? $matches[5] : $matches[4];
-		$title			=& $matches[8];
+		$title = & $matches[8];
 
 		$alt_text = str_replace('"', '&quot;', $alt_text);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
@@ -780,7 +767,7 @@ 
 		if (isset($title))
 		{
 			$title = str_replace('"', '&quot;', $title);
-			$result .=  " title=\"$title\""; # $title already quoted
+			$result .= " title=\"$title\""; # $title already quoted
 		}
 
 		$result .= $this->empty_element_suffix;
@@ -796,7 +783,7 @@ 
 	 **
 	 */
 
-	function createElement($markup, $attrs, $body=NULL)
+	function createElement($markup, $attrs, $body = NULL)
 	{
 		$rc = array();
 
@@ -845,8 +832,7 @@ 
 		# markup
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#(\<\!?[^\s^\>]+)(\s+[^\>]+)?(\/?\>)#m', array($this, '_do_html_markup'), $text
 		);
 
@@ -858,8 +844,7 @@ 
 
 		//		\ICanBoogie\log('## \1 ## <pre>\2</pre>', __FUNCTION__, $text);
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#\<\/[a-zA-Z]+\>#m', array($this, '_do_html_markup_close'), $text
 		);
 
@@ -900,8 +885,7 @@ 
 		# strings
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#\"[^\"]+\"#', array(&$this, '_do_html_string'), $text
 		);
 
@@ -911,8 +895,7 @@ 
 		# attributes
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#[^\s\=]+#', array(&$this, '_do_html_attribute'), $text
 		);
 
@@ -946,7 +929,7 @@ 
 		{
 			$in_quotes = NULL;
 
-			for ($i = 0 ; $i < strlen($line) ; $i++)
+			for ($i = 0; $i < strlen($line); $i++)
 			{
 				$c = $line{$i};
 
@@ -994,7 +977,7 @@ 
 
 		$y = strlen($text);
 
-		for ($i = 0 ; $i < $y ; $i++)
+		for ($i = 0; $i < $y; $i++)
 		{
 			$c = $text{$i};
 
@@ -1053,8 +1036,7 @@ 
 		# comment block
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#/\*.*?\*/#ms', array(&$this, '_do_php_comment'), $text
 		);
 
@@ -1064,8 +1046,7 @@ 
 		# functions
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#(\$?[a-zA-z0-9_]+)\(#', array(&$this, '_do_php_function'), $text
 		);
 
@@ -1075,8 +1056,7 @@ 
 
 		//		\ICanBoogie\log('## \1 ## <pre>\2</pre>', __FUNCTION__, \ICanBoogie\escape($text));
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#(\$|\-\>)([a-zA-z0-9_]+)(?!\x1A)#', array(&$this, '_do_php_variable'), $text
 		);
 
@@ -1084,13 +1064,11 @@ 
 		# numbers
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#0x[0-9a-fA-F]{1,8}#u', array(&$this, '_do_php_number'), $text
 		);
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#(?<!\x1A)\d+(?![\w])#u', array(&$this, '_do_php_number'), $text
 		);
 
@@ -1098,8 +1076,7 @@ 
 		# reserved keywords
 		#
 
-		$reserved = array
-		(
+		$reserved = array(
 			'include_once',
 			'require_once',
 			'endswitch',
@@ -1146,8 +1123,7 @@ 
 
 		foreach ($reserved as $k)
 		{
-			$text = preg_replace_callback
-			(
+			$text = preg_replace_callback(
 				'#' . $k . '#', array(&$this, '_do_php_reserved'), $text
 			);
 		}
@@ -1156,8 +1132,7 @@ 
 		# symbols
 		#
 
-		$text = preg_replace_callback
-		(
+		$text = preg_replace_callback(
 			'#[\(\)\[\]\{\}\!\@\%\&\*\|\/\<\>\-\+\=]+#', array(&$this, '_do_php_symbol'), $text
 		);
 
@@ -1219,8 +1194,7 @@ 
 
 		//		\ICanBoogie\log('## \1 ## \2', __FUNCTION__, $matches);
 
-		return $this->hashPart
-		(
+		return $this->hashPart(
 			'<span class="comment">' .
 		$this->_do_codeentities($matches[0]) .
 			'</span>'
@@ -1263,7 +1237,7 @@ 
 			return $matches[0];
 		}
 
-		return $this->hashPart('<span class="function">' . $matches[1] . '</span>', 'F'). '(';
+		return $this->hashPart('<span class="function">' . $matches[1] . '</span>', 'F') . '(';
 	}
 
 	function _do_php_symbol($matches)
@@ -1289,10 +1263,10 @@ 
 
 	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->encodeAmpsAndAngles($url);
 
@@ -1300,7 +1274,7 @@ 
 		if (isset($title)) {
 			$title = str_replace('"', '&quot;', $title);
 			$title = $this->encodeAmpsAndAngles($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 
 		if (substr($url, 0, 7) == 'http://')

Braces +9 added lines, -18 removed lines

@@ -513,8 +513,7 @@ 
 				if ($style)
 				{
 					$value = '<p style="' . $style . '">' . $value . '</p>';
-				}
-				else
+				} else
 				{
 					$value = "<p>$value</p>";
 				}
@@ -704,8 +703,7 @@ 
 			)
 			->fetchAndClose();
 
-		}
-		else
+		} else
 		{
 			$entry = $module->model()->loadRange
 			(
@@ -953,16 +951,13 @@ 
 				if (($c == $in_quotes) && (($i > 1) && ($line{$i - 1} != '\\')))
 				{
 					$in_quotes = NULL;
-				}
-				else if ($in_quotes)
+				} else if ($in_quotes)
 				{
 					continue;
-				}
-				else if (($c == '\'') || ($c == '"'))
+				} else if (($c == '\'') || ($c == '"'))
 				{
 					$in_quotes = $c;
-				}
-				else if (substr($line, $i, $marker_len) == $marker)
+				} else if (substr($line, $i, $marker_len) == $marker)
 				{
 					//					echo l('found marker at \1 (\2)<br />', $i, \ICanBoogie\escape(substr($line, $i, 16)));
 
@@ -1005,27 +1000,23 @@ 
 					$escaped = false;
 
 					continue;
-				}
-				else if ($quote_start !== null && $c == $quote)
+				} else if ($quote_start !== null && $c == $quote)
 				{
 					$out .= $this->hashPart('<span class="string">' . \ICanBoogie\escape($quote . substr($text, $quote_start + 1, $i - $quote_start - 1) . $quote) . '</span>');
 
 					$quote_start = null;
 					$quote = null;
-				}
-				else
+				} else
 				{
 					$quote = $c;
 					$quote_start = $i;
 				}
-			}
-			else
+			} else
 			{
 				if ($c == '\\')
 				{
 					$escaped = !$escaped;
-				}
-				else
+				} else
 				{
 					$escaped = false;
 				}

res/markups.php

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
 
 		$hooks . 'markup_template', [
 
-			'name' => [ 'required' => true ]
+			'name' => ['required' => true]
 
 		],
 
@@ -26,7 +26,7 @@ 
 
 		$hooks . 'markup_call_template', [
 
-			'name' => [ 'required' => true ]
+			'name' => ['required' => true]
 
 		],
 
@@ -38,7 +38,7 @@ 
 
 		$hooks . 'markup_decorate', [
 
-			'with' => [ 'required' => true ]
+			'with' => ['required' => true]
 
 		]
 	],
@@ -47,7 +47,7 @@ 
 
 		$hooks . 'markup_foreach', [
 
-			'in' => [ 'default' => 'this', 'expression' => true ],
+			'in' => ['default' => 'this', 'expression' => true],
 			'as' => null
 
 		]
@@ -57,8 +57,8 @@ 
 
 		$hooks . 'markup_variable', [
 
-			'name' => [ 'required' => true ],
-			'select' => [ 'expression' => true ]
+			'name' => ['required' => true],
+			'select' => ['expression' => true]
 
 		],
 
@@ -69,7 +69,7 @@ 
 
 		$hooks . 'markup_with', [
 
-			'select' => [ 'expression' => true ]
+			'select' => ['expression' => true]
 
 		]
 	],
@@ -89,8 +89,8 @@ 
 
 		$hooks . 'markup_if', [
 
-			'test' => [ 'expression' => [ 'silent' => true ] ],
-			'select' => [ 'expression' => [ 'silent' => true ] ],
+			'test' => ['expression' => ['silent' => true]],
+			'select' => ['expression' => ['silent' => true]],
 			'equals' => null
 
 		],
@@ -103,7 +103,7 @@ 
 
 		$hooks . 'markup_translate', [
 
-			'native' => [ 'required' => true ]
+			'native' => ['required' => true]
 
 		]
 	],
@@ -120,7 +120,7 @@ 
 			'page' => null,
 			'limit' => null,
 			'with' => null,
-			'range' => [ 'expression' => true ],
+			'range' => ['expression' => true],
 			'noarrows' => false
 
 		]

lib/ControlNode.php

Spacing +2 added lines, -2 removed lines

@@ -136,11 +136,11 @@
 		# call hook
 		#
 
-		$engine->trace_enter([ 'markup', $name ]);
+		$engine->trace_enter(['markup', $name]);
 
 		if ($binding)
 		{
-			array_push($engine->context_markup, [ $engine->context['self'], $engine->context['this'] ]);
+			array_push($engine->context_markup, [$engine->context['self'], $engine->context['this']]);
 
 			$engine->context['self'] = [
 

Braces +5 added lines, -10 removed lines

@@ -74,19 +74,16 @@ 
 						if ($value{0} == ':')
 						{
 							$args[$param] = substr($value, 1);
-						}
-						else
+						} else
 						{
 							$args[$param] = $engine->evaluate($value, $silent, $context);
 						}
 					}
-				}
-				else if (isset($options['required']))
+				} else if (isset($options['required']))
 				{
 					$missing[$param] = true;
 				}
-			}
-			else
+			} else
 			{
 				if (!array_key_exists($param, $args))
 				{
@@ -122,8 +119,7 @@ 
 				if (isset($arg->args['select']))
 				{
 					$arg = $engine->evaluate($arg->args['select'], false, $context);
-				}
-				else
+				} else
 				{
 					$arg = $engine($arg->nodes);
 				}
@@ -155,8 +151,7 @@ 
 		try
 		{
 			$rc = call_user_func($callback, $args, $engine, $this->nodes);
-		}
-		catch (\Exception $e)
+		} catch (\Exception $e)
 		{
 			$engine->handle_exception($e);
 		}