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/TemplateException.php

Spacing +14 added lines, -14 removed lines

@@ -26,7 +26,7 @@ 
     public $srcLine;
     private $is_src_accurate;
 
-    public function __construct($msg, $srcFile='', $srcLine=0)
+    public function __construct($msg, $srcFile = '', $srcLine = 0)
     {
         parent::__construct($msg);
 
@@ -40,7 +40,7 @@ 
 
         if ($this->is_src_accurate) {
             $this->file = $this->srcFile;
-            $this->line = (int)$this->srcLine;
+            $this->line = (int) $this->srcLine;
         }
     }
 
@@ -67,7 +67,7 @@ 
 
         if ($this->is_src_accurate) {
             $this->file = $this->srcFile;
-            $this->line = (int)$this->srcLine;
+            $this->line = (int) $this->srcLine;
         }
     }
 
@@ -86,8 +86,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']);
@@ -98,13 +98,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);
     }
 
     /**
@@ -119,7 +119,7 @@ 
         $this->srcFile = $this->file;
         $this->srcLine = $this->line;
 
-        list($file,$line) = $this->findFileAndLine();
+        list($file, $line) = $this->findFileAndLine();
 
         if (NULL === $file) {
             return false;
@@ -134,23 +134,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;
             }
         }

Braces +7 added lines, -4 removed lines

@@ -46,7 +46,9 @@ 
 
     public function __toString()
     {
-        if (!$this->srcFile || $this->is_src_accurate) return parent::__toString();
+        if (!$this->srcFile || $this->is_src_accurate) {
+            return parent::__toString();
+        }
         return "From {$this->srcFile} around line {$this->srcLine}\n".parent::__toString();
     }
 
@@ -87,7 +89,9 @@ 
 
         // searches backtrace to find template file
         foreach($this->getTrace() as $tr) {
-            if (!isset($tr['file'],$tr['line'])) continue;
+            if (!isset($tr['file'],$tr['line'])) {
+                continue;
+            }
 
             if ($this->isTemplatePath($tr['file'])) {
                 return array($tr['file'], $tr['line']);
@@ -97,8 +101,7 @@ 
             // However, function name matches template path and eval() is visible in backtrace.
             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);
             }

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) {

Braces +6 added lines, -2 removed lines

@@ -34,8 +34,12 @@
 
     public function prefixToNamespaceURI($prefix)
     {
-        if ($prefix === 'xmlns') return 'http://www.w3.org/2000/xmlns/';
-        if ($prefix === 'xml') return 'http://www.w3.org/XML/1998/namespace';
+        if ($prefix === 'xmlns') {
+            return 'http://www.w3.org/2000/xmlns/';
+        }
+        if ($prefix === 'xml') {
+            return 'http://www.w3.org/XML/1998/namespace';
+        }
 
         // domdefs provides fallback for all known phptal ns
         if (isset($this->prefix_to_uri[$prefix])) {

classes/PHPTAL/Dom/CDATASection.php

Braces +3 added lines, -1 removed lines

@@ -34,10 +34,12 @@
             $codewriter->pushHTML($codewriter->interpolateCDATA(str_replace('</', '<\/', $value)));
         } elseif (($mode === PHPTAL::XHTML && $inCDATAelement)  // safe for text/html
              || ($mode === PHPTAL::XML && preg_match('/[<>&]/', $value))  // non-useless in XML
-             || ($mode !== PHPTAL::HTML5 && preg_match('/<\?|\${structure/', $value)))  // hacks with structure (in X[HT]ML) may need it
+             || ($mode !== PHPTAL::HTML5 && preg_match('/<\?|\${structure/', $value))) {
+            // hacks with structure (in X[HT]ML) may need it
         {
             // in text/html "</" is dangerous and the only sensible way to escape is ECMAScript string escapes.
             if ($mode === PHPTAL::XHTML) $value = str_replace('</', '<\/', $value);
+        }
 
             $codewriter->pushHTML($codewriter->interpolateCDATA('<![CDATA['.$value.']]>'));
         } else {

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

Braces +3 added lines, -1 removed lines

@@ -53,7 +53,9 @@
     {
         if (count($this->_stack) > 0) {
             $left='</'.$this->_current->getQualifiedName().'>';
-            for ($i = count($this->_stack)-1; $i>0; $i--) $left .= '</'.$this->_stack[$i]->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);
         }

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) {

Braces +12 added lines, -4 removed lines

@@ -34,7 +34,9 @@ 
 
     public function __construct()
     {
-        if (!function_exists('gettext')) throw new PHPTAL_ConfigurationException("Gettext not installed");
+        if (!function_exists('gettext')) {
+            throw new PHPTAL_ConfigurationException("Gettext not installed");
+        }
         $this->useDomain("messages"); // PHP bug #21965
     }
 
@@ -75,11 +77,15 @@ 
         $langs = func_get_args();
 
         $langCode = $this->trySettingLanguages(LC_ALL, $langs);
-        if ($langCode) return $langCode;
+        if ($langCode) {
+            return $langCode;
+        }
 
         if (defined("LC_MESSAGES")) {
             $langCode = $this->trySettingLanguages(LC_MESSAGES, $langs);
-            if ($langCode) return $langCode;
+            if ($langCode) {
+                return $langCode;
+            }
         }
 
         throw new PHPTAL_ConfigurationException('Language(s) code(s) "'.implode(', ', $langs).'" not supported by your system');
@@ -142,7 +148,9 @@ 
      */
     public function translate($key, $htmlencode=true)
     {
-        if ($this->_canonicalize) $key = self::_canonicalizeKey($key);
+        if ($this->_canonicalize) {
+            $key = self::_canonicalizeKey($key);
+        }
 
         $value = gettext($key);