phptal / PHPTAL

classes/PHPTAL/FileSourceResolver.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     public function resolve($path)
     {
         foreach ($this->_repositories as $repository) {
-            $file = $repository . DIRECTORY_SEPARATOR . $path;
+            $file = $repository.DIRECTORY_SEPARATOR.$path;
             if (file_exists($file)) {
                 return new PHPTAL_FileSource($file);
             }

classes/PHPTAL/ExceptionHandler.php

Spacing +2 added lines, -2 removed lines

@@ -64,11 +64,11 @@
 
         if (ini_get('display_errors')) {
             $title = get_class($e).': '.htmlspecialchars($e->getMessage());
-            $body = "<p><strong>\n".htmlspecialchars($e->getMessage()).'</strong></p>' .
+            $body = "<p><strong>\n".htmlspecialchars($e->getMessage()).'</strong></p>'.
                     '<p>In '.htmlspecialchars($line)."</p><pre>\n".htmlspecialchars($e->getTraceAsString()).'</pre>';
         } else {
             $title = "PHPTAL Exception";
-            $body = "<p>This page cannot be displayed.</p><hr/>" .
+            $body = "<p>This page cannot be displayed.</p><hr/>".
                     "<p><small>Enable <code>display_errors</code> to see detailed message.</small></p>";
         }
 

classes/PHPTAL/Context.php

Spacing +10 added lines, -10 removed lines

@@ -101,7 +101,7 @@ 
      *
      * @return void
      */
-    public function setDocType($doctype,$called_from_macro)
+    public function setDocType($doctype, $called_from_macro)
     {
         // FIXME: this is temporary workaround for problem of DOCTYPE disappearing in cloned PHPTAL object (because clone keeps _parentContext)
         if (!$this->_docType) {
@@ -246,7 +246,7 @@ 
      */
     public function pushSlots()
     {
-        $this->_slotsStack[] =  $this->_slots;
+        $this->_slotsStack[] = $this->_slots;
         $this->_slots = array();
     }
 
@@ -320,7 +320,7 @@ 
         } else $pathinfo = '';
 
         if (!empty($basename)) {
-            $basename = "'" . $basename . "' ";
+            $basename = "'".$basename."' ";
         }
 
         if (is_array($base)) {
@@ -350,7 +350,7 @@ 
      * @access private
      * @return mixed
      */
-    public static function path($base, $path, $nothrow=false)
+    public static function path($base, $path, $nothrow = false)
     {
         if ($base === null) {
             if ($nothrow) return null;
@@ -414,7 +414,7 @@ 
                         $base = $base->__call($current, array());
                         continue;
                     }
-                    catch(BadMethodCallException $e) {}
+                    catch (BadMethodCallException $e) {}
                 }
 
                 if (is_callable($base)) {
@@ -433,7 +433,7 @@ 
             // array handling
             if (is_array($base)) {
                 // key or index
-                if (array_key_exists((string)$current, $base)) {
+                if (array_key_exists((string) $current, $base)) {
                     $base = $base[$current];
                     continue;
                 }
@@ -481,7 +481,7 @@ 
  * @see PHPTAL_Context::path()
  * @deprecated
  */
-function phptal_path($base, $path, $nothrow=false)
+function phptal_path($base, $path, $nothrow = false)
 {
     return PHPTAL_Context::path($base, $path, $nothrow);
 }
@@ -496,7 +496,7 @@ 
 function phptal_isempty($var)
 {
     return $var === null || $var === false || $var === ''
-           || ((is_array($var) || $var instanceof Countable) && count($var)===0);
+           || ((is_array($var) || $var instanceof Countable) && count($var) === 0);
 }
 
 /**
@@ -535,7 +535,7 @@ 
     if (is_string($var)) {
         return $var;
     } elseif (is_bool($var)) {
-        return (int)$var;
+        return (int) $var;
     } elseif (is_array($var)) {
         return implode(', ', array_map('phptal_tostring', $var));
     } elseif ($var instanceof SimpleXMLElement) {
@@ -549,7 +549,7 @@ 
             return $xml;
         }
     }
-    return (string)phptal_unravel_closure($var);
+    return (string) phptal_unravel_closure($var);
 }
 
 /**

classes/PHPTAL/Dom/XmlnsState.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
                 $prefix_to_uri[$prefix] = $value;
             }
 
-            if ($qname == 'xmlns') {$changed=true;$current_default = $value;}
+            if ($qname == 'xmlns') {$changed = true; $current_default = $value; }
         }
 
         if ($changed) {

classes/PHPTAL/Dom/DocumentBuilder.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 abstract class PHPTAL_Dom_DocumentBuilder
 {
-    protected $_stack;   /* array<PHPTAL_Dom_Node> */
+    protected $_stack; /* array<PHPTAL_Dom_Node> */
     protected $_current; /* PHPTAL_Dom_Node */
 
     protected $file, $line;

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/Php/Attribute/PHPTAL/Cache.php

Spacing +4 added lines, -4 removed lines

@@ -59,9 +59,9 @@ 
             case 'm': $cache_len .= '*60'; /* no break */
         }
 
-        $cache_tag = '"'.addslashes( $this->phpelement->getQualifiedName() . ':' . $this->phpelement->getSourceLine()).'"';
+        $cache_tag = '"'.addslashes($this->phpelement->getQualifiedName().':'.$this->phpelement->getSourceLine()).'"';
 
-        $cache_per_expression = isset($matches[3])?trim($matches[3]):null;
+        $cache_per_expression = isset($matches[3]) ?trim($matches[3]) : null;
         if ($cache_per_expression == 'url') {
             $cache_tag .= '.$_SERVER["REQUEST_URI"]';
         } elseif ($cache_per_expression == 'nothing') {
@@ -72,11 +72,11 @@ 
              if (is_array($code)) throw new PHPTAL_ParserException("Chained expressions in per-cache directive are not supported",
                                                 $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
 
-             $cache_tag = '('.$code.')."@".' . $cache_tag;
+             $cache_tag = '('.$code.')."@".'.$cache_tag;
         }
 
         $this->cache_filename_var = $codewriter->createTempVariable();
-        $codewriter->doSetVar($this->cache_filename_var, $codewriter->str($codewriter->getCacheFilesBaseName()).'.md5('.$cache_tag.')' );
+        $codewriter->doSetVar($this->cache_filename_var, $codewriter->str($codewriter->getCacheFilesBaseName()).'.md5('.$cache_tag.')');
 
         $cond = '!file_exists('.$this->cache_filename_var.') || time() - '.$cache_len.' >= filemtime('.$this->cache_filename_var.')';
 

classes/PHPTAL/TemplateException.php

Spacing +14 added lines, -14 removed lines

@@ -32,7 +32,7 @@ 
      * @param int       $srcLine
      * @param Throwable $previous
      */
-    public function __construct($msg, $srcFile='', $srcLine=0, $previous = null)
+    public function __construct($msg, $srcFile = '', $srcLine = 0, $previous = null)
     {
         parent::__construct($msg, 0, $previous);
 
@@ -46,7 +46,7 @@ 
 
         if ($this->is_src_accurate) {
             $this->file = $this->srcFile;
-            $this->line = (int)$this->srcLine;
+            $this->line = (int) $this->srcLine;
         }
     }
 
@@ -73,7 +73,7 @@ 
 
         if ($this->is_src_accurate) {
             $this->file = $this->srcFile;
-            $this->line = (int)$this->srcLine;
+            $this->line = (int) $this->srcLine;
         }
     }
 
@@ -92,8 +92,8 @@ 
         $eval_path = NULL;
 
         // searches backtrace to find template file
-        foreach($this->getTrace() as $tr) {
-            if (!isset($tr['file'],$tr['line'])) continue;
+        foreach ($this->getTrace() as $tr) {
+            if (!isset($tr['file'], $tr['line'])) continue;
 
             if ($this->isTemplatePath($tr['file'])) {
                 return array($tr['file'], $tr['line']);
@@ -104,13 +104,13 @@ 
             if (false !== strpos($tr['file'], 'eval()')) {
                 $eval_line = $tr['line'];
             }
-            else if ($eval_line && isset($tr['function'],$tr['args'],$tr['args'][0]) &&
+            else if ($eval_line && isset($tr['function'], $tr['args'], $tr['args'][0]) &&
                 $this->isTemplatePath("/".$tr['function'].".php") && $tr['args'][0] instanceof PHPTAL) {
                 return array($tr['args'][0]->getCodePath(), $eval_line);
             }
         }
 
-        return array(NULL,NULL);
+        return array(NULL, NULL);
     }
 
     /**
@@ -125,7 +125,7 @@ 
         $this->srcFile = $this->file;
         $this->srcLine = $this->line;
 
-        list($file,$line) = $this->findFileAndLine();
+        list($file, $line) = $this->findFileAndLine();
 
         if (NULL === $file) {
             return false;
@@ -140,23 +140,23 @@ 
             return false;
         }
 
-        $found_line=false;
-        $found_file=false;
+        $found_line = false;
+        $found_file = false;
 
         // scan lines backwards looking for "from line" comments
         $end = min(count($lines), $line)-1;
-        for($i=$end; $i >= 0; $i--) {
+        for ($i = $end; $i >= 0; $i--) {
             if (preg_match('/tag "[^"]*" from line (\d+)/', $lines[$i], $m)) {
                 $this->srcLine = intval($m[1]);
-                $found_line=true;
+                $found_line = true;
                 break;
             }
         }
 
-        foreach(preg_grep('/Generated by PHPTAL from/',$lines) as $line) {
+        foreach (preg_grep('/Generated by PHPTAL from/', $lines) as $line) {
             if (preg_match('/Generated by PHPTAL from (.*) \(/', $line, $m)) {
                 $this->srcFile = $m[1];
-                $found_file=true;
+                $found_file = true;
                 break;
             }
         }