phptal / PHPTAL

classes/PHPTAL/Php/Attribute/METAL/UseMacro.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         // local macro (no filename specified) and non dynamic macro name
         // can be called directly if it's a known function (just generated or seen in previous compilation)
         if (preg_match('/^[a-z0-9_]+$/i', $macroname) && $codewriter->functionExists($macroname)) {
-            $code = $codewriter->getFunctionPrefix() . $macroname . '($_thistpl, $tpl)';
+            $code = $codewriter->getFunctionPrefix().$macroname.'($_thistpl, $tpl)';
             $codewriter->pushCode($code);
         }
         // external macro or ${macroname}, use PHPTAL at runtime to resolve it

classes/PHPTAL/Php/Attribute/METAL/FillSlot.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
             return 0;
         }
 
-        $estimated_bytes = 2*(3+strlen($element->getQualifiedName()));
+        $estimated_bytes = 2 * (3+strlen($element->getQualifiedName()));
 
         foreach ($element->getAttributeNodes() as $attr) {
             $estimated_bytes += 4+strlen($attr->getQualifiedName());

classes/PHPTAL/Php/State.php

Spacing +5 added lines, -5 removed lines

@@ -144,7 +144,7 @@ 
      */
     public function interpolateTalesVarsInString($string)
     {
-        return PHPTAL_Php_TalesInternal::parseString($string, false, ($this->getTalesMode() === 'tales') ? '' : 'php:' );
+        return PHPTAL_Php_TalesInternal::parseString($string, false, ($this->getTalesMode() === 'tales') ? '' : 'php:');
     }
 
     /**
@@ -153,7 +153,7 @@ 
     public function interpolateTalesVarsInHTML($src)
     {
         return preg_replace_callback('/((?:\$\$)*)\$\{(structure |text )?(.*?)\}|((?:\$\$)+)\{/isS',
-                                     array($this,'_interpolateTalesVarsInHTMLCallback'), $src);
+                                     array($this, '_interpolateTalesVarsInHTMLCallback'), $src);
     }
 
     /**
@@ -172,7 +172,7 @@ 
     public function interpolateTalesVarsInCDATA($src)
     {
         return preg_replace_callback('/((?:\$\$)*)\$\{(structure |text )?(.*?)\}|((?:\$\$)+)\{/isS',
-                                     array($this,'_interpolateTalesVarsInCDATACallback'), $src);
+                                     array($this, '_interpolateTalesVarsInCDATACallback'), $src);
     }
 
     /**
@@ -187,11 +187,11 @@ 
     {
         // replaces $${ with literal ${ (or $$$${ with $${ etc)
         if (!empty($matches[4])) {
-            return substr($matches[4], strlen($matches[4])/2).'{';
+            return substr($matches[4], strlen($matches[4]) / 2).'{';
         }
 
         // same replacement, but before executed expression
-        $dollars = substr($matches[1], strlen($matches[1])/2);
+        $dollars = substr($matches[1], strlen($matches[1]) / 2);
 
         $code = $matches[3];
         if ($format == 'html') {

classes/PHPTAL/Php/CodeWriter.php

Spacing +22 added lines, -22 removed lines

@@ -24,11 +24,11 @@ 
     /**
      * max id of variable to give as temp
      */
-    private $temp_var_counter=0;
+    private $temp_var_counter = 0;
     /**
      * stack with free'd variables
      */
-    private $temp_recycling=array();
+    private $temp_recycling = array();
 
     /**
      * keeps track of seen functions for function_exists
@@ -49,7 +49,7 @@ 
 
     public function recycleTempVariable($var)
     {
-        if (substr($var, 0, 6)!=='$_tmp_') throw new PHPTAL_Exception("Invalid variable recycled");
+        if (substr($var, 0, 6) !== '$_tmp_') throw new PHPTAL_Exception("Invalid variable recycled");
         $this->temp_recycling[] = $var;
     }
 
@@ -140,12 +140,12 @@ 
 
     public function indent()
     {
-        $this->_indentation ++;
+        $this->_indentation++;
     }
 
     public function unindent()
     {
-        $this->_indentation --;
+        $this->_indentation--;
     }
 
     public function flush()
@@ -187,7 +187,7 @@ 
             }
             $this->_result .= $codeLine;
         }
-        $this->_result .= "?>\n";// PHP consumes newline
+        $this->_result .= "?>\n"; // PHP consumes newline
         $this->_codeBuffer = array();
     }
 
@@ -207,7 +207,7 @@ 
     public function doDoctype($called_from_macro = false)
     {
         if ($this->_doctype) {
-            $code = '$ctx->setDocType('.$this->str($this->_doctype).','.($called_from_macro?'true':'false').')';
+            $code = '$ctx->setDocType('.$this->str($this->_doctype).','.($called_from_macro ? 'true' : 'false').')';
             $this->pushCode($code);
         }
     }
@@ -220,21 +220,21 @@ 
     public function doXmlDeclaration($called_from_macro = false)
     {
         if ($this->_xmldeclaration && $this->getOutputMode() !== PHPTAL::HTML5) {
-            $code = '$ctx->setXmlDeclaration('.$this->str($this->_xmldeclaration).','.($called_from_macro?'true':'false').')';
+            $code = '$ctx->setXmlDeclaration('.$this->str($this->_xmldeclaration).','.($called_from_macro ? 'true' : 'false').')';
             $this->pushCode($code);
         }
     }
 
     public function functionExists($name)
     {
-        return isset($this->known_functions[$this->_functionPrefix . $name]);
+        return isset($this->known_functions[$this->_functionPrefix.$name]);
     }
 
     public function doTemplateFile($functionName, PHPTAL_Dom_Element $treeGen)
     {
         $this->doComment("\n*** DO NOT EDIT THIS FILE ***\n\nGenerated by PHPTAL from ".$treeGen->getSourceFile()." (edit that file instead)");
         $this->doFunction($functionName, 'PHPTAL $tpl, PHPTAL_Context $ctx');
-        $this->setFunctionPrefix($functionName . "_");
+        $this->setFunctionPrefix($functionName."_");
         $this->doSetVar('$_thistpl', '$tpl');
         $this->doInitTranslator();
         $treeGen->generateCode($this);
@@ -244,13 +244,13 @@ 
 
     public function doFunction($name, $params)
     {
-        $name = $this->_functionPrefix . $name;
+        $name = $this->_functionPrefix.$name;
         $this->known_functions[$name] = true;
 
         $this->pushCodeWriterContext();
         $this->pushCode("function $name($params) {\n");
         $this->indent();
-        $this->_segments[] =  'function';
+        $this->_segments[] = 'function';
     }
 
     public function doComment($comment)
@@ -281,7 +281,7 @@ 
 
     public function doForeach($out, $source)
     {
-        $this->_segments[] =  'foreach';
+        $this->_segments[] = 'foreach';
         $this->pushCode("foreach ($source as $out):");
         $this->indent();
     }
@@ -304,7 +304,7 @@ 
             $this->flush();
             $functionCode = $this->_result;
             $this->popCodeWriterContext();
-            $this->_result = $functionCode . $this->_result;
+            $this->_result = $functionCode.$this->_result;
         } elseif ($segment == 'try')
             $this->pushCode('}');
         elseif ($segment == 'catch')
@@ -315,7 +315,7 @@ 
 
     public function doTry()
     {
-        $this->_segments[] =  'try';
+        $this->_segments[] = 'try';
         $this->pushCode('try {');
         $this->indent();
     }
@@ -328,14 +328,14 @@ 
     public function doCatch($catch)
     {
         $this->doEnd('try');
-        $this->_segments[] =  'catch';
+        $this->_segments[] = 'catch';
         $this->pushCode('catch('.$catch.') {');
         $this->indent();
     }
 
     public function doIf($condition)
     {
-        $this->_segments[] =  'if';
+        $this->_segments[] = 'if';
         $this->pushCode('if ('.$condition.'): ');
         $this->indent();
     }
@@ -387,14 +387,14 @@ 
     {
         if ($html === "") return;
         $this->flushCode();
-        $this->_htmlBuffer[] =  $html;
+        $this->_htmlBuffer[] = $html;
     }
 
     public function pushCode($codeLine)
     {
         $this->flushHtml();
-        $codeLine = $this->indentSpaces() . $codeLine;
-        $this->_codeBuffer[] =  $codeLine;
+        $codeLine = $this->indentSpaces().$codeLine;
+        $this->_codeBuffer[] = $codeLine;
     }
 
     /**
@@ -402,7 +402,7 @@ 
      */
     public function str($string)
     {
-        return "'".strtr($string,array("'"=>'\\\'','\\'=>'\\\\'))."'";
+        return "'".strtr($string, array("'"=>'\\\'', '\\'=>'\\\\'))."'";
     }
 
     public function escapeCode($code)
@@ -479,7 +479,7 @@ 
 
     private function pushCodeWriterContext()
     {
-        $this->_contexts[] =  clone $this;
+        $this->_contexts[] = clone $this;
         $this->_result = "";
         $this->_indentation = 0;
         $this->_codeBuffer = array();

classes/PHPTAL/Php/TalesInternal.php

Spacing +22 added lines, -22 removed lines

@@ -55,7 +55,7 @@ 
 
     static public function true($src, $nothrow)
     {
-        return 'phptal_true(' . self::compileToPHPExpression($src, true) . ')';
+        return 'phptal_true('.self::compileToPHPExpression($src, true).')';
     }
 
     /**
@@ -84,7 +84,7 @@ 
      */
     static public function not($expression, $nothrow)
     {
-        return '!phptal_true(' . self::compileToPHPExpression($expression, $nothrow) . ')';
+        return '!phptal_true('.self::compileToPHPExpression($expression, $nothrow).')';
     }
 
 
@@ -121,7 +121,7 @@ 
      *
      * @returns string or array
      */
-    static public function path($expression, $nothrow=false)
+    static public function path($expression, $nothrow = false)
     {
         $expression = trim($expression);
         if ($expression == 'default') return self::DEFAULT_KEYWORD;
@@ -146,7 +146,7 @@ 
         if (count($exps) > 1 || isset($string)) {
             $result = array();
             foreach ($exps as $i=>$exp) {
-                if(isset($string) || $i < count($exps) - 1) {
+                if (isset($string) || $i < count($exps)-1) {
                     $result[] = self::compileToPHPExpressions(trim($exp), true);
                 }
                 else {
@@ -180,7 +180,7 @@ 
         }
 
         if ($nothrow) {
-            return '$ctx->path($ctx, ' . $next . ($expression === null ? '' : '."/".'.$expression) . ', true)';
+            return '$ctx->path($ctx, '.$next.($expression === null ? '' : '."/".'.$expression).', true)';
         }
 
         if (preg_match('/^\'[a-z][a-z0-9_]*\'$/i', $next)) $next = substr($next, 1, -1); else $next = '{'.$next.'}';
@@ -221,7 +221,7 @@ 
      *      string:hello, ${user/name}
      *      string:you have $$130 in your bank account
      */
-    static public function string($expression, $nothrow=false)
+    static public function string($expression, $nothrow = false)
     {
         return self::parseString($expression, $nothrow, '');
     }
@@ -241,7 +241,7 @@ 
         $lastWasDollar = false;
         $result = '';
         $len = strlen($expression);
-        for ($i=0; $i<$len; $i++) {
+        for ($i = 0; $i < $len; $i++) {
             $c = $expression[$i];
             switch ($c) {
                 case '$':
@@ -291,8 +291,8 @@ 
                 case '}':
                     if ($inAccoladePath) {
                         $inAccoladePath = false;
-                        $subEval = self::compileToPHPExpression($tales_prefix.$subPath,false);
-                        $result .= "'.(" . $subEval . ").'";
+                        $subEval = self::compileToPHPExpression($tales_prefix.$subPath, false);
+                        $result .= "'.(".$subEval.").'";
                         $subPath = '';
                         $lastWasDollar = false;
                         $c = '';
@@ -315,8 +315,8 @@ 
                             $c = '';
                         } else {
                             $inPath = false;
-                            $subEval = self::compileToPHPExpression($tales_prefix.$subPath,false);
-                            $result .= "'.(" . $subEval . ").'";
+                            $subEval = self::compileToPHPExpression($tales_prefix.$subPath, false);
+                            $result .= "'.(".$subEval.").'";
                             }
                         }
                     break;
@@ -325,7 +325,7 @@ 
         }
         if ($inPath) {
             $subEval = self::compileToPHPExpression($tales_prefix.$subPath, false);
-            $result .= "'.(" . $subEval . ").'";
+            $result .= "'.(".$subEval.").'";
         }
 
         // optimize ''.foo.'' to foo
@@ -365,7 +365,7 @@ 
         $src = rawurldecode($src);
 
         // Simple echo can be supported via regular method
-        if (preg_match('/^\s*echo\s+((?:[^;]+|"[^"\\\\]*"|\'[^\'\\\\]*\'|\/\*.*?\*\/)+);*\s*$/s',$src,$m))
+        if (preg_match('/^\s*echo\s+((?:[^;]+|"[^"\\\\]*"|\'[^\'\\\\]*\'|\/\*.*?\*\/)+);*\s*$/s', $src, $m))
         {
             return $m[1];
         }
@@ -385,7 +385,7 @@ 
     {
         $src = trim($src);
         if (ctype_alnum($src)) return 'isset($ctx->'.$src.')';
-        return '(null !== ' . self::compileToPHPExpression($src, true) . ')';
+        return '(null !== '.self::compileToPHPExpression($src, true).')';
     }
 
     /**
@@ -404,7 +404,7 @@ 
      */
     static public function json($src, $nothrow)
     {
-        return 'json_encode('.phptal_tale($src,$nothrow).')';
+        return 'json_encode('.phptal_tale($src, $nothrow).')';
     }
 
     /**
@@ -412,7 +412,7 @@ 
      */
     static public function urlencode($src, $nothrow)
     {
-        return 'rawurlencode('.phptal_tale($src,$nothrow).')';
+        return 'rawurlencode('.phptal_tale($src, $nothrow).')';
     }
 
     /**
@@ -422,7 +422,7 @@ 
      * @see PHPTAL_Php_TalesInternal::compileToPHPExpressions()
      * @return string
      */
-    public static function compileToPHPExpression($expression, $nothrow=false)
+    public static function compileToPHPExpression($expression, $nothrow = false)
     {
         $r = self::compileToPHPExpressions($expression, $nothrow);
         if (!is_array($r)) return $r;
@@ -437,8 +437,8 @@ 
      */
     private static function convertExpressionsToExpression(array $array, $nothrow)
     {
-        if (count($array)==1) return '($ctx->noThrow('.($nothrow?'true':'false').')||1?('.
-            ($array[0]==self::NOTHING_KEYWORD?'null':$array[0]).
+        if (count($array) == 1) return '($ctx->noThrow('.($nothrow ? 'true' : 'false').')||1?('.
+            ($array[0] == self::NOTHING_KEYWORD ? 'null' : $array[0]).
             '):"")';
 
         $expr = array_shift($array);
@@ -457,7 +457,7 @@ 
      *
      * @return string or array
      */
-    public static function compileToPHPExpressions($expression, $nothrow=false)
+    public static function compileToPHPExpressions($expression, $nothrow = false)
     {
         $expression = trim($expression);
 
@@ -488,13 +488,13 @@ 
         throw new PHPTAL_UnknownModifierException("Unknown phptal modifier '$typePrefix'. Function '$func' does not exist", $typePrefix);
     }
 
-    private static function verifyPHPExpressions($typePrefix,$expressions)
+    private static function verifyPHPExpressions($typePrefix, $expressions)
     {
         if (!is_array($expressions)) {
             $expressions = array($expressions);
         }
 
-        foreach($expressions as $expr) {
+        foreach ($expressions as $expr) {
             if (preg_match('/;\s*$/', $expr)) {
                 throw new PHPTAL_ParserException("Modifier $typePrefix generated PHP statement rather than expression (don't add semicolons)");
             }

classes/PHPTAL/RepeatController.php

Spacing +18 added lines, -18 removed lines

@@ -57,9 +57,9 @@ 
      */
     public function __construct($source)
     {
-        if ( is_string($source) ) {
-            $this->iterator = new ArrayIterator( str_split($source) );  // FIXME: invalid for UTF-8 encoding, use preg_match_all('/./u') trick
-        } elseif ( is_array($source) ) {
+        if (is_string($source)) {
+            $this->iterator = new ArrayIterator(str_split($source)); // FIXME: invalid for UTF-8 encoding, use preg_match_all('/./u') trick
+        } elseif (is_array($source)) {
             $this->iterator = new ArrayIterator($source);
         } elseif ($source instanceof IteratorAggregate) {
             $this->iterator = $source->getIterator();
@@ -74,11 +74,11 @@ 
         } elseif ($source instanceof Traversable) {
             $this->iterator = new IteratorIterator($source);
         } elseif ($source instanceof Closure) {
-            $this->iterator = new ArrayIterator( (array) $source() );
+            $this->iterator = new ArrayIterator((array) $source());
         } elseif ($source instanceof stdClass) {
-            $this->iterator = new ArrayIterator( (array) $source );
+            $this->iterator = new ArrayIterator((array) $source);
         } else {
-            $this->iterator = new ArrayIterator( array() );
+            $this->iterator = new ArrayIterator(array());
         }
     }
 
@@ -120,11 +120,11 @@ 
         if ($this->length === null) {
             if ($this->iterator instanceof Countable) {
                 return $this->length = count($this->iterator);
-            } elseif ( is_object($this->iterator) ) {
+            } elseif (is_object($this->iterator)) {
                 // for backwards compatibility with existing PHPTAL templates
-                if ( method_exists($this->iterator, 'size') ) {
+                if (method_exists($this->iterator, 'size')) {
                     return $this->length = $this->iterator->size();
-                } elseif ( method_exists($this->iterator, 'length') ) {
+                } elseif (method_exists($this->iterator, 'length')) {
                     return $this->length = $this->iterator->length();
                 }
             }
@@ -133,7 +133,7 @@ 
 
         if ($this->length === '_PHPTAL_LENGTH_UNKNOWN_') // return length if end is discovered
         {
-            return $this->end ? $this->index + 1 : null;
+            return $this->end ? $this->index+1 : null;
         }
         return $this->length;
     }
@@ -203,7 +203,7 @@ 
     {
         switch ($var) {
             case 'number':
-                return $this->index + 1;
+                return $this->index+1;
             case 'start':
                 return $this->index === 0;
             case 'even':
@@ -213,13 +213,13 @@ 
             case 'length':
                 return $this->length();
             case 'letter':
-                return strtolower( $this->int2letter($this->index+1) );
+                return strtolower($this->int2letter($this->index+1));
             case 'Letter':
-                return strtoupper( $this->int2letter($this->index+1) );
+                return strtoupper($this->int2letter($this->index+1));
             case 'roman':
-                return strtolower( $this->int2roman($this->index+1) );
+                return strtolower($this->int2roman($this->index+1));
             case 'Roman':
-                return strtoupper( $this->int2roman($this->index+1) );
+                return strtoupper($this->int2roman($this->index+1));
 
             case 'groups':
                 $this->initializeGroups();
@@ -234,7 +234,7 @@ 
             case 'last':
                 $this->initializeGroups();
                 // Compare the next one with the dictionary
-                $res = $this->groups->last( $this->iterator->current() );
+                $res = $this->groups->last($this->iterator->current());
                 return is_bool($res) ? $res : $this->groups;
 
             default:
@@ -255,7 +255,7 @@ 
         $this->key = $this->iterator->key();
 
         $this->iterator->next();
-        if ( !$this->iterator->valid() ) {
+        if (!$this->iterator->valid()) {
             $this->valid = false;
             $this->end = true;
         }
@@ -277,7 +277,7 @@ 
         $letters = '';
         while ($int > 0) {
             $int--;
-            $letters = $lookup[$int % $size] . $letters;
+            $letters = $lookup[$int % $size].$letters;
             $int = floor($int / $size);
         }
         return $letters;

classes/PHPTAL/RepeatControllerGroups.php

Spacing +11 added lines, -11 removed lines

@@ -54,13 +54,13 @@ 
      */
     public function first($data)
     {
-        if ( !is_array($data) && !is_object($data) && !is_null($data) ) {
+        if (!is_array($data) && !is_object($data) && !is_null($data)) {
 
-            if ( !isset($this->cache['F']) ) {
+            if (!isset($this->cache['F'])) {
 
                 $hash = md5($data);
 
-                if ( !isset($this->dict['F']) || $this->dict['F'] !== $hash ) {
+                if (!isset($this->dict['F']) || $this->dict['F'] !== $hash) {
                     $this->dict['F'] = $hash;
                     $res = true;
                 } else {
@@ -89,9 +89,9 @@ 
      */
     public function last($data)
     {
-        if ( !is_array($data) && !is_object($data) && !is_null($data) ) {
+        if (!is_array($data) && !is_object($data) && !is_null($data)) {
 
-            if ( !isset($this->cache['L']) ) {
+            if (!isset($this->cache['L'])) {
 
                 $hash = md5($data);
 
@@ -131,7 +131,7 @@ 
         // When the iterator item is empty we just let the tal
         // expression consume by continuously returning this
         // same object which should evaluate to true for 'last'
-        if ( is_null($this->data) ) {
+        if (is_null($this->data)) {
             return $this;
         }
 
@@ -139,7 +139,7 @@ 
         $value = PHPTAL_Context::path($this->data, $var, true);
 
         // Check if it's an object or an array
-        if ( is_array($value) || is_object($value) ) {
+        if (is_array($value) || is_object($value)) {
             // Move the context to the requested variable and return
             $this->data = $value;
             $this->addVarName($var);
@@ -150,12 +150,12 @@ 
         $hash = md5($value);
 
         // compute a path for the variable to use as dictionary key
-        $path = $this->branch . $this->getVarPath() . $var;
+        $path = $this->branch.$this->getVarPath().$var;
 
         // If we don't know about this var store in the dictionary
-        if ( !isset($this->cache[$path]) ) {
+        if (!isset($this->cache[$path])) {
 
-            if ( !isset($this->dict[$path]) ) {
+            if (!isset($this->dict[$path])) {
                 $this->dict[$path] = $hash;
                 $res = $this->branch === 'F';
             } else {
@@ -194,6 +194,6 @@ 
      */
     protected function getVarPath()
     {
-        return implode('/', $this->vars) . '/';
+        return implode('/', $this->vars).'/';
     }
 }

classes/PHPTAL/PreFilter/Normalize.php

Spacing +2 added lines, -2 removed lines

@@ -50,7 +50,7 @@ 
                     $root->removeChild($node);
                 } else if ($lastTextNode) {
                     // "foo " . " bar" gives 2 spaces.
-                    $norm = $lastTextNode->getValueEscaped().ltrim($norm,' ');
+                    $norm = $lastTextNode->getValueEscaped().ltrim($norm, ' ');
 
                     $lastTextNode->setValueEscaped($norm); // assumes all nodes use same encoding (they do)
                     $root->removeChild($node);
@@ -89,7 +89,7 @@ 
      */
     protected function normalizeSpace($text, $encoding)
     {
-        $utf_regex_mod = ($encoding=='UTF-8'?'u':'');
+        $utf_regex_mod = ($encoding == 'UTF-8' ? 'u' : '');
 
         return preg_replace('/[ \t\r\n]+/'.$utf_regex_mod, ' ', $text); // \s removes nbsp
     }

classes/PHPTAL/PreFilter/Compress.php

Spacing +27 added lines, -27 removed lines

@@ -23,13 +23,13 @@ 
      * keeps track whether last element had trailing whitespace (or didn't need it).
      * If had_space==false, next element must keep leading space.
      */
-    private $had_space=false;
+    private $had_space = false;
 
     /**
      * last text node before closing tag that may need trailing whitespace trimmed.
      * It's often last-child, but comments, multiple end tags make that trickier.
      */
-    private $most_recent_text_node=null;
+    private $most_recent_text_node = null;
 
     function filterDOM(PHPTAL_Dom_Element $root)
     {
@@ -41,7 +41,7 @@ 
         }
 
         // tal:replace makes element behave like text
-        if ($root->getAttributeNS('http://xml.zope.org/namespaces/tal','replace')) {
+        if ($root->getAttributeNS('http://xml.zope.org/namespaces/tal', 'replace')) {
             $this->most_recent_text_node = null;
             $this->had_space = false;
             return;
@@ -55,7 +55,7 @@ 
 
         // mostly block-level elements
         // if element is conditional, it may not always break the line
-        $breaks_line = $no_spaces || ($this->breaksLine($root) && !$root->getAttributeNS('http://xml.zope.org/namespaces/tal','condition'));
+        $breaks_line = $no_spaces || ($this->breaksLine($root) && !$root->getAttributeNS('http://xml.zope.org/namespaces/tal', 'condition'));
 
         // start tag newline
         if ($breaks_line) {
@@ -77,7 +77,7 @@ 
             // HTML 5 (9.1.2.5) specifies quirk that a first *single* newline in <pre> can be removed
             if (count($root->childNodes) && $root->childNodes[0] instanceof PHPTAL_Dom_Text) {
                 if (preg_match('/^\n[^\n]/', $root->childNodes[0]->getValueEscaped())) {
-                    $root->childNodes[0]->setValueEscaped(substr($root->childNodes[0]->getValueEscaped(),1));
+                    $root->childNodes[0]->setValueEscaped(substr($root->childNodes[0]->getValueEscaped(), 1));
                 }
             }
             $this->findElementToFilter($root);
@@ -101,7 +101,7 @@ 
                 // collapsed whitespace-only nodes are ignored (otherwise trimming of most_recent_text_node would be useless)
                 if ($norm !== '') {
                     $this->most_recent_text_node = $node;
-                    $this->had_space = (substr($norm,-1) == ' ');
+                    $this->had_space = (substr($norm, -1) == ' ');
                 }
             } else if ($node instanceof PHPTAL_Dom_Element) {
                 $this->filterDOM($node);
@@ -115,12 +115,12 @@ 
         }
 
         // repeated element may need trailing space.
-        if (!$breaks_line && $root->getAttributeNS('http://xml.zope.org/namespaces/tal','repeat')) {
+        if (!$breaks_line && $root->getAttributeNS('http://xml.zope.org/namespaces/tal', 'repeat')) {
             $this->most_recent_text_node = null;
         }
 
         // tal:content may replace element with something without space
-        if (!$breaks_line && $root->getAttributeNS('http://xml.zope.org/namespaces/tal','content')) {
+        if (!$breaks_line && $root->getAttributeNS('http://xml.zope.org/namespaces/tal', 'content')) {
             $this->had_space = false;
             $this->most_recent_text_node = null;
         }
@@ -136,7 +136,7 @@ 
     }
 
     private static $no_interelement_space = array(
-        'html','head','table','thead','tfoot','select','optgroup','dl','ol','ul','tr','datalist',
+        'html', 'head', 'table', 'thead', 'tfoot', 'select', 'optgroup', 'dl', 'ol', 'ul', 'tr', 'datalist',
     );
 
     private function hasNoInterelementSpace(PHPTAL_Dom_Element $element)
@@ -155,15 +155,15 @@ 
      *  li is deliberately omitted, as it's commonly used with display:inline in menus.
      */
     private static $breaks_line = array(
-        'address','article','aside','base','blockquote','body','br','dd','div','dl','dt','fieldset','figure',
-        'footer','form','h1','h2','h3','h4','h5','h6','head','header','hgroup','hr','html','legend','link',
-        'meta','nav','ol','option','p','param','pre','section','style','table','tbody','td','th','thead',
-        'title','tr','ul','details',
+        'address', 'article', 'aside', 'base', 'blockquote', 'body', 'br', 'dd', 'div', 'dl', 'dt', 'fieldset', 'figure',
+        'footer', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'header', 'hgroup', 'hr', 'html', 'legend', 'link',
+        'meta', 'nav', 'ol', 'option', 'p', 'param', 'pre', 'section', 'style', 'table', 'tbody', 'td', 'th', 'thead',
+        'title', 'tr', 'ul', 'details',
     );
 
     private function breaksLine(PHPTAL_Dom_Element $element)
     {
-        if ($element->getAttributeNS('http://xml.zope.org/namespaces/metal','define-macro')) {
+        if ($element->getAttributeNS('http://xml.zope.org/namespaces/metal', 'define-macro')) {
             return true;
         }
 
@@ -183,7 +183,7 @@ 
      *  replaced elements need to preserve spaces before and after
      */
     private static $inline_blocks = array(
-        'select','input','button','img','textarea','output','progress','meter',
+        'select', 'input', 'button', 'img', 'textarea', 'output', 'progress', 'meter',
     );
 
     private function isInlineBlock(PHPTAL_Dom_Element $element)
@@ -219,7 +219,7 @@ 
 	 * pre-defined order of attributes roughly by popularity
 	 */
 	private static $attributes_order = array(
-        'href','src','class','rel','type','title','width','height','alt','content','name','style','lang','id',
+        'href', 'src', 'class', 'rel', 'type', 'title', 'width', 'height', 'alt', 'content', 'name', 'style', 'lang', 'id',
     );
 
 	/**
@@ -232,7 +232,7 @@ 
 		$b_index = array_search($b, self::$attributes_order);
 
 		if ($a_index !== false && $b_index !== false) {
-			return $a_index - $b_index;
+			return $a_index-$b_index;
 		}
 		if ($a_index === false && $b_index === false) {
 			return strcmp($a, $b);
@@ -256,26 +256,26 @@ 
 
         // <meta charset>
 	    if ('meta' === $element->getLocalName() &&
-	        $element->getAttributeNS('','http-equiv') === 'Content-Type') {
-	            $element->removeAttributeNS('','http-equiv');
-	            $element->removeAttributeNS('','content');
-	            $element->setAttributeNS('','charset',strtolower($this->getPHPTAL()->getEncoding()));
+	        $element->getAttributeNS('', 'http-equiv') === 'Content-Type') {
+	            $element->removeAttributeNS('', 'http-equiv');
+	            $element->removeAttributeNS('', 'content');
+	            $element->setAttributeNS('', 'charset', strtolower($this->getPHPTAL()->getEncoding()));
         }
-        elseif (('link' === $element->getLocalName() && $element->getAttributeNS('','rel') === 'stylesheet') ||
+        elseif (('link' === $element->getLocalName() && $element->getAttributeNS('', 'rel') === 'stylesheet') ||
             ('style' === $element->getLocalName())) {
             // There's only one type of stylesheets that works.
-            $element->removeAttributeNS('','type');
+            $element->removeAttributeNS('', 'type');
 
         } elseif ('script' === $element->getLocalName()) {
-            $element->removeAttributeNS('','language');
+            $element->removeAttributeNS('', 'language');
 
             // Only remove type that matches default. E4X, vbscript, coffeescript, etc. must be preserved
-            $type = $element->getAttributeNS('','type');
+            $type = $element->getAttributeNS('', 'type');
             $is_std = preg_match('/^(?:text|application)\/(?:ecma|java)script(\s*;\s*charset\s*=\s*[^;]*)?$/', $type);
 
             // Remote scripts should have type specified in HTTP headers.
-            if ($is_std || $element->getAttributeNS('','src')) {
-                $element->removeAttributeNS('','type');
+            if ($is_std || $element->getAttributeNS('', 'src')) {
+                $element->removeAttributeNS('', 'type');
             }
         }
     }