phptal / PHPTAL

classes/PHPTAL/Php/Attribute/TAL/Attributes.php

Doc Comments +5 added lines

@@ -91,6 +91,7 @@ 
 
     /**
      * attribute will be output regardless of its evaluated value. NULL behaves just like "".
+     * @param string $code
      */
     private function prepareAttributeUnconditional(PHPTAL_Php_CodeWriter $codewriter, $qname, $code)
     {
@@ -107,6 +108,7 @@ 
 
     /**
      * If evaluated value of attribute is NULL, it will not be output at all.
+     * @param string $code
      */
     private function prepareAttributeConditional(PHPTAL_Php_CodeWriter $codewriter, $qname, $code)
     {
@@ -139,6 +141,9 @@ 
         $this->phpelement->getOrCreateAttributeNode($qname)->overwriteFullWithVariable($this->_attkey);
     }
 
+    /**
+     * @param string $code
+     */
     private function prepareBooleanAttribute(PHPTAL_Php_CodeWriter $codewriter, $qname, $code)
     {
         $attkey = $this->getVarName($qname, $codewriter);

Spacing +1 added lines, -1 removed lines

@@ -186,7 +186,7 @@
         $executor->doElse();
         $attr_str = ($this->_default_escaped !== false)
             ? ' '.$this->_attribute.'='.$codewriter->quoteAttributeValue($this->_default_escaped)  // default value
-            : '';                                 // do not print attribute
+            : ''; // do not print attribute
         $codewriter->doSetVar($this->_attkey, $codewriter->str($attr_str));
         $executor->breakChain();
     }

Braces +13 added lines, -9 removed lines

@@ -115,10 +115,11 @@ 
 
         $codewriter->doIf("null !== ($attkey = ($code))");
 
-        if ($this->_echoType !== PHPTAL_Php_Attribute::ECHO_STRUCTURE)
-            $codewriter->doSetVar($attkey, $codewriter->str(" $qname=\"").".".$codewriter->escapeCode($attkey).".'\"'");
-        else
-            $codewriter->doSetVar($attkey, $codewriter->str(" $qname=\"").".".$codewriter->stringifyCode($attkey).".'\"'");
+        if ($this->_echoType !== PHPTAL_Php_Attribute::ECHO_STRUCTURE) {
+                    $codewriter->doSetVar($attkey, $codewriter->str(" $qname=\"").".".$codewriter->escapeCode($attkey).".'\"'");
+        } else {
+                    $codewriter->doSetVar($attkey, $codewriter->str(" $qname=\"").".".$codewriter->stringifyCode($attkey).".'\"'");
+        }
 
         $codewriter->doElse();
         $codewriter->doSetVar($attkey, "''");
@@ -166,7 +167,9 @@ 
 
     public function after(PHPTAL_Php_CodeWriter $codewriter)
     {
-        foreach ($this->vars_to_recycle as $var) $codewriter->recycleTempVariable($var);
+        foreach ($this->vars_to_recycle as $var) {
+            $codewriter->recycleTempVariable($var);
+        }
     }
 
     public function talesChainNothingKeyword(PHPTAL_Php_TalesChainExecutor $executor)
@@ -202,10 +205,11 @@ 
         }
         $executor->doIf($condition);
 
-        if ($this->_echoType == PHPTAL_Php_Attribute::ECHO_STRUCTURE)
-            $value = $codewriter->stringifyCode($this->_attkey);
-        else
-            $value = $codewriter->escapeCode($this->_attkey);
+        if ($this->_echoType == PHPTAL_Php_Attribute::ECHO_STRUCTURE) {
+                    $value = $codewriter->stringifyCode($this->_attkey);
+        } else {
+                    $value = $codewriter->escapeCode($this->_attkey);
+        }
 
         $codewriter->doSetVar($this->_attkey, $codewriter->str(" {$this->_attribute}=\"").".$value.'\"'");
     }

classes/PHPTAL/Php/Attribute/TAL/Condition.php

Doc Comments +4 added lines

@@ -61,6 +61,10 @@
     }
 
 
+    /**
+     * @param string $exp
+     * @param boolean $islast
+     */
     public function talesChainPart(PHPTAL_Php_TalesChainExecutor $executor, $exp, $islast)
     {
         // check if the expression is empty

Spacing +3 added lines, -3 removed lines

@@ -52,7 +52,7 @@ 
             $code = 'false';
         }
 
-        $codewriter->doIf('phptal_true(' . $code . ')');
+        $codewriter->doIf('phptal_true('.$code.')');
     }
 
     public function after(PHPTAL_Php_CodeWriter $codewriter)
@@ -65,12 +65,12 @@ 
     {
         // check if the expression is empty
         if ($exp !== 'false') {
-            $this->expressions[] = '!phptal_isempty(' . $exp . ')';
+            $this->expressions[] = '!phptal_isempty('.$exp.')';
         }
 
         if ($islast) {
             // for the last one in the chain build a ORed condition
-            $executor->getCodeWriter()->doIf( implode(' || ', $this->expressions ) );
+            $executor->getCodeWriter()->doIf(implode(' || ', $this->expressions));
             // The executor will always end an if so we output a dummy if
             $executor->doIf('false');
         }

classes/PHPTAL/Php/State.php

Doc Comments +5 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
     /**
      * Syntax rules to follow in generated code
      *
-     * @return one of PHPTAL::XHTML, PHPTAL::XML, PHPTAL::HTML5
+     * @return integer of PHPTAL::XHTML, PHPTAL::XML, PHPTAL::HTML5
      */
     public function getOutputMode()
     {
@@ -183,6 +183,9 @@ 
         return $this->_interpolateTalesVarsCallback($matches, 'cdata');
     }
 
+    /**
+     * @param string $format
+     */
     private function _interpolateTalesVarsCallback($matches, $format)
     {
         // replaces $${ with literal ${ (or $$$${ with $${ etc)
@@ -225,7 +228,7 @@ 
      * expects PHP code and returns PHP code that will generate escaped string
      * Optimizes case when PHP string is given.
      *
-     * @return php code
+     * @return string code
      */
     public function htmlchars($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') {

Indentation +2 added lines, -2 removed lines

@@ -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);
     }
 
     /**

classes/PHPTAL/Php/TalesInternal.php

Doc Comments +5 added lines

@@ -228,6 +228,7 @@ 
 
     /**
      * @param string $tales_prefix prefix added to all TALES in the string
+     * @param boolean $nothrow
      */
     static public function parseString($expression, $nothrow, $tales_prefix)
     {
@@ -435,6 +436,10 @@ 
      * helper function for compileToPHPExpression
      * @access private
      */
+
+    /**
+     * @param boolean $nothrow
+     */
     private static function convertExpressionsToExpression(array $array, $nothrow)
     {
         if (count($array)==1) return '($ctx->noThrow('.($nothrow?'true':'false').')||1?('.

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

Braces +29 added lines, -14 removed lines

@@ -124,9 +124,15 @@ 
     static public function path($expression, $nothrow=false)
     {
         $expression = trim($expression);
-        if ($expression == 'default') return self::DEFAULT_KEYWORD;
-        if ($expression == 'nothing') return self::NOTHING_KEYWORD;
-        if ($expression == '')        return self::NOTHING_KEYWORD;
+        if ($expression == 'default') {
+            return self::DEFAULT_KEYWORD;
+        }
+        if ($expression == 'nothing') {
+            return self::NOTHING_KEYWORD;
+        }
+        if ($expression == '') {
+            return self::NOTHING_KEYWORD;
+        }
 
         // split OR expressions terminated by a string
         if (preg_match('/^(.*?)\s*\|\s*?(string:.*)$/sm', $expression, $m)) {
@@ -148,8 +154,7 @@ 
             foreach ($exps as $i=>$exp) {
                 if(isset($string) || $i < count($exps) - 1) {
                     $result[] = self::compileToPHPExpressions(trim($exp), true);
-                }
-                else {
+                } else {
                     // the last expression can thorw exception.
                     $result[] = self::compileToPHPExpressions(trim($exp), false);
                 }
@@ -183,7 +188,11 @@ 
             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.'}';
+        if (preg_match('/^\'[a-z][a-z0-9_]*\'$/i', $next)) {
+            $next = substr($next, 1, -1);
+        } else {
+            $next = '{'.$next.'}';
+        }
 
         // if no sub part for this expression, just optimize the generated code
         // and access the $ctx->var
@@ -260,8 +269,7 @@ 
                     if ($inAccoladePath) {
                         $subPath .= $c;
                         $c = '';
-                    }
-                    else {
+                    } else {
                         $c = '\\\\';
                     }
                     break;
@@ -270,8 +278,7 @@ 
                     if ($inAccoladePath) {
                         $subPath .= $c;
                         $c = '';
-                    }
-                    else {
+                    } else {
                         $c = '\\\'';
                     }
                     break;
@@ -384,7 +391,9 @@ 
     static public function exists($src, $nothrow)
     {
         $src = trim($src);
-        if (ctype_alnum($src)) return 'isset($ctx->'.$src.')';
+        if (ctype_alnum($src)) {
+            return 'isset($ctx->'.$src.')';
+        }
         return '(null !== ' . self::compileToPHPExpression($src, true) . ')';
     }
 
@@ -395,7 +404,9 @@ 
      */
     static public function number($src, $nothrow)
     {
-        if (!is_numeric(trim($src))) throw new PHPTAL_ParserException("'$src' is not a number");
+        if (!is_numeric(trim($src))) {
+            throw new PHPTAL_ParserException("'$src' is not a number");
+        }
         return trim($src);
     }
 
@@ -425,7 +436,9 @@ 
     public static function compileToPHPExpression($expression, $nothrow=false)
     {
         $r = self::compileToPHPExpressions($expression, $nothrow);
-        if (!is_array($r)) return $r;
+        if (!is_array($r)) {
+            return $r;
+        }
 
         // this weird ternary operator construct is to execute noThrow inside the expression
         return '($ctx->noThrow(true)||1?'.self::convertExpressionsToExpression($r, $nothrow).':"")';
@@ -437,9 +450,11 @@ 
      */
     private static function convertExpressionsToExpression(array $array, $nothrow)
     {
-        if (count($array)==1) return '($ctx->noThrow('.($nothrow?'true':'false').')||1?('.
+        if (count($array)==1) {
+            return '($ctx->noThrow('.($nothrow?'true':'false').')||1?('.
             ($array[0]==self::NOTHING_KEYWORD?'null':$array[0]).
             '):"")';
+        }
 
         $expr = array_shift($array);
 

classes/PHPTAL/PreFilter/Compress.php

Doc Comments +3 added lines

@@ -139,6 +139,9 @@
         'html','head','table','thead','tfoot','select','optgroup','dl','ol','ul','tr','datalist',
     );
 
+    /**
+     * @return PHPTAL_Dom_Element
+     */
     private function hasNoInterelementSpace(PHPTAL_Dom_Element $element)
     {
         if ($element->getLocalName() === 'block'

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

Braces +1 added lines, -2 removed lines

@@ -260,8 +260,7 @@
 	            $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');

Indentation +38 added lines, -38 removed lines

@@ -172,8 +172,8 @@ 
         }
 
         if ($element->getNamespaceURI() !== 'http://www.w3.org/1999/xhtml'
-	        && $element->getNamespaceURI() !== '') {
-	        return false;
+            && $element->getNamespaceURI() !== '') {
+            return false;
         }
 
         return in_array($element->getLocalName(), self::$breaks_line);
@@ -189,8 +189,8 @@ 
     private function isInlineBlock(PHPTAL_Dom_Element $element)
     {
         if ($element->getNamespaceURI() !== 'http://www.w3.org/1999/xhtml'
-	        && $element->getNamespaceURI() !== '') {
-	        return false;
+            && $element->getNamespaceURI() !== '') {
+            return false;
         }
 
         return in_array($element->getLocalName(), self::$inline_blocks);
@@ -209,45 +209,45 @@ 
             $attrs_by_qname[$attrnode->getQualifiedName()] = $attrnode;
         }
 
-	if (count($attrs_by_qname) > 1) {
-		uksort($attrs_by_qname, array($this, 'compareQNames'));
-		$element->setAttributeNodes(array_values($attrs_by_qname));
-	}
+    if (count($attrs_by_qname) > 1) {
+        uksort($attrs_by_qname, array($this, 'compareQNames'));
+        $element->setAttributeNodes(array_values($attrs_by_qname));
+    }
     }
 
     /**
-	 * pre-defined order of attributes roughly by popularity
-	 */
-	private static $attributes_order = array(
+     * 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',
     );
 
-	/**
-	 * compare names according to $attributes_order array.
-	 * Elements that are not in array, are considered greater than all elements in array,
-	 * and are sorted alphabetically.
-	 */
-	private static function compareQNames($a, $b) {
-		$a_index = array_search($a, self::$attributes_order);
-		$b_index = array_search($b, self::$attributes_order);
-
-		if ($a_index !== false && $b_index !== false) {
-			return $a_index - $b_index;
-		}
-		if ($a_index === false && $b_index === false) {
-			return strcmp($a, $b);
-		}
-		return ($a_index === false) ? 1 : -1;
-	}
+    /**
+     * compare names according to $attributes_order array.
+     * Elements that are not in array, are considered greater than all elements in array,
+     * and are sorted alphabetically.
+     */
+    private static function compareQNames($a, $b) {
+        $a_index = array_search($a, self::$attributes_order);
+        $b_index = array_search($b, self::$attributes_order);
+
+        if ($a_index !== false && $b_index !== false) {
+            return $a_index - $b_index;
+        }
+        if ($a_index === false && $b_index === false) {
+            return strcmp($a, $b);
+        }
+        return ($a_index === false) ? 1 : -1;
+    }
 
     /**
      * HTML5 doesn't care about boilerplate
      */
-	private function elementSpecificOptimizations(PHPTAL_Dom_Element $element)
-	{
-	    if ($element->getNamespaceURI() !== 'http://www.w3.org/1999/xhtml'
-	     && $element->getNamespaceURI() !== '') {
-	        return;
+    private function elementSpecificOptimizations(PHPTAL_Dom_Element $element)
+    {
+        if ($element->getNamespaceURI() !== 'http://www.w3.org/1999/xhtml'
+         && $element->getNamespaceURI() !== '') {
+            return;
         }
 
         if ($this->getPHPTAL()->getOutputMode() !== PHPTAL::HTML5) {
@@ -255,11 +255,11 @@ 
         }
 
         // <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()));
+        if ('meta' === $element->getLocalName() &&
+            $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') ||
             ('style' === $element->getLocalName())) {

classes/PHPTAL/PreFilter/Normalize.php

Doc Comments +1 added lines

@@ -86,6 +86,7 @@
 
     /**
      * does not trim
+     * @return string
      */
     protected function normalizeSpace($text, $encoding)
     {

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
     }

Braces +6 added lines, -2 removed lines

@@ -76,7 +76,9 @@ 
     protected function findElementToFilter(PHPTAL_Dom_Element $root)
     {
         foreach ($root->childNodes as $node) {
-            if (!$node instanceof PHPTAL_Dom_Element) continue;
+            if (!$node instanceof PHPTAL_Dom_Element) {
+                continue;
+            }
 
             if ($node->getAttributeNS("http://www.w3.org/XML/1998/namespace", 'space') == 'default') {
                 $this->filterDOM($node);
@@ -99,7 +101,9 @@ 
         foreach ($element->getAttributeNodes() as $attrnode) {
 
             // skip replaced attributes (because getValueEscaped on them is meaningless)
-            if ($attrnode->getReplacedState() !== PHPTAL_Dom_Attr::NOT_REPLACED) continue;
+            if ($attrnode->getReplacedState() !== PHPTAL_Dom_Attr::NOT_REPLACED) {
+                continue;
+            }
 
             $val = $this->normalizeSpace($attrnode->getValueEscaped(), $attrnode->getEncoding());
             $attrnode->setValueEscaped(trim($val, ' '));

classes/PHPTAL/StringSource.php

Doc Comments +4 added lines

@@ -21,6 +21,10 @@
 {
     const NO_PATH_PREFIX = '<string ';
 
+    /**
+     * @param string $data
+     * @param string $realpath
+     */
     public function __construct($data, $realpath = null)
     {
         $this->_data = $data;

classes/PHPTAL/TalesRegistry.php

Doc Comments +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
      * callback.
      *
      * @param string $prefix
-     * @param mixed $callback
+     * @param string[] $callback
      * @param bool $is_fallback if true, method will be used as last resort (if there's no phptal_tales_foo)
      */
     public function registerPrefix($prefix, $callback, $is_fallback = false)

tools/phptal_lint.php

Doc Comments +13 added lines

@@ -127,6 +127,10 @@ 
         echo "  Use 'phptal_lint.php .' to scan current directory\n\n";
     }
 
+    /**
+     * @param integer $num
+     * @param string $word
+     */
     function plural($num, $word)
     {
         if ($num == 1) return "$num $word";
@@ -196,6 +200,9 @@ 
     public $skipped = 0, $skipped_filenames = array();
     public $checked = 0;
 
+    /**
+     * @param boolean $bool
+     */
     function skipUnknownModifiers($bool)
     {
         $this->skipUnknownModifiers = $bool;
@@ -205,11 +212,17 @@ 
         $this->accept_pattern = '/\.(?:' . implode('|', $ext) . ')$/i';
     }
 
+    /**
+     * @param string $symbol
+     */
     protected function reportProgress($symbol)
     {
         echo $symbol;
     }
 
+    /**
+     * @param string $path
+     */
     function scan($path)
     {
         foreach (new DirectoryIterator($path) as $entry) {

Spacing +18 added lines, -18 removed lines

@@ -27,7 +27,7 @@ 
     {
         try
         {
-            if (! empty($_SERVER['REQUEST_URI'])) {
+            if (!empty($_SERVER['REQUEST_URI'])) {
                 throw new Exception("Please use this tool from command line");
             }
 
@@ -76,7 +76,7 @@ 
                 echo " Skipped ".$this->plural($lint->skipped, "non-template file").".";
             }
             echo "\n";
-            if (! $custom_extensions && count($lint->skipped_filenames)) {
+            if (!$custom_extensions && count($lint->skipped_filenames)) {
                 echo "Skipped file(s): ", implode(', ', array_keys($lint->skipped_filenames)), ".\n";
             }
 
@@ -86,7 +86,7 @@ 
                 echo "\n";
                 exit(2);
             } else if (count($lint->warnings)) {
-                echo "Found ".$this->plural(count($lint->warnings),"warning").":\n";
+                echo "Found ".$this->plural(count($lint->warnings), "warning").":\n";
                 $this->display_erorr_array($lint->warnings);
                 echo "\n";
                 exit(0);
@@ -95,8 +95,8 @@ 
                 exit($lint->checked ? 0 : 1);
             }
         }
-        catch(Exception $e) {
-            fwrite(STDERR, $e->getMessage() . "\n");
+        catch (Exception $e) {
+            fwrite(STDERR, $e->getMessage()."\n");
             $errcode = $e->getCode();
             exit($errcode ? $errcode : 1);
         }
@@ -119,7 +119,7 @@ 
     function usage()
     {
         $this->require_phptal();
-        echo "PHPTAL Lint 1.1.3 (PHPTAL ", strtr(PHPTAL_VERSION,"_","."), ")\n";
+        echo "PHPTAL Lint 1.1.3 (PHPTAL ", strtr(PHPTAL_VERSION, "_", "."), ")\n";
 
         echo "Usage: phptal_lint.php [-e extensions] [-i php_file_or_directory] file_or_directory_to_check ...\n";
         echo "  -e comma-separated list of extensions\n";
@@ -136,11 +136,11 @@ 
     function extended_getopt(array $options)
     {
         $results = array('--filenames--'=>array());
-        for ($i = 1; $i < count($_SERVER['argv']); $i ++) {
+        for ($i = 1; $i < count($_SERVER['argv']); $i++) {
             if (in_array($_SERVER['argv'][$i], $options)) {
-                $results[substr($_SERVER['argv'][$i], 1)][] = $_SERVER['argv'][++ $i];
+                $results[substr($_SERVER['argv'][$i], 1)][] = $_SERVER['argv'][++$i];
             } else if ($_SERVER['argv'][$i] == '--') {
-                $results['--filenames--'] = array_merge($results['--filenames--'], array_slice($_SERVER['argv'],$i+1));
+                $results['--filenames--'] = array_merge($results['--filenames--'], array_slice($_SERVER['argv'], $i+1));
                 break;
             } else if (substr($_SERVER['argv'][$i], 0, 1) == '-') {
                     $this->usage();
@@ -171,7 +171,7 @@ 
     {
         if (class_exists('PHPTAL', false)) return;
 
-        $myphptal = dirname(__FILE__) . '/../classes/PHPTAL.php';
+        $myphptal = dirname(__FILE__).'/../classes/PHPTAL.php';
         if (file_exists($myphptal)) {
             require_once $myphptal;
         } else {
@@ -202,7 +202,7 @@ 
     }
 
     function acceptExtensions(array $ext) {
-        $this->accept_pattern = '/\.(?:' . implode('|', $ext) . ')$/i';
+        $this->accept_pattern = '/\.(?:'.implode('|', $ext).')$/i';
     }
 
     protected function reportProgress($symbol)
@@ -226,17 +226,17 @@ 
 
             if ($entry->isDir()) {
                 $this->reportProgress('.');
-                $this->scan($path . DIRECTORY_SEPARATOR . $filename);
+                $this->scan($path.DIRECTORY_SEPARATOR.$filename);
                 continue;
             }
 
-            if (! preg_match($this->accept_pattern, $filename)) {
+            if (!preg_match($this->accept_pattern, $filename)) {
                 $this->skipped++;
                 $this->skipped_filenames[$filename] = true;
                 continue;
             }
 
-            $result = $this->testFile($path . DIRECTORY_SEPARATOR . $filename);
+            $result = $this->testFile($path.DIRECTORY_SEPARATOR.$filename);
 
             if (self::TEST_OK == $result) {
                 $this->reportProgress('.');
@@ -258,25 +258,25 @@ 
     function testFile($fullpath)
     {
         try {
-            $this->checked ++;
+            $this->checked++;
             $phptal = new PHPTAL($fullpath);
             $phptal->setForceReparse(true);
             $phptal->prepare();
             return self::TEST_OK;
         }
-        catch(PHPTAL_UnknownModifierException $e) {
+        catch (PHPTAL_UnknownModifierException $e) {
             if ($this->skipUnknownModifiers && is_callable(array($e, 'getModifierName'))) {
                 $this->warnings[] = array(dirname($fullpath), basename($fullpath), "Unknown expression modifier: ".$e->getModifierName()." (use -i to include your custom modifier functions)", $e->getLine());
                 return self::TEST_SKIPPED;
             }
             $log_exception = $e;
         }
-        catch(Exception $e) {
+        catch (Exception $e) {
             $log_exception = $e;
         }
 
         // Takes exception from either of the two catch blocks above
-        $this->errors[] = array(dirname($fullpath) , basename($fullpath) , $log_exception->getMessage() , $log_exception->getLine());
+        $this->errors[] = array(dirname($fullpath), basename($fullpath), $log_exception->getMessage(), $log_exception->getLine());
         return self::TEST_ERROR;
     }
 }

Braces +9 added lines, -8 removed lines

@@ -94,8 +94,7 @@ 
                 echo "No errors found!\n";
                 exit($lint->checked ? 0 : 1);
             }
-        }
-        catch(Exception $e) {
+        } catch(Exception $e) {
             fwrite(STDERR, $e->getMessage() . "\n");
             $errcode = $e->getCode();
             exit($errcode ? $errcode : 1);
@@ -129,7 +128,9 @@ 
 
     function plural($num, $word)
     {
-        if ($num == 1) return "$num $word";
+        if ($num == 1) {
+            return "$num $word";
+        }
         return "$num {$word}s";
     }
 
@@ -169,7 +170,9 @@ 
 
     function require_phptal()
     {
-        if (class_exists('PHPTAL', false)) return;
+        if (class_exists('PHPTAL', false)) {
+            return;
+        }
 
         $myphptal = dirname(__FILE__) . '/../classes/PHPTAL.php';
         if (file_exists($myphptal)) {
@@ -263,15 +266,13 @@ 
             $phptal->setForceReparse(true);
             $phptal->prepare();
             return self::TEST_OK;
-        }
-        catch(PHPTAL_UnknownModifierException $e) {
+        } catch(PHPTAL_UnknownModifierException $e) {
             if ($this->skipUnknownModifiers && is_callable(array($e, 'getModifierName'))) {
                 $this->warnings[] = array(dirname($fullpath), basename($fullpath), "Unknown expression modifier: ".$e->getModifierName()." (use -i to include your custom modifier functions)", $e->getLine());
                 return self::TEST_SKIPPED;
             }
             $log_exception = $e;
-        }
-        catch(Exception $e) {
+        } catch(Exception $e) {
             $log_exception = $e;
         }