phptal / PHPTAL

classes/PHPTAL/Dom/Element.php

Braces +55 added lines, -28 removed lines

@@ -94,7 +94,9 @@ 
         $value = '';
         foreach ($this->childNodes as $node) {
             // leave it alone if there is CDATA, comment, or anything else.
-            if (!$node instanceof PHPTAL_Dom_Text) return;
+            if (!$node instanceof PHPTAL_Dom_Text) {
+                return;
+            }
 
             $value .= $node->getValue();
             $valueEscaped .= $node->getValueEscaped();
@@ -118,7 +120,9 @@ 
 
     public function appendChild(PHPTAL_Dom_Node $child)
     {
-        if ($child->parentNode) $child->parentNode->removeChild($child);
+        if ($child->parentNode) {
+            $child->parentNode->removeChild($child);
+        }
         $child->parentNode = $this;
         $this->childNodes[] = $child;
     }
@@ -141,7 +145,9 @@ 
             if ($node === $oldElement) {
                 $oldElement->parentNode = NULL;
 
-                if ($newElement->parentNode) $newElement->parentNode->removeChild($child);
+                if ($newElement->parentNode) {
+                    $newElement->parentNode->removeChild($child);
+                }
                 $newElement->parentNode = $this;
 
                 $this->childNodes[$k] = $newElement;
@@ -182,8 +188,7 @@ 
             }
 
             $this->generateSurroundFoot($codewriter);
-        }
-        catch(PHPTAL_TemplateException $e) {
+        } catch(PHPTAL_TemplateException $e) {
             $e->hintSrcPosition($this->getSourceFile(), $this->getSourceLine());
             throw $e;
         }
@@ -212,7 +217,9 @@ 
     /** Returns true if the element contains specified PHPTAL attribute. */
     public function hasAttribute($qname)
     {
-        foreach($this->attribute_nodes as $attr) if ($attr->getQualifiedName() == $qname) return true;
+        foreach($this->attribute_nodes as $attr) {
+            if ($attr->getQualifiedName() == $qname) return true;
+        }
         return false;
     }
 
@@ -224,7 +231,9 @@ 
     public function getAttributeNodeNS($ns_uri, $localname)
     {
         foreach ($this->attribute_nodes as $attr) {
-            if ($attr->getNamespaceURI() === $ns_uri && $attr->getLocalName() === $localname) return $attr;
+            if ($attr->getNamespaceURI() === $ns_uri && $attr->getLocalName() === $localname) {
+                return $attr;
+            }
         }
         return null;
     }
@@ -241,7 +250,9 @@ 
 
     public function getAttributeNode($qname)
     {
-        foreach($this->attribute_nodes as $attr) if ($attr->getQualifiedName() === $qname) return $attr;
+        foreach($this->attribute_nodes as $attr) {
+            if ($attr->getQualifiedName() === $qname) return $attr;
+        }
         return null;
     }
 
@@ -252,7 +263,9 @@ 
      */
     public function getOrCreateAttributeNode($qname)
     {
-        if ($attr = $this->getAttributeNode($qname)) return $attr;
+        if ($attr = $this->getAttributeNode($qname)) {
+            return $attr;
+        }
 
         $attr = new PHPTAL_Dom_Attr($qname, "", null, 'UTF-8'); // FIXME: should find namespace and encoding
         $this->attribute_nodes[] = $attr;
@@ -294,19 +307,27 @@ 
      */
     public function hasRealContent()
     {
-        if (count($this->contentAttributes) > 0) return true;
+        if (count($this->contentAttributes) > 0) {
+            return true;
+        }
 
         foreach ($this->childNodes as $node) {
-            if (!$node instanceof PHPTAL_Dom_Text || $node->getValueEscaped() !== '') return true;
+            if (!$node instanceof PHPTAL_Dom_Text || $node->getValueEscaped() !== '') {
+                return true;
+            }
         }
         return false;
     }
 
     public function hasRealAttributes()
     {
-        if ($this->hasAttributeNS('http://xml.zope.org/namespaces/tal', 'attributes')) return true;
+        if ($this->hasAttributeNS('http://xml.zope.org/namespaces/tal', 'attributes')) {
+            return true;
+        }
         foreach ($this->attribute_nodes as $attr) {
-            if ($attr->getReplacedState() !== PHPTAL_Dom_Attr::HIDDEN) return true;
+            if ($attr->getReplacedState() !== PHPTAL_Dom_Attr::HIDDEN) {
+                return true;
+            }
         }
         return false;
     }
@@ -322,7 +343,9 @@ 
 
     public function generateHead(PHPTAL_Php_CodeWriter $codewriter)
     {
-        if ($this->headFootDisabled) return;
+        if ($this->headFootDisabled) {
+            return;
+        }
         if ($this->headPrintCondition) {
             $codewriter->doIf($this->headPrintCondition);
         }
@@ -355,9 +378,10 @@ 
                 foreach($this->childNodes as $child) {
                     $child->generateCode($codewriter);
                 }
-            }
-            else foreach($this->contentAttributes as $att) {
+            } else {
+                foreach($this->contentAttributes as $att) {
                 $att->before($codewriter);
+            }
                 $att->after($codewriter);
             }
         }
@@ -365,10 +389,12 @@ 
 
     public function generateFoot(PHPTAL_Php_CodeWriter $codewriter)
     {
-        if ($this->headFootDisabled)
-            return;
-        if ($this->isEmptyNode($codewriter->getOutputMode()))
-            return;
+        if ($this->headFootDisabled) {
+                    return;
+        }
+        if ($this->isEmptyNode($codewriter->getOutputMode())) {
+                    return;
+        }
 
         if ($this->footPrintCondition) {
             $codewriter->doIf($this->footPrintCondition);
@@ -481,15 +507,16 @@ 
             $handler = $nsattr->createAttributeHandler($this, $domattr->getValue());
             $this->talHandlers[$prio] = $handler;
 
-            if ($nsattr instanceof PHPTAL_NamespaceAttributeSurround)
-                $this->surroundAttributes[] = $handler;
-            else if ($nsattr instanceof PHPTAL_NamespaceAttributeReplace)
-                $this->replaceAttributes[] = $handler;
-            else if ($nsattr instanceof PHPTAL_NamespaceAttributeContent)
-                $this->contentAttributes[] = $handler;
-            else
-                throw new PHPTAL_ParserException("Unknown namespace attribute class ".get_class($nsattr),
+            if ($nsattr instanceof PHPTAL_NamespaceAttributeSurround) {
+                            $this->surroundAttributes[] = $handler;
+            } else if ($nsattr instanceof PHPTAL_NamespaceAttributeReplace) {
+                            $this->replaceAttributes[] = $handler;
+            } else if ($nsattr instanceof PHPTAL_NamespaceAttributeContent) {
+                            $this->contentAttributes[] = $handler;
+            } else {
+                            throw new PHPTAL_ParserException("Unknown namespace attribute class ".get_class($nsattr),
                             $this->getSourceFile(), $this->getSourceLine());
+            }
 
         }
     }

classes/PHPTAL/Dom/Defs.php

Braces +3 added lines, -1 removed lines

@@ -119,7 +119,9 @@
      */
     public function isValidAttributeNS($namespace_uri, $local_name)
     {
-        if (!$this->isHandledNamespace($namespace_uri)) return false;
+        if (!$this->isHandledNamespace($namespace_uri)) {
+            return false;
+        }
 
         $attrs = $this->namespaces_by_uri[$namespace_uri]->getAttributes();
         return isset($attrs[$local_name]);

classes/PHPTAL/Dom/XmlnsState.php

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/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') {
 
@@ -454,7 +468,9 @@ 
     private static function convertPHPBlockToTALES($m)
     {
         list(, $type, $code) = $m;
-        if ($type === '=') $code = 'echo '.$code;
+        if ($type === '=') {
+            $code = 'echo '.$code;
+        }
         return '${structure phptal-internal-php-block:'.rawurlencode($code).'}';
     }
 

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

Braces +14 added lines, -10 removed lines

@@ -116,8 +116,7 @@ 
             } else {
                 throw new PHPTAL_ConfigurationException("Executed macro in file with DOCTYPE when using echoExecute(). This is not supported yet. Remove DOCTYPE or use PHPTAL->execute().");
             }
-        }
-        else if (!$this->_docType) {
+        } else if (!$this->_docType) {
             $this->_docType = $doctype;
         }
     }
@@ -317,7 +316,9 @@ 
     {
         if ($current !== $path) {
             $pathinfo = " (in path '.../$path')";
-        } else $pathinfo = '';
+        } else {
+            $pathinfo = '';
+        }
 
         if (!empty($basename)) {
             $basename = "'" . $basename . "' ";
@@ -353,7 +354,9 @@ 
     public static function path($base, $path, $nothrow=false)
     {
         if ($base === null) {
-            if ($nothrow) return null;
+            if ($nothrow) {
+                return null;
+            }
             PHPTAL_Context::pathError($base, $path, $path, $path);
         }
 
@@ -412,8 +415,7 @@ 
                     {
                         $base = $base->__call($current, array());
                         continue;
-                    }
-                    catch(BadMethodCallException $e) {}
+                    } catch(BadMethodCallException $e) {}
                 }
 
                 if ($nothrow) {
@@ -437,8 +439,9 @@ 
                     continue;
                 }
 
-                if ($nothrow)
-                    return null;
+                if ($nothrow) {
+                                    return null;
+                }
 
                 PHPTAL_Context::pathError($base, $path, $current, $prev);
             }
@@ -460,8 +463,9 @@ 
 
             // if this point is reached, then the part cannot be resolved
 
-            if ($nothrow)
-                return null;
+            if ($nothrow) {
+                            return null;
+            }
 
             PHPTAL_Context::pathError($base, $path, $current, $prev);
         }