dwoo-project / dwoo

lib/Dwoo/Plugins/Functions/PluginTruncate.php

Indentation +17 added lines, -17 removed lines

@@ -33,25 +33,25 @@
  */
 function PluginTruncate(Core $dwoo, $value, $length = 80, $etc = '...', $break = false, $middle = false)
 {
-    if ($length == 0) {
-        return '';
-    }
+	if ($length == 0) {
+		return '';
+	}
 
-    $value  = (string)$value;
-    $etc    = (string)$etc;
-    $length = (int)$length;
+	$value  = (string)$value;
+	$etc    = (string)$etc;
+	$length = (int)$length;
 
-    if (strlen($value) < $length) {
-        return $value;
-    }
+	if (strlen($value) < $length) {
+		return $value;
+	}
 
-    $length = max($length - strlen($etc), 0);
-    if ($break === false && $middle === false) {
-        $value = preg_replace('#\s+(\S*)?$#', '', substr($value, 0, $length + 1));
-    }
-    if ($middle === false) {
-        return substr($value, 0, $length) . $etc;
-    }
+	$length = max($length - strlen($etc), 0);
+	if ($break === false && $middle === false) {
+		$value = preg_replace('#\s+(\S*)?$#', '', substr($value, 0, $length + 1));
+	}
+	if ($middle === false) {
+		return substr($value, 0, $length) . $etc;
+	}
 
-    return substr($value, 0, ceil($length / 2)) . $etc . substr($value, - floor($length / 2));
+	return substr($value, 0, ceil($length / 2)) . $etc . substr($value, - floor($length / 2));
 }

Spacing +7 added lines, -7 removed lines

@@ -37,21 +37,21 @@
         return '';
     }
 
-    $value  = (string)$value;
-    $etc    = (string)$etc;
-    $length = (int)$length;
+    $value  = (string) $value;
+    $etc    = (string) $etc;
+    $length = (int) $length;
 
     if (strlen($value) < $length) {
         return $value;
     }
 
-    $length = max($length - strlen($etc), 0);
+    $length = max($length-strlen($etc), 0);
     if ($break === false && $middle === false) {
-        $value = preg_replace('#\s+(\S*)?$#', '', substr($value, 0, $length + 1));
+        $value = preg_replace('#\s+(\S*)?$#', '', substr($value, 0, $length+1));
     }
     if ($middle === false) {
-        return substr($value, 0, $length) . $etc;
+        return substr($value, 0, $length).$etc;
     }
 
-    return substr($value, 0, ceil($length / 2)) . $etc . substr($value, - floor($length / 2));
+    return substr($value, 0, ceil($length/2)).$etc.substr($value, - floor($length/2));
 }

lib/Dwoo/Plugins/Functions/PluginTifCompile.php

Indentation +44 added lines, -44 removed lines

@@ -34,56 +34,56 @@
  */
 function PluginTifCompile(Compiler $compiler, array $rest, array $tokens)
 {
-    // load if plugin
-    if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
-        try {
-            $compiler->getDwoo()->getLoader()->loadPlugin('if');
-        }
-        catch (Exception $e) {
-            throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
-        }
-    }
+	// load if plugin
+	if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
+		try {
+			$compiler->getDwoo()->getLoader()->loadPlugin('if');
+		}
+		catch (Exception $e) {
+			throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
+		}
+	}
 
-    if (count($rest) == 1) {
-        return $rest[0];
-    }
+	if (count($rest) == 1) {
+		return $rest[0];
+	}
 
-    // fetch false result and remove the ":" if it was present
-    $falseResult = array_pop($rest);
+	// fetch false result and remove the ":" if it was present
+	$falseResult = array_pop($rest);
 
-    if (trim(end($rest), '"\'') === ':') {
-        // remove the ':' if present
-        array_pop($rest);
-    } elseif (trim(end($rest), '"\'') === '?' || count($rest) === 1) {
-        if ($falseResult === '?' || $falseResult === ':') {
-            throw new CompilationException($compiler, 'Tif: incomplete tif statement, value missing after ' . $falseResult);
-        }
-        // there was in fact no false result provided, so we move it to be the true result instead
-        $trueResult  = $falseResult;
-        $falseResult = "''";
-    }
+	if (trim(end($rest), '"\'') === ':') {
+		// remove the ':' if present
+		array_pop($rest);
+	} elseif (trim(end($rest), '"\'') === '?' || count($rest) === 1) {
+		if ($falseResult === '?' || $falseResult === ':') {
+			throw new CompilationException($compiler, 'Tif: incomplete tif statement, value missing after ' . $falseResult);
+		}
+		// there was in fact no false result provided, so we move it to be the true result instead
+		$trueResult  = $falseResult;
+		$falseResult = "''";
+	}
 
-    // fetch true result if needed
-    if (!isset($trueResult)) {
-        $trueResult = array_pop($rest);
-        // no true result provided so we use the expression arg
-        if ($trueResult === '?') {
-            $trueResult = true;
-        }
-    }
+	// fetch true result if needed
+	if (!isset($trueResult)) {
+		$trueResult = array_pop($rest);
+		// no true result provided so we use the expression arg
+		if ($trueResult === '?') {
+			$trueResult = true;
+		}
+	}
 
-    // remove the '?' if present
-    if (trim(end($rest), '"\'') === '?') {
-        array_pop($rest);
-    }
+	// remove the '?' if present
+	if (trim(end($rest), '"\'') === '?') {
+		array_pop($rest);
+	}
 
-    // check params were correctly provided
-    if (empty($rest) || $trueResult === null || $falseResult === null) {
-        throw new CompilationException($compiler, 'Tif: you must provide three parameters serving as <expression> ? <true value> : <false value>');
-    }
+	// check params were correctly provided
+	if (empty($rest) || $trueResult === null || $falseResult === null) {
+		throw new CompilationException($compiler, 'Tif: you must provide three parameters serving as <expression> ? <true value> : <false value>');
+	}
 
-    // parse condition
-    $condition = PluginIf::replaceKeywords($rest, $tokens, $compiler);
+	// parse condition
+	$condition = PluginIf::replaceKeywords($rest, $tokens, $compiler);
 
-    return '((' . implode(' ', $condition) . ') ? ' . ($trueResult === true ? implode(' ', $condition) : $trueResult) . ' : ' . $falseResult . ')';
+	return '((' . implode(' ', $condition) . ') ? ' . ($trueResult === true ? implode(' ', $condition) : $trueResult) . ' : ' . $falseResult . ')';
 }

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 function PluginTifCompile(Compiler $compiler, array $rest, array $tokens)
 {
     // load if plugin
-    if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
+    if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS.'PluginIf')) {
         try {
             $compiler->getDwoo()->getLoader()->loadPlugin('if');
         }
@@ -56,7 +56,7 @@ 
         array_pop($rest);
     } elseif (trim(end($rest), '"\'') === '?' || count($rest) === 1) {
         if ($falseResult === '?' || $falseResult === ':') {
-            throw new CompilationException($compiler, 'Tif: incomplete tif statement, value missing after ' . $falseResult);
+            throw new CompilationException($compiler, 'Tif: incomplete tif statement, value missing after '.$falseResult);
         }
         // there was in fact no false result provided, so we move it to be the true result instead
         $trueResult  = $falseResult;
@@ -85,5 +85,5 @@ 
     // parse condition
     $condition = PluginIf::replaceKeywords($rest, $tokens, $compiler);
 
-    return '((' . implode(' ', $condition) . ') ? ' . ($trueResult === true ? implode(' ', $condition) : $trueResult) . ' : ' . $falseResult . ')';
+    return '(('.implode(' ', $condition).') ? '.($trueResult === true ? implode(' ', $condition) : $trueResult).' : '.$falseResult.')';
 }

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
     if (!class_exists(Core::NAMESPACE_PLUGINS_BLOCKS . 'PluginIf')) {
         try {
             $compiler->getDwoo()->getLoader()->loadPlugin('if');
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
             throw new CompilationException($compiler, 'Tif: the if plugin is required to use Tif');
         }
     }

lib/Dwoo/Plugins/Functions/PluginReplaceCompile.php

Indentation +5 added lines, -5 removed lines

@@ -30,9 +30,9 @@
  */
 function PluginReplaceCompile(Compiler $compiler, $value, $search, $replace, $case_sensitive = true)
 {
-    if ($case_sensitive == 'false' || (bool)$case_sensitive === false) {
-        return 'str_ireplace(' . $search . ', ' . $replace . ', ' . $value . ')';
-    } else {
-        return 'str_replace(' . $search . ', ' . $replace . ', ' . $value . ')';
-    }
+	if ($case_sensitive == 'false' || (bool)$case_sensitive === false) {
+		return 'str_ireplace(' . $search . ', ' . $replace . ', ' . $value . ')';
+	} else {
+		return 'str_replace(' . $search . ', ' . $replace . ', ' . $value . ')';
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@
  */
 function PluginReplaceCompile(Compiler $compiler, $value, $search, $replace, $case_sensitive = true)
 {
-    if ($case_sensitive == 'false' || (bool)$case_sensitive === false) {
-        return 'str_ireplace(' . $search . ', ' . $replace . ', ' . $value . ')';
+    if ($case_sensitive == 'false' || (bool) $case_sensitive === false) {
+        return 'str_ireplace('.$search.', '.$replace.', '.$value.')';
     } else {
-        return 'str_replace(' . $search . ', ' . $replace . ', ' . $value . ')';
+        return 'str_replace('.$search.', '.$replace.', '.$value.')';
     }
 }

lib/Dwoo/Plugins/Functions/PluginCountParagraphsCompile.php

Indentation +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
  */
 function PluginCountParagraphsCompile(Compiler $compiler, $value)
 {
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $value . ', $tmp)+1)';
+	return '(preg_match_all(\'#[\r\n]+#\', ' . $value . ', $tmp)+1)';
 }

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
  */
 function PluginCountParagraphsCompile(Compiler $compiler, $value)
 {
-    return '(preg_match_all(\'#[\r\n]+#\', ' . $value . ', $tmp)+1)';
+    return '(preg_match_all(\'#[\r\n]+#\', '.$value.', $tmp)+1)';
 }

lib/Dwoo/Plugins/Functions/PluginFetch.php

Indentation +32 added lines, -32 removed lines

@@ -30,40 +30,40 @@
  */
 function PluginFetch(Core $dwoo, $file, $assign = null)
 {
-    if ($file === '') {
-        return '';
-    }
+	if ($file === '') {
+		return '';
+	}
 
-    if ($policy = $dwoo->getSecurityPolicy()) {
-        while (true) {
-            if (preg_match('{^([a-z]+?)://}i', $file)) {
-                $dwoo->triggerError('The security policy prevents you to read files from external sources.', E_USER_WARNING);
-            }
+	if ($policy = $dwoo->getSecurityPolicy()) {
+		while (true) {
+			if (preg_match('{^([a-z]+?)://}i', $file)) {
+				$dwoo->triggerError('The security policy prevents you to read files from external sources.', E_USER_WARNING);
+			}
 
-            $file = realpath($file);
-            $dirs = $policy->getAllowedDirectories();
-            foreach ($dirs as $dir => $dummy) {
-                if (strpos($file, $dir) === 0) {
-                    break 2;
-                }
-            }
-            $dwoo->triggerError('The security policy prevents you to read <em>' . $file . '</em>', E_USER_WARNING);
-        }
-    }
-    $file = str_replace(array(
-        "\t",
-        "\n",
-        "\r"
-    ), array(
-        '\\t',
-        '\\n',
-        '\\r'
-    ), $file);
+			$file = realpath($file);
+			$dirs = $policy->getAllowedDirectories();
+			foreach ($dirs as $dir => $dummy) {
+				if (strpos($file, $dir) === 0) {
+					break 2;
+				}
+			}
+			$dwoo->triggerError('The security policy prevents you to read <em>' . $file . '</em>', E_USER_WARNING);
+		}
+	}
+	$file = str_replace(array(
+		"\t",
+		"\n",
+		"\r"
+	), array(
+		'\\t',
+		'\\n',
+		'\\r'
+	), $file);
 
-    $out = file_get_contents($file);
+	$out = file_get_contents($file);
 
-    if ($assign === null) {
-        return $out;
-    }
-    $dwoo->assignInScope($out, $assign);
+	if ($assign === null) {
+		return $out;
+	}
+	$dwoo->assignInScope($out, $assign);
 }

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
                     break 2;
                 }
             }
-            $dwoo->triggerError('The security policy prevents you to read <em>' . $file . '</em>', E_USER_WARNING);
+            $dwoo->triggerError('The security policy prevents you to read <em>'.$file.'</em>', E_USER_WARNING);
         }
     }
     $file = str_replace(array(

lib/Dwoo/Plugins/Functions/PluginSpacifyCompile.php

Indentation +1 added lines, -1 removed lines

@@ -29,5 +29,5 @@
  */
 function PluginSpacifyCompile(Compiler $compiler, $value, $space_char = ' ')
 {
-    return 'implode(' . $space_char . ', str_split(' . $value . ', 1))';
+	return 'implode(' . $space_char . ', str_split(' . $value . ', 1))';
 }

Spacing +1 added lines, -1 removed lines

@@ -29,5 +29,5 @@
  */
 function PluginSpacifyCompile(Compiler $compiler, $value, $space_char = ' ')
 {
-    return 'implode(' . $space_char . ', str_split(' . $value . ', 1))';
+    return 'implode('.$space_char.', str_split('.$value.', 1))';
 }

lib/Dwoo/Plugins/Functions/PluginLowerCompile.php

Indentation +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
  */
 function PluginLowerCompile(Compiler $compiler, $value)
 {
-    return 'mb_strtolower((string) ' . $value . ', $this->charset)';
+	return 'mb_strtolower((string) ' . $value . ', $this->charset)';
 }

Spacing +1 added lines, -1 removed lines

@@ -28,5 +28,5 @@
  */
 function PluginLowerCompile(Compiler $compiler, $value)
 {
-    return 'mb_strtolower((string) ' . $value . ', $this->charset)';
+    return 'mb_strtolower((string) '.$value.', $this->charset)';
 }

lib/Dwoo/Plugins/Functions/PluginEscape.php

Indentation +48 added lines, -48 removed lines

@@ -32,56 +32,56 @@
  */
 function PluginEscape(Core $dwoo, $value = '', $format = 'html', $charset = null)
 {
-    if ($charset === null) {
-        $charset = $dwoo->getCharset();
-    }
+	if ($charset === null) {
+		$charset = $dwoo->getCharset();
+	}
 
-    switch ($format) {
+	switch ($format) {
 
-        case 'html':
-            return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
-        case 'htmlall':
-            return htmlentities((string)$value, ENT_QUOTES, $charset);
-        case 'url':
-            return rawurlencode((string)$value);
-        case 'urlpathinfo':
-            return str_replace('%2F', '/', rawurlencode((string)$value));
-        case 'quotes':
-            return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
-        case 'hex':
-            $out = '';
-            $cnt = strlen((string)$value);
-            for ($i = 0; $i < $cnt; ++ $i) {
-                $out .= '%' . bin2hex((string)$value[$i]);
-            }
+		case 'html':
+			return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
+		case 'htmlall':
+			return htmlentities((string)$value, ENT_QUOTES, $charset);
+		case 'url':
+			return rawurlencode((string)$value);
+		case 'urlpathinfo':
+			return str_replace('%2F', '/', rawurlencode((string)$value));
+		case 'quotes':
+			return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
+		case 'hex':
+			$out = '';
+			$cnt = strlen((string)$value);
+			for ($i = 0; $i < $cnt; ++ $i) {
+				$out .= '%' . bin2hex((string)$value[$i]);
+			}
 
-            return $out;
-        case 'hexentity':
-            $out = '';
-            $cnt = strlen((string)$value);
-            for ($i = 0; $i < $cnt; ++ $i) {
-                $out .= '&#x' . bin2hex((string)$value[$i]) . ';';
-            }
+			return $out;
+		case 'hexentity':
+			$out = '';
+			$cnt = strlen((string)$value);
+			for ($i = 0; $i < $cnt; ++ $i) {
+				$out .= '&#x' . bin2hex((string)$value[$i]) . ';';
+			}
 
-            return $out;
-        case 'javascript':
-            return strtr((string)$value, array(
-                '\\' => '\\\\',
-                "'"  => "\\'",
-                '"'  => '\\"',
-                "\r" => '\\r',
-                "\n" => '\\n',
-                '</' => '<\/'
-            ));
-        case 'mail':
-            return str_replace(array(
-                '@',
-                '.'
-            ), array(
-                '&nbsp;(AT)&nbsp;',
-                '&nbsp;(DOT)&nbsp;'
-            ), (string)$value);
-        default:
-            $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
-    }
+			return $out;
+		case 'javascript':
+			return strtr((string)$value, array(
+				'\\' => '\\\\',
+				"'"  => "\\'",
+				'"'  => '\\"',
+				"\r" => '\\r',
+				"\n" => '\\n',
+				'</' => '<\/'
+			));
+		case 'mail':
+			return str_replace(array(
+				'@',
+				'.'
+			), array(
+				'&nbsp;(AT)&nbsp;',
+				'&nbsp;(DOT)&nbsp;'
+			), (string)$value);
+		default:
+			$dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
+	}
 }

Switch Indentation +43 added lines, -43 removed lines

@@ -38,50 +38,50 @@
 
     switch ($format) {
 
-        case 'html':
-            return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
-        case 'htmlall':
-            return htmlentities((string)$value, ENT_QUOTES, $charset);
-        case 'url':
-            return rawurlencode((string)$value);
-        case 'urlpathinfo':
-            return str_replace('%2F', '/', rawurlencode((string)$value));
-        case 'quotes':
-            return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
-        case 'hex':
-            $out = '';
-            $cnt = strlen((string)$value);
-            for ($i = 0; $i < $cnt; ++ $i) {
-                $out .= '%' . bin2hex((string)$value[$i]);
-            }
+    case 'html':
+        return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
+    case 'htmlall':
+        return htmlentities((string)$value, ENT_QUOTES, $charset);
+    case 'url':
+        return rawurlencode((string)$value);
+    case 'urlpathinfo':
+        return str_replace('%2F', '/', rawurlencode((string)$value));
+    case 'quotes':
+        return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
+    case 'hex':
+        $out = '';
+        $cnt = strlen((string)$value);
+        for ($i = 0; $i < $cnt; ++ $i) {
+            $out .= '%' . bin2hex((string)$value[$i]);
+        }
 
-            return $out;
-        case 'hexentity':
-            $out = '';
-            $cnt = strlen((string)$value);
-            for ($i = 0; $i < $cnt; ++ $i) {
-                $out .= '&#x' . bin2hex((string)$value[$i]) . ';';
-            }
+        return $out;
+    case 'hexentity':
+        $out = '';
+        $cnt = strlen((string)$value);
+        for ($i = 0; $i < $cnt; ++ $i) {
+            $out .= '&#x' . bin2hex((string)$value[$i]) . ';';
+        }
 
-            return $out;
-        case 'javascript':
-            return strtr((string)$value, array(
-                '\\' => '\\\\',
-                "'"  => "\\'",
-                '"'  => '\\"',
-                "\r" => '\\r',
-                "\n" => '\\n',
-                '</' => '<\/'
-            ));
-        case 'mail':
-            return str_replace(array(
-                '@',
-                '.'
-            ), array(
-                '&nbsp;(AT)&nbsp;',
-                '&nbsp;(DOT)&nbsp;'
-            ), (string)$value);
-        default:
-            $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
+        return $out;
+    case 'javascript':
+        return strtr((string)$value, array(
+            '\\' => '\\\\',
+            "'"  => "\\'",
+            '"'  => '\\"',
+            "\r" => '\\r',
+            "\n" => '\\n',
+            '</' => '<\/'
+        ));
+    case 'mail':
+        return str_replace(array(
+            '@',
+            '.'
+        ), array(
+            '&nbsp;(AT)&nbsp;',
+            '&nbsp;(DOT)&nbsp;'
+        ), (string)$value);
+    default:
+        $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
     }
 }

Spacing +12 added lines, -12 removed lines

@@ -39,33 +39,33 @@ 
     switch ($format) {
 
         case 'html':
-            return htmlspecialchars((string)$value, ENT_QUOTES, $charset);
+            return htmlspecialchars((string) $value, ENT_QUOTES, $charset);
         case 'htmlall':
-            return htmlentities((string)$value, ENT_QUOTES, $charset);
+            return htmlentities((string) $value, ENT_QUOTES, $charset);
         case 'url':
-            return rawurlencode((string)$value);
+            return rawurlencode((string) $value);
         case 'urlpathinfo':
-            return str_replace('%2F', '/', rawurlencode((string)$value));
+            return str_replace('%2F', '/', rawurlencode((string) $value));
         case 'quotes':
-            return preg_replace("#(?<!\\\\)'#", "\\'", (string)$value);
+            return preg_replace("#(?<!\\\\)'#", "\\'", (string) $value);
         case 'hex':
             $out = '';
-            $cnt = strlen((string)$value);
+            $cnt = strlen((string) $value);
             for ($i = 0; $i < $cnt; ++ $i) {
-                $out .= '%' . bin2hex((string)$value[$i]);
+                $out .= '%'.bin2hex((string) $value[$i]);
             }
 
             return $out;
         case 'hexentity':
             $out = '';
-            $cnt = strlen((string)$value);
+            $cnt = strlen((string) $value);
             for ($i = 0; $i < $cnt; ++ $i) {
-                $out .= '&#x' . bin2hex((string)$value[$i]) . ';';
+                $out .= '&#x'.bin2hex((string) $value[$i]).';';
             }
 
             return $out;
         case 'javascript':
-            return strtr((string)$value, array(
+            return strtr((string) $value, array(
                 '\\' => '\\\\',
                 "'"  => "\\'",
                 '"'  => '\\"',
@@ -80,8 +80,8 @@ 
             ), array(
                 '&nbsp;(AT)&nbsp;',
                 '&nbsp;(DOT)&nbsp;'
-            ), (string)$value);
+            ), (string) $value);
         default:
-            $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "' . $format . '" given.', E_USER_WARNING);
+            $dwoo->triggerError('Escape\'s format argument must be one of : html, htmlall, url, urlpathinfo, hex, hexentity, javascript or mail, "'.$format.'" given.', E_USER_WARNING);
     }
 }

lib/Dwoo/Plugins/Functions/PluginMathCompile.php

Indentation +129 added lines, -129 removed lines

@@ -39,143 +39,143 @@
  */
 function PluginMathCompile(Compiler $compiler, $equation, $format = '', $assign = '', array $rest = array())
 {
-    /*
+	/*
      * Holds the allowed function, characters, operators and constants
      */
-    $allowed = array(
-        '0',
-        '1',
-        '2',
-        '3',
-        '4',
-        '5',
-        '6',
-        '7',
-        '8',
-        '9',
-        '+',
-        '-',
-        '/',
-        '*',
-        '.',
-        ' ',
-        '<<',
-        '>>',
-        '%',
-        '&',
-        '^',
-        '|',
-        '~',
-        'abs(',
-        'ceil(',
-        'floor(',
-        'exp(',
-        'log10(',
-        'cos(',
-        'sin(',
-        'sqrt(',
-        'tan(',
-        'M_PI',
-        'INF',
-        'M_E',
-    );
+	$allowed = array(
+		'0',
+		'1',
+		'2',
+		'3',
+		'4',
+		'5',
+		'6',
+		'7',
+		'8',
+		'9',
+		'+',
+		'-',
+		'/',
+		'*',
+		'.',
+		' ',
+		'<<',
+		'>>',
+		'%',
+		'&',
+		'^',
+		'|',
+		'~',
+		'abs(',
+		'ceil(',
+		'floor(',
+		'exp(',
+		'log10(',
+		'cos(',
+		'sin(',
+		'sqrt(',
+		'tan(',
+		'M_PI',
+		'INF',
+		'M_E',
+	);
 
-    /*
+	/*
      * Holds the functions that can accept multiple arguments
      */
-    $funcs = array(
-        'round(',
-        'log(',
-        'pow(',
-        'max(',
-        'min(',
-        'rand(',
-    );
+	$funcs = array(
+		'round(',
+		'log(',
+		'pow(',
+		'max(',
+		'min(',
+		'rand(',
+	);
 
-    $equation = $equationSrc = str_ireplace(array(
-        'pi',
-        'M_PI()',
-        'inf',
-        ' e '
-    ), array(
-        'M_PI',
-        'M_PI',
-        'INF',
-        ' M_E '
-    ), $equation);
+	$equation = $equationSrc = str_ireplace(array(
+		'pi',
+		'M_PI()',
+		'inf',
+		' e '
+	), array(
+		'M_PI',
+		'M_PI',
+		'INF',
+		' M_E '
+	), $equation);
 
-    $delim      = $equation[0];
-    $open       = $delim . '.';
-    $close      = '.' . $delim;
-    $equation   = substr($equation, 1, - 1);
-    $out        = '';
-    $ptr        = 1;
-    $allowcomma = 0;
-    while (strlen($equation) > 0) {
-        $substr = substr($equation, 0, $ptr);
-        if (array_search($substr, $allowed) !== false) {
-            // allowed string
-            $out .= $substr;
-            $equation = substr($equation, $ptr);
-            $ptr      = 0;
-        } elseif (array_search($substr, $funcs) !== false) {
-            // allowed func
-            $out .= $substr;
-            $equation = substr($equation, $ptr);
-            $ptr      = 0;
-            ++ $allowcomma;
-            if ($allowcomma === 1) {
-                $allowed[] = ',';
-            }
-        } elseif (isset($rest[$substr])) {
-            // variable
-            $out .= $rest[$substr];
-            $equation = substr($equation, $ptr);
-            $ptr      = 0;
-        } elseif ($substr === $open) {
-            // pre-replaced variable
-            preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
-            if (empty($m)) {
-                preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
-            }
-            $out .= substr($m[0], 0, - 2);
-            $equation = substr($equation, strlen($m[0]) + 2);
-            $ptr      = 0;
-        } elseif ($substr === '(') {
-            // opening parenthesis
-            if ($allowcomma > 0) {
-                ++ $allowcomma;
-            }
+	$delim      = $equation[0];
+	$open       = $delim . '.';
+	$close      = '.' . $delim;
+	$equation   = substr($equation, 1, - 1);
+	$out        = '';
+	$ptr        = 1;
+	$allowcomma = 0;
+	while (strlen($equation) > 0) {
+		$substr = substr($equation, 0, $ptr);
+		if (array_search($substr, $allowed) !== false) {
+			// allowed string
+			$out .= $substr;
+			$equation = substr($equation, $ptr);
+			$ptr      = 0;
+		} elseif (array_search($substr, $funcs) !== false) {
+			// allowed func
+			$out .= $substr;
+			$equation = substr($equation, $ptr);
+			$ptr      = 0;
+			++ $allowcomma;
+			if ($allowcomma === 1) {
+				$allowed[] = ',';
+			}
+		} elseif (isset($rest[$substr])) {
+			// variable
+			$out .= $rest[$substr];
+			$equation = substr($equation, $ptr);
+			$ptr      = 0;
+		} elseif ($substr === $open) {
+			// pre-replaced variable
+			preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+			if (empty($m)) {
+				preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+			}
+			$out .= substr($m[0], 0, - 2);
+			$equation = substr($equation, strlen($m[0]) + 2);
+			$ptr      = 0;
+		} elseif ($substr === '(') {
+			// opening parenthesis
+			if ($allowcomma > 0) {
+				++ $allowcomma;
+			}
 
-            $out .= $substr;
-            $equation = substr($equation, $ptr);
-            $ptr      = 0;
-        } elseif ($substr === ')') {
-            // closing parenthesis
-            if ($allowcomma > 0) {
-                -- $allowcomma;
-                if ($allowcomma === 0) {
-                    array_pop($allowed);
-                }
-            }
+			$out .= $substr;
+			$equation = substr($equation, $ptr);
+			$ptr      = 0;
+		} elseif ($substr === ')') {
+			// closing parenthesis
+			if ($allowcomma > 0) {
+				-- $allowcomma;
+				if ($allowcomma === 0) {
+					array_pop($allowed);
+				}
+			}
 
-            $out .= $substr;
-            $equation = substr($equation, $ptr);
-            $ptr      = 0;
-        } elseif ($ptr >= strlen($equation)) {
-            // parse error if we've consumed the entire equation without finding anything valid
-            throw new CompilationException($compiler, 'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
-        } else {
-            // nothing special, advance
-            ++ $ptr;
-        }
-    }
-    if ($format !== '\'\'') {
-        $out = 'sprintf(' . $format . ', ' . $out . ')';
-    }
-    if ($assign !== '\'\'') {
-        return '($this->assignInScope(' . $out . ', ' . $assign . '))';
-    }
+			$out .= $substr;
+			$equation = substr($equation, $ptr);
+			$ptr      = 0;
+		} elseif ($ptr >= strlen($equation)) {
+			// parse error if we've consumed the entire equation without finding anything valid
+			throw new CompilationException($compiler, 'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
+		} else {
+			// nothing special, advance
+			++ $ptr;
+		}
+	}
+	if ($format !== '\'\'') {
+		$out = 'sprintf(' . $format . ', ' . $out . ')';
+	}
+	if ($assign !== '\'\'') {
+		return '($this->assignInScope(' . $out . ', ' . $assign . '))';
+	}
 
-    return '(' . $out . ')';
+	return '(' . $out . ')';
 }

Spacing +13 added lines, -13 removed lines

@@ -105,8 +105,8 @@ 
     ), $equation);
 
     $delim      = $equation[0];
-    $open       = $delim . '.';
-    $close      = '.' . $delim;
+    $open       = $delim.'.';
+    $close      = '.'.$delim;
     $equation   = substr($equation, 1, - 1);
     $out        = '';
     $ptr        = 1;
@@ -123,7 +123,7 @@ 
             $out .= $substr;
             $equation = substr($equation, $ptr);
             $ptr      = 0;
-            ++ $allowcomma;
+            ++$allowcomma;
             if ($allowcomma === 1) {
                 $allowed[] = ',';
             }
@@ -134,17 +134,17 @@ 
             $ptr      = 0;
         } elseif ($substr === $open) {
             // pre-replaced variable
-            preg_match('#.*\((?:[^()]*?|(?R))\)' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+            preg_match('#.*\((?:[^()]*?|(?R))\)'.str_replace('.', '\\.', $close).'#', substr($equation, 2), $m);
             if (empty($m)) {
-                preg_match('#.*?' . str_replace('.', '\\.', $close) . '#', substr($equation, 2), $m);
+                preg_match('#.*?'.str_replace('.', '\\.', $close).'#', substr($equation, 2), $m);
             }
             $out .= substr($m[0], 0, - 2);
-            $equation = substr($equation, strlen($m[0]) + 2);
+            $equation = substr($equation, strlen($m[0])+2);
             $ptr      = 0;
         } elseif ($substr === '(') {
             // opening parenthesis
             if ($allowcomma > 0) {
-                ++ $allowcomma;
+                ++$allowcomma;
             }
 
             $out .= $substr;
@@ -153,7 +153,7 @@ 
         } elseif ($substr === ')') {
             // closing parenthesis
             if ($allowcomma > 0) {
-                -- $allowcomma;
+                --$allowcomma;
                 if ($allowcomma === 0) {
                     array_pop($allowed);
                 }
@@ -164,18 +164,18 @@ 
             $ptr      = 0;
         } elseif ($ptr >= strlen($equation)) {
             // parse error if we've consumed the entire equation without finding anything valid
-            throw new CompilationException($compiler, 'Math : Syntax error or variable undefined in equation ' . $equationSrc . ' at ' . $substr);
+            throw new CompilationException($compiler, 'Math : Syntax error or variable undefined in equation '.$equationSrc.' at '.$substr);
         } else {
             // nothing special, advance
-            ++ $ptr;
+            ++$ptr;
         }
     }
     if ($format !== '\'\'') {
-        $out = 'sprintf(' . $format . ', ' . $out . ')';
+        $out = 'sprintf('.$format.', '.$out.')';
     }
     if ($assign !== '\'\'') {
-        return '($this->assignInScope(' . $out . ', ' . $assign . '))';
+        return '($this->assignInScope('.$out.', '.$assign.'))';
     }
 
-    return '(' . $out . ')';
+    return '('.$out.')';
 }