phptal / PHPTAL

classes/PHPTAL/MacroMissingException.php

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- * PHPTAL templating engine
- *
- * PHP Version 5
- *
- * @category HTML
- * @package  PHPTAL
- * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
- * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
- * @version  SVN: $Id$
- * @link     http://phptal.org/
- */
+     * PHPTAL templating engine
+     *
+     * PHP Version 5
+     *
+     * @category HTML
+     * @package  PHPTAL
+     * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
+     * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
+     * @version  SVN: $Id$
+     * @link     http://phptal.org/
+     */
 
 /**
  * Wrong macro name in metal:use-macro

classes/PHPTAL/UnknownModifierException.php

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- * PHPTAL templating engine
- *
- * PHP Version 5
- *
- * @category HTML
- * @package  PHPTAL
- * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
- * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
- * @version  SVN: $Id$
- * @link     http://phptal.org/
- */
+     * PHPTAL templating engine
+     *
+     * PHP Version 5
+     *
+     * @category HTML
+     * @package  PHPTAL
+     * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
+     * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
+     * @version  SVN: $Id$
+     * @link     http://phptal.org/
+     */
 
 /**
  * ${unknown:foo} found in template

classes/PHPTAL/Namespace/Builtin.php

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- * PHPTAL templating engine
- *
- * PHP Version 5
- *
- * @category HTML
- * @package  PHPTAL
- * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
- * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
- * @version  SVN: $Id$
- * @link     http://phptal.org/
- */
+     * PHPTAL templating engine
+     *
+     * PHP Version 5
+     *
+     * @category HTML
+     * @package  PHPTAL
+     * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
+     * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
+     * @version  SVN: $Id$
+     * @link     http://phptal.org/
+     */
 
 /**
  * @package PHPTAL

classes/PHPTAL/Namespace/I18N.php

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- * PHPTAL templating engine
- *
- * PHP Version 5
- *
- * @category HTML
- * @package  PHPTAL
- * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
- * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
- * @version  SVN: $Id$
- * @link     http://phptal.org/
- */
+     * PHPTAL templating engine
+     *
+     * PHP Version 5
+     *
+     * @category HTML
+     * @package  PHPTAL
+     * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
+     * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
+     * @version  SVN: $Id$
+     * @link     http://phptal.org/
+     */
 
 
 /**

classes/PHPTAL/Namespace/TAL.php

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- * PHPTAL templating engine
- *
- * PHP Version 5
- *
- * @category HTML
- * @package  PHPTAL
- * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
- * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
- * @version  SVN: $Id$
- * @link     http://phptal.org/
- */
+     * PHPTAL templating engine
+     *
+     * PHP Version 5
+     *
+     * @category HTML
+     * @package  PHPTAL
+     * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
+     * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
+     * @version  SVN: $Id$
+     * @link     http://phptal.org/
+     */
 
 
 /**

classes/PHPTAL/Namespace/METAL.php

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- * PHPTAL templating engine
- *
- * PHP Version 5
- *
- * @category HTML
- * @package  PHPTAL
- * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
- * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
- * @version  SVN: $Id$
- * @link     http://phptal.org/
- */
+     * PHPTAL templating engine
+     *
+     * PHP Version 5
+     *
+     * @category HTML
+     * @package  PHPTAL
+     * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
+     * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
+     * @version  SVN: $Id$
+     * @link     http://phptal.org/
+     */
 
 
 /**

classes/PHPTAL/Php/Transformer.php

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- * PHPTAL templating engine
- *
- * PHP Version 5
- *
- * @category HTML
- * @package  PHPTAL
- * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
- * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
- * @version  SVN: $Id$
- * @link     http://phptal.org/
- */
+     * PHPTAL templating engine
+     *
+     * PHP Version 5
+     *
+     * @category HTML
+     * @package  PHPTAL
+     * @author   Laurent Bedubourg <lbedubourg@motion-twin.com>
+     * @author   Kornel Lesiński <kornel@aardvarkmedia.co.uk>
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
+     * @version  SVN: $Id$
+     * @link     http://phptal.org/
+     */
 
 /**
  * Tranform php: expressions into their php equivalent.

Spacing +25 added lines, -25 removed lines

@@ -37,20 +37,20 @@ 
 class PHPTAL_Php_Transformer
 {
     const ST_WHITE  = -1; // start of string or whitespace
-    const ST_NONE   = 0;  // pass through (operators, parens, etc.)
-    const ST_STR    = 1;  // 'foo'
-    const ST_ESTR   = 2;  // "foo ${x} bar"
-    const ST_VAR    = 3;  // abcd
-    const ST_NUM    = 4;  // 123.02
-    const ST_EVAL   = 5;  // $somevar
-    const ST_MEMBER = 6;  // abcd.x
-    const ST_STATIC = 7;  // class::[$]static|const
-    const ST_DEFINE = 8;  // @MY_DEFINE
+    const ST_NONE   = 0; // pass through (operators, parens, etc.)
+    const ST_STR    = 1; // 'foo'
+    const ST_ESTR   = 2; // "foo ${x} bar"
+    const ST_VAR    = 3; // abcd
+    const ST_NUM    = 4; // 123.02
+    const ST_EVAL   = 5; // $somevar
+    const ST_MEMBER = 6; // abcd.x
+    const ST_STATIC = 7; // class::[$]static|const
+    const ST_DEFINE = 8; // @MY_DEFINE
 
     /**
      * transform PHPTAL's php-like syntax into real PHP
      */
-    public static function transform($str, $prefix='$')
+    public static function transform($str, $prefix = '$')
     {
         $len = strlen($str);
         $state = self::ST_WHITE;
@@ -119,7 +119,7 @@ 
                             $result .= '->';
                             $state = self::ST_MEMBER;
                             $mark = $i+2;
-                            $i+=2;
+                            $i += 2;
                         }
                     }
                     // @ is an access to some defined variable
@@ -140,7 +140,7 @@ 
                 // $xxx
                 case self::ST_EVAL:
                     if (!self::isVarNameChar($c)) {
-                        $result .= $prefix . substr($str, $mark, $i-$mark);
+                        $result .= $prefix.substr($str, $mark, $i-$mark);
                         $result .= '}';
                         $state = self::ST_NONE;
                     }
@@ -177,10 +177,10 @@ 
                     // instring interpolation, search } and transform the
                     // interpollation to insert it into the string
                     elseif ($c === '$' && $i+1 < $len && $str[$i+1] === '{') {
-                        $result .= substr($str, $mark, $i-$mark) . '{';
+                        $result .= substr($str, $mark, $i-$mark).'{';
 
                         $sub = 0;
-                        for ($j = $i; $j<$len; $j++) {
+                        for ($j = $i; $j < $len; $j++) {
                             if ($str[$j] === '{') {
                                 $sub++;
                             } elseif ($str[$j] === '}' && (--$sub) == 0) {
@@ -199,7 +199,7 @@ 
                     }
                     // end of var, begin of member (method or var)
                     elseif ($c === '.') {
-                        $result .= $prefix . substr($str, $mark, $i-$mark);
+                        $result .= $prefix.substr($str, $mark, $i-$mark);
                         $result .= '->';
                         $state = self::ST_MEMBER;
                         $mark = $i+1;
@@ -219,10 +219,10 @@ 
                     }
                     // array index, the var is done
                     elseif ($c === '[') {
-                        if ($str[$mark]==='_') { // superglobal?
-                            $result .= '$' . substr($str, $mark, $i-$mark+1);
+                        if ($str[$mark] === '_') { // superglobal?
+                            $result .= '$'.substr($str, $mark, $i-$mark+1);
                         } else {
-                            $result .= $prefix . substr($str, $mark, $i-$mark+1);
+                            $result .= $prefix.substr($str, $mark, $i-$mark+1);
                         }
                         $state = self::ST_NONE;
                     }
@@ -252,7 +252,7 @@ 
                         }
                         // regular variable
                         else {
-                            $result .= $prefix . $var;
+                            $result .= $prefix.$var;
                         }
                         $i--;
                         $state = self::ST_NONE;
@@ -265,7 +265,7 @@ 
                     }
                     // eval mode ${foo}
                     elseif ($c === '$' && ($i >= $len-2 || $str[$i+1] !== '{')) {
-                        $result .= '{' . $prefix;
+                        $result .= '{'.$prefix;
                         $mark++;
                         $eval = true;
                     }
@@ -276,7 +276,7 @@ 
                     // end of var member var, begin of new member
                     elseif ($c === '.') {
                         $result .= substr($str, $mark, $i-$mark);
-                        if ($eval) { $result .='}'; $eval = false; }
+                        if ($eval) { $result .= '}'; $eval = false; }
                         $result .= '->';
                         $mark = $i+1;
                         $state = self::ST_MEMBER;
@@ -284,24 +284,24 @@ 
                     // begin of static access
                     elseif ($c === ':') {
                         $result .= substr($str, $mark, $i-$mark+1);
-                        if ($eval) { $result .='}'; $eval = false; }
+                        if ($eval) { $result .= '}'; $eval = false; }
                         $state = self::ST_STATIC;
                         break;
                     }
                     // the member is a method or an array
                     elseif ($c === '(' || $c === '[') {
                         $result .= substr($str, $mark, $i-$mark+1);
-                        if ($eval) { $result .='}'; $eval = false; }
+                        if ($eval) { $result .= '}'; $eval = false; }
                         $state = self::ST_NONE;
                     }
                     // regular end of member, it is a var
                     else {
                         $var = substr($str, $mark, $i-$mark);
-                        if ($var !== '' && !preg_match('/^[a-z][a-z0-9_\x7f-\xff]*$/i',$var)) {
+                        if ($var !== '' && !preg_match('/^[a-z][a-z0-9_\x7f-\xff]*$/i', $var)) {
                             throw new PHPTAL_ParserException("Invalid field name '$var' in expression php:$str");
                         }
                         $result .= $var;
-                        if ($eval) { $result .='}'; $eval = false; }
+                        if ($eval) { $result .= '}'; $eval = false; }
                         $state = self::ST_NONE;
                         $i--;
                     }

Braces +10 added lines, -7 removed lines

@@ -63,8 +63,11 @@ 
 
 
         for ($i = 0; $i <= $len; $i++) {
-            if ($i == $len) $c = "\0";
-            else $c = $str[$i];
+            if ($i == $len) {
+                $c = "\0";
+            } else {
+                $c = $str[$i];
+            }
 
             switch ($state) {
 
@@ -85,8 +88,7 @@ 
                         $state = self::ST_EVAL;
                         $mark = $i+1;
                         $result .= $prefix.'{';
-                    }
-                    elseif (self::isDigit($c))
+                    } elseif (self::isDigit($c))
                     {
                         $state = self::ST_NUM;
                         $mark = $i;
@@ -126,8 +128,7 @@ 
                     elseif ($c === '@') {
                         $state = self::ST_DEFINE;
                         $mark = $i+1;
-                    }
-                    elseif (ctype_space($c)) {
+                    } elseif (ctype_space($c)) {
                         $state = self::ST_WHITE;
                         $result .= $c;
                     }
@@ -377,7 +378,9 @@ 
         $result = trim($result);
 
         // CodeWriter doesn't like expressions that look like blocks
-        if ($result[strlen($result)-1] === '}') return '('.$result.')';
+        if ($result[strlen($result)-1] === '}') {
+            return '('.$result.')';
+        }
 
         return $result;
     }

classes/PHPTAL/Php/Attribute.php

Braces +5 added lines, -4 removed lines

@@ -76,10 +76,11 @@
 
     protected function doEchoAttribute(PHPTAL_Php_CodeWriter $codewriter, $code)
     {
-        if ($this->_echoType === self::ECHO_TEXT)
-            $codewriter->doEcho($code);
-        else
-            $codewriter->doEchoRaw($code);
+        if ($this->_echoType === self::ECHO_TEXT) {
+                    $codewriter->doEcho($code);
+        } else {
+                    $codewriter->doEchoRaw($code);
+        }
     }
 
     protected function parseSetExpression($exp)

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

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
         $code = $codewriter->evaluateExpression($expression);
 
         // instantiate controller using expression
-        $codewriter->doSetVar( $this->var.'->'.$varName, 'new PHPTAL_RepeatController('.$code.')'."\n" );
+        $codewriter->doSetVar($this->var.'->'.$varName, 'new PHPTAL_RepeatController('.$code.')'."\n");
 
         $codewriter->pushContext();