Icybee / Patron

lib/Evaluator.php

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/textmark/textmark.php

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;
 				}

lib/Hooks.php

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

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/Engine.php

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/ControlNode.php

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);
 		}

lib/markdown/markdown.php

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

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/Compiler.php

Braces +4 added lines, -8 removed lines

@@ -47,8 +47,7 @@ 
 				}
 
 				$nodes[] = new ControlNode($node['name'], $node['args'], $children);
-			}
-			else
+			} else
 			{
 				#
 				# we don't resolve comments, unless they are Internet Explorer comments e.g. <!--[
@@ -61,8 +60,7 @@ 
 					$children = $this->parse_html_node($node);
 
 					$nodes = array_merge($nodes, $children);
-				}
-				else
+				} else
 				{
 					#
 					# The comments, which are on odd position, are kept intact. The text, which is
@@ -74,8 +72,7 @@ 
 						if ($i % 2)
 						{
 							$nodes[] = new TextNode($part);
-						}
-						else
+						} else
 						{
 							$children = $this->parse_html_node($part);
 
@@ -99,8 +96,7 @@ 
 			if ($i % 2)
 			{
 				$nodes[] = $this->parse_expression($part);
-			}
-			else
+			} else
 			{
 				$nodes[] = new TextNode($part);
 			}