phptal / PHPTAL

classes/PHPTAL/Dom/PHPTALDocumentBuilder.php

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
  */
 class PHPTAL_Dom_PHPTALDocumentBuilder extends PHPTAL_Dom_DocumentBuilder
 {
-    private $_xmlns;   /* PHPTAL_Dom_XmlnsState */
+    private $_xmlns; /* PHPTAL_Dom_XmlnsState */
     private $encoding;
 
     public function __construct()
@@ -52,8 +52,8 @@ 
     public function onDocumentEnd()
     {
         if (count($this->_stack) > 0) {
-            $left='</'.$this->_current->getQualifiedName().'>';
-            for ($i = count($this->_stack)-1; $i>0; $i--) $left .= '</'.$this->_stack[$i]->getQualifiedName().'>';
+            $left = '</'.$this->_current->getQualifiedName().'>';
+            for ($i = count($this->_stack)-1; $i > 0; $i--) $left .= '</'.$this->_stack[$i]->getQualifiedName().'>';
             throw new PHPTAL_ParserException("Not all elements were closed before end of the document. Missing: ".$left,
                         $this->file, $this->line);
         }
@@ -129,7 +129,7 @@ 
 
         $node = new PHPTAL_Dom_Element($element_qname, $namespace_uri, $attrnodes, $this->getXmlnsState());
         $this->pushNode($node);
-        $this->_stack[] =  $this->_current;
+        $this->_stack[] = $this->_current;
         $this->_current = $node;
     }
 

classes/PHPTAL/GetTextTranslator.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
      *
      * Encoding must be set before calling addDomain!
      */
-    public function addDomain($domain, $path='./locale/')
+    public function addDomain($domain, $path = './locale/')
     {
         bindtextdomain($domain, $path);
         if ($this->_encoding) {
@@ -140,7 +140,7 @@ 
      *
      * @param bool $htmlencode if true, output will be HTML-escaped.
      */
-    public function translate($key, $htmlencode=true)
+    public function translate($key, $htmlencode = true)
     {
         if ($this->_canonicalize) $key = self::_canonicalizeKey($key);
 
@@ -168,7 +168,7 @@ 
         $key_ = trim($key_);
         $key_ = str_replace("\n", "", $key_);
         $key_ = str_replace("\r", "", $key_);
-        for ($i = 0; $i<strlen($key_); $i++) {
+        for ($i = 0; $i < strlen($key_); $i++) {
             $c = $key_[$i];
             $o = ord($c);
             if ($o < 5 || $o > 127) {

tools/phptal_lint.php

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

classes/PHPTAL/Dom/SaxXmlParser.php

Spacing +15 added lines, -15 removed lines

@@ -116,12 +116,12 @@ 
             $builder->setSource($this->_file, $this->_line);
             $builder->onDocumentStart();
 
-            $i=0;
+            $i = 0;
             // remove BOM (UTF-8 byte order mark)...
             if (substr($src, 0, 3) === self::BOM_STR) {
-                $i=3;
+                $i = 3;
             }
-            for (; $i<$len; $i++) {
+            for (; $i < $len; $i++) {
                 $c = $src[$i]; // Change to substr($src, $i, 1); if you want to use mb_string.func_overload
 
                 if ($c === "\n") $builder->setSource($this->_file, ++$this->_line);
@@ -201,7 +201,7 @@ 
                         if ($c !== '>') {
                             $this->raiseError("Expected '/>', but found '/$c' inside tag < $tagname >");
                         }
-                        $mark = $i+1;   // mark text start
+                        $mark = $i+1; // mark text start
                         $state = self::ST_TEXT;
                         $builder->onElementStart($tagname, $attributes);
                         $builder->onElementClose($tagname);
@@ -210,7 +210,7 @@ 
                     case self::ST_TAG_BETWEEN_ATTRIBUTE:
                     case self::ST_TAG_ATTRIBUTES:
                         if ($c === '>') {
-                            $mark = $i+1;   // mark text start
+                            $mark = $i+1; // mark text start
                             $state = self::ST_TEXT;
                             $builder->onElementStart($tagname, $attributes);
                         } elseif ($c === '/') {
@@ -226,7 +226,7 @@ 
                     case self::ST_COMMENT:
                         if ($c === '>' && $i > $mark+4 && substr($src, $i-2, 2) === '--') {
 
-                            if (preg_match('/^-|--|-$/', substr($src, $mark +4, $i-$mark+1 -7))) {
+                            if (preg_match('/^-|--|-$/', substr($src, $mark+4, $i-$mark+1-7))) {
                                 $this->raiseError("Ill-formed comment. XML comments are not allowed to contain '--' or start/end with '-': ".substr($src, $mark+4, $i-$mark+1-7));
                             }
 
@@ -289,7 +289,7 @@ 
 
                             if ($c === '=') $state = self::ST_ATTR_VALUE;
                             else /* white char */ $state = self::ST_ATTR_EQ;
-                        } elseif ($c === '/' || $c==='>') {
+                        } elseif ($c === '/' || $c === '>') {
                             $attribute = substr($src, $mark, $i-$mark);
                             if (!$this->isValidQName($attribute)) {
                                 $this->raiseError("Invalid attribute name '$attribute'");
@@ -323,7 +323,7 @@ 
 
                             // PHPTAL's code generator assumes input is escaped for double-quoted strings. Single-quoted attributes need to be converted.
                             // FIXME: it should be escaped at later stage.
-                            $attributes[$attribute] = str_replace('"',"&quot;", $attributes[$attribute]);
+                            $attributes[$attribute] = str_replace('"', "&quot;", $attributes[$attribute]);
                             $state = self::ST_TAG_BETWEEN_ATTRIBUTE;
                         }
                         break;
@@ -347,7 +347,7 @@ 
 
             $builder->onDocumentEnd();
         }
-        catch(PHPTAL_TemplateException $e)
+        catch (PHPTAL_TemplateException $e)
         {
             $e->hintSrcPosition($this->_file, $this->_line);
             throw $e;
@@ -370,7 +370,7 @@ 
             // $match expression below somehow triggers quite deep recurrency and stack overflow in preg
             // to avoid this, check string bit by bit, omitting ASCII fragments.
             if (strlen($str) > 200) {
-                $chunks = preg_split('/(?>[\x09\x0A\x0D\x20-\x7F]+)/',$str,null,PREG_SPLIT_NO_EMPTY);
+                $chunks = preg_split('/(?>[\x09\x0A\x0D\x20-\x7F]+)/', $str, null, PREG_SPLIT_NO_EMPTY);
                 foreach ($chunks as $chunk) {
                     if (strlen($chunk) < 200) {
                         $this->checkEncoding($chunk);
@@ -389,11 +389,11 @@ 
                . '|\xED[\x80-\x9F][\x80-\xBF]'        // excluding surrogates
                . '|\xF0[\x90-\xBF][\x80-\xBF]{2}'     // planes 1-3
                . '|[\xF1-\xF3][\x80-\xBF]{3}'         // planes 4-15
-               . '|\xF4[\x80-\x8F][\x80-\xBF]{2}';    // plane 16
+               . '|\xF4[\x80-\x8F][\x80-\xBF]{2}'; // plane 16
 
-            if (!preg_match('/^(?:(?>'.$match.'))+$/s',$str)) {
-                $res = preg_split('/((?>'.$match.')+)/s',$str,null,PREG_SPLIT_DELIM_CAPTURE);
-                for($i=0; $i < count($res); $i+=2)
+            if (!preg_match('/^(?:(?>'.$match.'))+$/s', $str)) {
+                $res = preg_split('/((?>'.$match.')+)/s', $str, null, PREG_SPLIT_DELIM_CAPTURE);
+                for ($i = 0; $i < count($res); $i += 2)
                 {
                     $res[$i] = self::convertBytesToEntities(array(1=>$res[$i]));
                 }
@@ -426,7 +426,7 @@ 
     {
         $m = $m[1];
         $out = "";
-        for($i=0; $i < strlen($m); $i++)
+        for ($i = 0; $i < strlen($m); $i++)
         {
             $out .= '&#X'.strtoupper(dechex(ord($m[$i]))).';';
         }