phptal / PHPTAL

classes/PHPTAL/PreFilter/Compress.php

Spacing +27 added lines, -27 removed lines

@@ -23,13 +23,13 @@ 
      * keeps track whether last element had trailing whitespace (or didn't need it).
      * If had_space==false, next element must keep leading space.
      */
-    private $had_space=false;
+    private $had_space = false;
 
     /**
      * last text node before closing tag that may need trailing whitespace trimmed.
      * It's often last-child, but comments, multiple end tags make that trickier.
      */
-    private $most_recent_text_node=null;
+    private $most_recent_text_node = null;
 
     function filterDOM(PHPTAL_Dom_Element $root)
     {
@@ -41,7 +41,7 @@ 
         }
 
         // tal:replace makes element behave like text
-        if ($root->getAttributeNS('http://xml.zope.org/namespaces/tal','replace')) {
+        if ($root->getAttributeNS('http://xml.zope.org/namespaces/tal', 'replace')) {
             $this->most_recent_text_node = null;
             $this->had_space = false;
             return;
@@ -55,7 +55,7 @@ 
 
         // mostly block-level elements
         // if element is conditional, it may not always break the line
-        $breaks_line = $no_spaces || ($this->breaksLine($root) && !$root->getAttributeNS('http://xml.zope.org/namespaces/tal','condition'));
+        $breaks_line = $no_spaces || ($this->breaksLine($root) && !$root->getAttributeNS('http://xml.zope.org/namespaces/tal', 'condition'));
 
         // start tag newline
         if ($breaks_line) {
@@ -77,7 +77,7 @@ 
             // HTML 5 (9.1.2.5) specifies quirk that a first *single* newline in <pre> can be removed
             if (count($root->childNodes) && $root->childNodes[0] instanceof PHPTAL_Dom_Text) {
                 if (preg_match('/^\n[^\n]/', $root->childNodes[0]->getValueEscaped())) {
-                    $root->childNodes[0]->setValueEscaped(substr($root->childNodes[0]->getValueEscaped(),1));
+                    $root->childNodes[0]->setValueEscaped(substr($root->childNodes[0]->getValueEscaped(), 1));
                 }
             }
             $this->findElementToFilter($root);
@@ -101,7 +101,7 @@ 
                 // collapsed whitespace-only nodes are ignored (otherwise trimming of most_recent_text_node would be useless)
                 if ($norm !== '') {
                     $this->most_recent_text_node = $node;
-                    $this->had_space = (substr($norm,-1) == ' ');
+                    $this->had_space = (substr($norm, -1) == ' ');
                 }
             } else if ($node instanceof PHPTAL_Dom_Element) {
                 $this->filterDOM($node);
@@ -115,12 +115,12 @@ 
         }
 
         // repeated element may need trailing space.
-        if (!$breaks_line && $root->getAttributeNS('http://xml.zope.org/namespaces/tal','repeat')) {
+        if (!$breaks_line && $root->getAttributeNS('http://xml.zope.org/namespaces/tal', 'repeat')) {
             $this->most_recent_text_node = null;
         }
 
         // tal:content may replace element with something without space
-        if (!$breaks_line && $root->getAttributeNS('http://xml.zope.org/namespaces/tal','content')) {
+        if (!$breaks_line && $root->getAttributeNS('http://xml.zope.org/namespaces/tal', 'content')) {
             $this->had_space = false;
             $this->most_recent_text_node = null;
         }
@@ -136,7 +136,7 @@ 
     }
 
     private static $no_interelement_space = array(
-        'html','head','table','thead','tfoot','select','optgroup','dl','ol','ul','tr','datalist',
+        'html', 'head', 'table', 'thead', 'tfoot', 'select', 'optgroup', 'dl', 'ol', 'ul', 'tr', 'datalist',
     );
 
     private function hasNoInterelementSpace(PHPTAL_Dom_Element $element)
@@ -155,15 +155,15 @@ 
      *  li is deliberately omitted, as it's commonly used with display:inline in menus.
      */
     private static $breaks_line = array(
-        'address','article','aside','base','blockquote','body','br','dd','div','dl','dt','fieldset','figure',
-        'footer','form','h1','h2','h3','h4','h5','h6','head','header','hgroup','hr','html','legend','link',
-        'meta','nav','ol','option','p','param','pre','section','style','table','tbody','td','th','thead',
-        'title','tr','ul','details',
+        'address', 'article', 'aside', 'base', 'blockquote', 'body', 'br', 'dd', 'div', 'dl', 'dt', 'fieldset', 'figure',
+        'footer', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'header', 'hgroup', 'hr', 'html', 'legend', 'link',
+        'meta', 'nav', 'ol', 'option', 'p', 'param', 'pre', 'section', 'style', 'table', 'tbody', 'td', 'th', 'thead',
+        'title', 'tr', 'ul', 'details',
     );
 
     private function breaksLine(PHPTAL_Dom_Element $element)
     {
-        if ($element->getAttributeNS('http://xml.zope.org/namespaces/metal','define-macro')) {
+        if ($element->getAttributeNS('http://xml.zope.org/namespaces/metal', 'define-macro')) {
             return true;
         }
 
@@ -183,7 +183,7 @@ 
      *  replaced elements need to preserve spaces before and after
      */
     private static $inline_blocks = array(
-        'select','input','button','img','textarea','output','progress','meter',
+        'select', 'input', 'button', 'img', 'textarea', 'output', 'progress', 'meter',
     );
 
     private function isInlineBlock(PHPTAL_Dom_Element $element)
@@ -219,7 +219,7 @@ 
 	 * pre-defined order of attributes roughly by popularity
 	 */
 	private static $attributes_order = array(
-        'href','src','class','rel','type','title','width','height','alt','content','name','style','lang','id',
+        'href', 'src', 'class', 'rel', 'type', 'title', 'width', 'height', 'alt', 'content', 'name', 'style', 'lang', 'id',
     );
 
 	/**
@@ -232,7 +232,7 @@ 
 		$b_index = array_search($b, self::$attributes_order);
 
 		if ($a_index !== false && $b_index !== false) {
-			return $a_index - $b_index;
+			return $a_index-$b_index;
 		}
 		if ($a_index === false && $b_index === false) {
 			return strcmp($a, $b);
@@ -256,26 +256,26 @@ 
 
         // <meta charset>
 	    if ('meta' === $element->getLocalName() &&
-	        $element->getAttributeNS('','http-equiv') === 'Content-Type') {
-	            $element->removeAttributeNS('','http-equiv');
-	            $element->removeAttributeNS('','content');
-	            $element->setAttributeNS('','charset',strtolower($this->getPHPTAL()->getEncoding()));
+	        $element->getAttributeNS('', 'http-equiv') === 'Content-Type') {
+	            $element->removeAttributeNS('', 'http-equiv');
+	            $element->removeAttributeNS('', 'content');
+	            $element->setAttributeNS('', 'charset', strtolower($this->getPHPTAL()->getEncoding()));
         }
-        elseif (('link' === $element->getLocalName() && $element->getAttributeNS('','rel') === 'stylesheet') ||
+        elseif (('link' === $element->getLocalName() && $element->getAttributeNS('', 'rel') === 'stylesheet') ||
             ('style' === $element->getLocalName())) {
             // There's only one type of stylesheets that works.
-            $element->removeAttributeNS('','type');
+            $element->removeAttributeNS('', 'type');
 
         } elseif ('script' === $element->getLocalName()) {
-            $element->removeAttributeNS('','language');
+            $element->removeAttributeNS('', 'language');
 
             // Only remove type that matches default. E4X, vbscript, coffeescript, etc. must be preserved
-            $type = $element->getAttributeNS('','type');
+            $type = $element->getAttributeNS('', 'type');
             $is_std = preg_match('/^(?:text|application)\/(?:ecma|java)script(\s*;\s*charset\s*=\s*[^;]*)?$/', $type);
 
             // Remote scripts should have type specified in HTTP headers.
-            if ($is_std || $element->getAttributeNS('','src')) {
-                $element->removeAttributeNS('','type');
+            if ($is_std || $element->getAttributeNS('', 'src')) {
+                $element->removeAttributeNS('', 'type');
             }
         }
     }

classes/PHPTAL/Tales.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
  * @see PHPTAL_Php_TalesInternal::compileToPHPExpressions()
  * @return string
  */
-function phptal_tale($expression, $nothrow=false)
+function phptal_tale($expression, $nothrow = false)
 {
     return PHPTAL_Php_TalesInternal::compileToPHPExpression($expression, $nothrow);
 }
@@ -51,7 +51,7 @@ 
  * @param bool $nothrow if true, invalid expression will return NULL (at run time) rather than throwing exception
  * @return string or array
  */
-function phptal_tales($expression, $nothrow=false)
+function phptal_tales($expression, $nothrow = false)
 {
     return PHPTAL_Php_TalesInternal::compileToPHPExpressions($expression, $nothrow);
 }

classes/PHPTAL/TranslationService.php

Spacing +1 added lines, -1 removed lines

@@ -58,5 +58,5 @@
      * @param string $key - translation key, e.g. "hello ${username}!"
      * @param string $htmlescape - if true, you should HTML-escape translated string. You should never HTML-escape interpolated variables.
      */
-    function translate($key, $htmlescape=true);
+    function translate($key, $htmlescape = true);
 }

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

classes/PHPTAL/Dom/Element.php

Spacing +8 added lines, -8 removed lines

@@ -183,7 +183,7 @@ 
 
             $this->generateSurroundFoot($codewriter);
         }
-        catch(PHPTAL_TemplateException $e) {
+        catch (PHPTAL_TemplateException $e) {
             $e->hintSrcPosition($this->getSourceFile(), $this->getSourceLine());
             throw $e;
         }
@@ -212,7 +212,7 @@ 
     /** 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;
     }
 
@@ -241,7 +241,7 @@ 
 
     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;
     }
 
@@ -348,15 +348,15 @@ 
         }
     }
 
-    public function generateContent(PHPTAL_Php_CodeWriter $codewriter = null, $realContent=false)
+    public function generateContent(PHPTAL_Php_CodeWriter $codewriter = null, $realContent = false)
     {
         if (!$this->isEmptyNode($codewriter->getOutputMode())) {
             if ($realContent || !count($this->contentAttributes)) {
-                foreach($this->childNodes as $child) {
+                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);
             }
@@ -434,7 +434,7 @@ 
     private function isEmptyNode($mode)
     {
         return (($mode === PHPTAL::XHTML || $mode === PHPTAL::HTML5) && PHPTAL_Dom_Defs::getInstance()->isEmptyTagNS($this->getNamespaceURI(), $this->getLocalName())) ||
-               ( $mode === PHPTAL::XML   && !$this->hasContent());
+               ($mode === PHPTAL::XML && !$this->hasContent());
     }
 
     private function hasContent()
@@ -468,7 +468,7 @@ 
                 throw new PHPTAL_TemplateException(sprintf("Attribute conflict in < %s > '%s' cannot appear with '%s'",
                                $this->qualifiedName,
                                $key,
-                               $temp[$nsattr->getPriority()][0]->getNamespace()->getPrefix() . ':' . $temp[$nsattr->getPriority()][0]->getLocalName()
+                               $temp[$nsattr->getPriority()][0]->getNamespace()->getPrefix().':'.$temp[$nsattr->getPriority()][0]->getLocalName()
                                ), $this->getSourceFile(), $this->getSourceLine());
             }
             $temp[$nsattr->getPriority()] = array($nsattr, $domattr);

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