phptal / PHPTAL

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

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

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

tools/phptal_lint.php

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

classes/PHPTAL.php

Braces +23 added lines, -15 removed lines

@@ -379,7 +379,9 @@ 
         $enc = strtoupper($enc);
         if ($enc != $this->_encoding) {
             $this->_encoding = $enc;
-            if ($this->_translator) $this->_translator->setEncoding($enc);
+            if ($this->_translator) {
+                $this->_translator->setEncoding($enc);
+            }
 
             $this->resetPrepared();
         }
@@ -666,8 +668,7 @@ 
                 ob_start();
                 $templateFunction($this, $this->_context);
                 $res = ob_get_clean();
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 ob_end_clean();
                 throw $e;
@@ -686,8 +687,7 @@ 
             if ($this->_postfilter) {
                 return $this->_postfilter->filter($res);
             }
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             PHPTAL_ExceptionHandler::handleException($e, $this->getEncoding());
         }
@@ -717,8 +717,7 @@ 
 
             $templateFunction = $this->getFunctionName();
             $templateFunction($this, $this->_context);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             PHPTAL_ExceptionHandler::handleException($e, $this->getEncoding());
         }
@@ -835,8 +834,7 @@ 
                 ob_start();
                 try {
                     eval("?>\n".$result);
-                }
-                catch(ParseError $parseError) {
+                } catch(ParseError $parseError) {
                     ob_end_clean();
                     throw new PHPTAL_TemplateException(
                         'Parse error: ' . $parseError->getMessage(),
@@ -844,8 +842,7 @@ 
                         $parseError->getLine(),
                         $parseError
                     );
-                }
-                catch(Exception $e) {
+                } catch(Exception $e) {
                     ob_end_clean();
                     throw $e;
                 }
@@ -854,7 +851,11 @@ 
                     $msg = str_replace('eval()\'d code', $this->getCodePath(), ob_get_clean());
 
                     // greedy .* ensures last match
-                    if (preg_match('/.*on line (\d+)$/m', $msg, $m)) $line=$m[1]; else $line=0;
+                    if (preg_match('/.*on line (\d+)$/m', $msg, $m)) {
+                        $line=$m[1];
+                    } else {
+                        $line=0;
+                    }
                     throw new PHPTAL_TemplateException(trim($msg), $this->getCodePath(), $line);
                 }
                 ob_end_clean();
@@ -948,7 +949,10 @@ 
         $cacheFiles = glob($filename . '?*');
         if ($cacheFiles) {
             foreach ($cacheFiles as $file) {
-                if (substr($file, 0, strlen($filename)) !== $filename) continue; // safety net
+                if (substr($file, 0, strlen($filename)) !== $filename) {
+                    continue;
+                }
+                // safety net
                 @unlink($file);
             }
         }
@@ -965,7 +969,9 @@ 
      */
     public function getCodePath()
     {
-        if (!$this->_codeFile) $this->setCodeFile();
+        if (!$this->_codeFile) {
+            $this->setCodeFile();
+        }
         return $this->_codeFile;
     }
 
@@ -1196,7 +1202,9 @@ 
             $class = strtr($class, '\\', '_');
         }
 
-        if (substr($class, 0, 7) !== 'PHPTAL_') return;
+        if (substr($class, 0, 7) !== 'PHPTAL_') {
+            return;
+        }
 
         $path = dirname(__FILE__) . strtr("_".$class, "_", DIRECTORY_SEPARATOR) . '.php';
 

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

classes/PHPTAL/Php/TalesChainExecutor.php

Braces +6 added lines, -4 removed lines

@@ -82,10 +82,12 @@
                 $this->reader->talesChainPart($this, $exp, $lastkey === $key);
             }
 
-            if ($this->state == self::CHAIN_BREAK)
-                break;
-            if ($this->state == self::CHAIN_CONT)
-                continue;
+            if ($this->state == self::CHAIN_BREAK) {
+                            break;
+            }
+            if ($this->state == self::CHAIN_CONT) {
+                            continue;
+            }
         }
 
         $this->codewriter->doEnd('if');

classes/PHPTAL/Tokenizer.php

Braces +3 added lines, -1 removed lines

@@ -42,7 +42,9 @@
 
     function skipSpace()
     {
-        while ($this->current_token === 'SPACE') $this->nextToken();
+        while ($this->current_token === 'SPACE') {
+            $this->nextToken();
+        }
     }
 
     function nextToken()

classes/PHPTAL/Dom/SaxXmlParser.php

Braces +27 added lines, -11 removed lines

@@ -124,7 +124,9 @@ 
             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);
+                if ($c === "\n") {
+                    $builder->setSource($this->_file, ++$this->_line);
+                }
 
                 switch ($state) {
                     case self::ST_ROOT:
@@ -174,7 +176,9 @@ 
                     case self::ST_TAG_NAME:
                         if (self::isWhiteChar($c) || $c === '/' || $c === '>') {
                             $tagname = substr($src, $mark, $i-$mark);
-                            if (!$this->isValidQName($tagname)) $this->raiseError("Invalid tag name '$tagname'");
+                            if (!$this->isValidQName($tagname)) {
+                                $this->raiseError("Invalid tag name '$tagname'");
+                            }
 
                             if ($c === '/') {
                                 $state = self::ST_TAG_SINGLE;
@@ -220,7 +224,9 @@ 
                         } elseif ($state === self::ST_TAG_ATTRIBUTES && $this->isValidQName($c)) {
                             $mark = $i; // mark attribute key start
                             $state = self::ST_ATTR_KEY;
-                        } else $this->raiseError("Unexpected character '$c' between attributes of < $tagname >");
+                        } else {
+                            $this->raiseError("Unexpected character '$c' between attributes of < $tagname >");
+                        }
                         break;
 
                     case self::ST_COMMENT:
@@ -287,8 +293,11 @@ 
                                 $this->raiseError("Attribute $attribute in < $tagname > is defined more than once");
                             }
 
-                            if ($c === '=') $state = self::ST_ATTR_VALUE;
-                            else /* white char */ $state = self::ST_ATTR_EQ;
+                            if ($c === '=') {
+                                $state = self::ST_ATTR_VALUE;
+                            } else {
+                                /* white char */ $state = self::ST_ATTR_EQ;
+                            }
                         } elseif ($c === '/' || $c==='>') {
                             $attribute = substr($src, $mark, $i-$mark);
                             if (!$this->isValidQName($attribute)) {
@@ -330,11 +339,15 @@ 
                 }
             }
 
-            if ($state === self::ST_TEXT) // allows text past root node, which is in violation of XML spec
+            if ($state === self::ST_TEXT) {
+                // allows text past root node, which is in violation of XML spec
             {
                 if ($i > $mark) {
                     $text = substr($src, $mark, $i-$mark);
-                    if (!ctype_space($text)) $this->raiseError("Characters found after end of the root element (wrap document in < tal:block > to avoid this error)");
+            }
+                    if (!ctype_space($text)) {
+                        $this->raiseError("Characters found after end of the root element (wrap document in < tal:block > to avoid this error)");
+                    }
                 }
             } else {
                 if ($state === self::ST_ROOT) {
@@ -346,8 +359,7 @@ 
             }
 
             $builder->onDocumentEnd();
-        }
-        catch(PHPTAL_TemplateException $e)
+        } catch(PHPTAL_TemplateException $e)
         {
             $e->hintSrcPosition($this->_file, $this->_line);
             throw $e;
@@ -363,7 +375,9 @@ 
 
     private function checkEncoding($str)
     {
-        if ($str === '') return '';
+        if ($str === '') {
+            return '';
+        }
 
         if ($this->input_encoding === 'UTF-8') {
 
@@ -445,7 +459,9 @@ 
         */
         $str = preg_replace_callback('/<\?(php|=)(.*?)\?>/', static function ($m) {
             list(, $type, $code) = $m;
-            if ($type === '=') $code = 'echo '.$code;
+            if ($type === '=') {
+                $code = 'echo '.$code;
+            }
             return '${structure phptal-internal-php-block:'.rawurlencode($code).'}';
         }, $str);