phptal / PHPTAL

classes/PHPTAL.php

Indentation +4 added lines, -4 removed lines

@@ -966,10 +966,10 @@ 
      */
     public function getFunctionName()
     {
-       // function name is used as base for caching, so it must be unique for
-       // every combination of settings that changes code in compiled template
+        // function name is used as base for caching, so it must be unique for
+        // every combination of settings that changes code in compiled template
 
-       if (!$this->_functionName) {
+        if (!$this->_functionName) {
 
             // just to make tempalte name recognizable
             $basename = preg_replace('/\.[a-z]{3,5}$/', '', basename($this->_source->getRealPath()));
@@ -989,7 +989,7 @@ 
             $hash = strtr(rtrim(base64_encode($hash),"="),"+/=","_A_");
 
             $this->_functionName = $this->getFunctionNamePrefix($this->_source->getLastModifiedTime()) .
-                                   $basename . '__' . $hash;
+                                    $basename . '__' . $hash;
         }
         return $this->_functionName;
     }

classes/PHPTAL/Php/Attribute/METAL/UseMacro.php

Indentation +8 added lines, -8 removed lines

@@ -52,14 +52,14 @@
 
         $macroname = strtr($this->expression, '-', '_');
 
-	// throw error if attempting to define and use macro at same time
-	// [should perhaps be a TemplateException? but I don't know how to set that up...]
-	if ($defineAttr = $this->phpelement->getAttributeNodeNS(
-		'http://xml.zope.org/namespaces/metal', 'define-macro')) {
-		if ($defineAttr->getValue() == $macroname) 
-            		throw new PHPTAL_TemplateException("Cannot simultaneously define and use macro '$macroname'",
-                		$this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());			
-	}
+    // throw error if attempting to define and use macro at same time
+    // [should perhaps be a TemplateException? but I don't know how to set that up...]
+    if ($defineAttr = $this->phpelement->getAttributeNodeNS(
+        'http://xml.zope.org/namespaces/metal', 'define-macro')) {
+        if ($defineAttr->getValue() == $macroname) 
+                    throw new PHPTAL_TemplateException("Cannot simultaneously define and use macro '$macroname'",
+                        $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());			
+    }
 
         // local macro (no filename specified) and non dynamic macro name
         // can be called directly if it's a known function (just generated or seen in previous compilation)

classes/PHPTAL/Php/Attribute/PHPTAL/Cache.php

Indentation +3 added lines, -3 removed lines

@@ -67,12 +67,12 @@
         } elseif ($cache_per_expression == 'nothing') {
             /* do nothing */
         } elseif ($cache_per_expression) {
-             $code = $codewriter->evaluateExpression($cache_per_expression);
+                $code = $codewriter->evaluateExpression($cache_per_expression);
 
-             if (is_array($code)) throw new PHPTAL_ParserException("Chained expressions in per-cache directive are not supported",
+                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();

classes/PHPTAL/Dom/Element.php

Indentation +4 added lines, -4 removed lines

@@ -466,10 +466,10 @@
             $nsattr = PHPTAL_Dom_Defs::getInstance()->getNamespaceAttribute($domattr->getNamespaceURI(), $domattr->getLocalName());
             if (array_key_exists($nsattr->getPriority(), $temp)) {
                 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()
-                               ), $this->getSourceFile(), $this->getSourceLine());
+                                $this->qualifiedName,
+                                $key,
+                                $temp[$nsattr->getPriority()][0]->getNamespace()->getPrefix() . ':' . $temp[$nsattr->getPriority()][0]->getLocalName()
+                                ), $this->getSourceFile(), $this->getSourceLine());
             }
             $temp[$nsattr->getPriority()] = array($nsattr, $domattr);
         }

classes/PHPTAL/Dom/SaxXmlParser.php

Indentation +26 added lines, -26 removed lines

@@ -60,23 +60,23 @@ 
 
 
     static $state_names = array(
-      self::ST_ROOT => 'root node',
-      self::ST_TEXT => 'text',
-      self::ST_LT   => 'start of tag',
-      self::ST_TAG_NAME => 'tag name',
-      self::ST_TAG_CLOSE => 'closing tag',
-      self::ST_TAG_SINGLE => 'self-closing tag',
-      self::ST_TAG_ATTRIBUTES => 'tag',
-      self::ST_TAG_BETWEEN_ATTRIBUTE => 'tag attributes',
-      self::ST_CDATA => 'CDATA',
-      self::ST_COMMENT => 'comment',
-      self::ST_DOCTYPE => 'doctype',
-      self::ST_XMLDEC => 'XML declaration',
-      self::ST_PREPROC => 'preprocessor directive',
-      self::ST_ATTR_KEY => 'attribute name',
-      self::ST_ATTR_EQ => 'attribute value',
-      self::ST_ATTR_QUOTE => 'quoted attribute value',
-      self::ST_ATTR_VALUE => 'unquoted attribute value',
+        self::ST_ROOT => 'root node',
+        self::ST_TEXT => 'text',
+        self::ST_LT   => 'start of tag',
+        self::ST_TAG_NAME => 'tag name',
+        self::ST_TAG_CLOSE => 'closing tag',
+        self::ST_TAG_SINGLE => 'self-closing tag',
+        self::ST_TAG_ATTRIBUTES => 'tag',
+        self::ST_TAG_BETWEEN_ATTRIBUTE => 'tag attributes',
+        self::ST_CDATA => 'CDATA',
+        self::ST_COMMENT => 'comment',
+        self::ST_DOCTYPE => 'doctype',
+        self::ST_XMLDEC => 'XML declaration',
+        self::ST_PREPROC => 'preprocessor directive',
+        self::ST_ATTR_KEY => 'attribute name',
+        self::ST_ATTR_EQ => 'attribute value',
+        self::ST_ATTR_QUOTE => 'quoted attribute value',
+        self::ST_ATTR_VALUE => 'unquoted attribute value',
     );
 
     private $input_encoding;
@@ -381,15 +381,15 @@ 
 
             // http://www.w3.org/International/questions/qa-forms-utf-8
             $match = '[\x09\x0A\x0D\x20-\x7F]'        // ASCII
-               . '|[\xC2-\xDF][\x80-\xBF]'            // non-overlong 2-byte
-               . '|\xE0[\xA0-\xBF][\x80-\xBF]'        // excluding overlongs
-               . '|[\xE1-\xEC\xEE\xEE][\x80-\xBF]{2}' // straight 3-byte (exclude FFFE and FFFF)
-               . '|\xEF[\x80-\xBE][\x80-\xBF]'        // straight 3-byte
-               . '|\xEF\xBF[\x80-\xBD]'               // straight 3-byte
-               . '|\xED[\x80-\x9F][\x80-\xBF]'        // excluding surrogates
-               . '|\xF0[\x90-\xBF][\x80-\xBF]{2}'     // planes 1-3
-               . '|[\xF1-\xF3][\x80-\xBF]{3}'         // planes 4-15
-               . '|\xF4[\x80-\x8F][\x80-\xBF]{2}';    // plane 16
+                . '|[\xC2-\xDF][\x80-\xBF]'            // non-overlong 2-byte
+                . '|\xE0[\xA0-\xBF][\x80-\xBF]'        // excluding overlongs
+                . '|[\xE1-\xEC\xEE\xEE][\x80-\xBF]{2}' // straight 3-byte (exclude FFFE and FFFF)
+                . '|\xEF[\x80-\xBE][\x80-\xBF]'        // straight 3-byte
+                . '|\xEF\xBF[\x80-\xBD]'               // straight 3-byte
+                . '|\xED[\x80-\x9F][\x80-\xBF]'        // excluding surrogates
+                . '|\xF0[\x90-\xBF][\x80-\xBF]{2}'     // planes 1-3
+                . '|[\xF1-\xF3][\x80-\xBF]{3}'         // planes 4-15
+                . '|\xF4[\x80-\x8F][\x80-\xBF]{2}';    // plane 16
 
             if (!preg_match('/^(?:(?>'.$match.'))+$/s',$str)) {
                 $res = preg_split('/((?>'.$match.')+)/s',$str,null,PREG_SPLIT_DELIM_CAPTURE);

classes/PHPTAL/Php/State.php

Indentation +2 added lines, -2 removed lines

@@ -153,7 +153,7 @@ 
     public function interpolateTalesVarsInHTML($src)
     {
         return preg_replace_callback('/((?:\$\$)*)\$\{(structure |text )?(.*?)\}|((?:\$\$)+)\{/isS',
-                                     array($this,'_interpolateTalesVarsInHTMLCallback'), $src);
+                                        array($this,'_interpolateTalesVarsInHTMLCallback'), $src);
     }
 
     /**
@@ -172,7 +172,7 @@ 
     public function interpolateTalesVarsInCDATA($src)
     {
         return preg_replace_callback('/((?:\$\$)*)\$\{(structure |text )?(.*?)\}|((?:\$\$)+)\{/isS',
-                                     array($this,'_interpolateTalesVarsInCDATACallback'), $src);
+                                        array($this,'_interpolateTalesVarsInCDATACallback'), $src);
     }
 
     /**

classes/PHPTAL/PreFilter/Compress.php

Indentation +38 added lines, -38 removed lines

@@ -172,8 +172,8 @@ 
         }
 
         if ($element->getNamespaceURI() !== 'http://www.w3.org/1999/xhtml'
-	        && $element->getNamespaceURI() !== '') {
-	        return false;
+            && $element->getNamespaceURI() !== '') {
+            return false;
         }
 
         return in_array($element->getLocalName(), self::$breaks_line);
@@ -189,8 +189,8 @@ 
     private function isInlineBlock(PHPTAL_Dom_Element $element)
     {
         if ($element->getNamespaceURI() !== 'http://www.w3.org/1999/xhtml'
-	        && $element->getNamespaceURI() !== '') {
-	        return false;
+            && $element->getNamespaceURI() !== '') {
+            return false;
         }
 
         return in_array($element->getLocalName(), self::$inline_blocks);
@@ -209,45 +209,45 @@ 
             $attrs_by_qname[$attrnode->getQualifiedName()] = $attrnode;
         }
 
-	if (count($attrs_by_qname) > 1) {
-		uksort($attrs_by_qname, array($this, 'compareQNames'));
-		$element->setAttributeNodes(array_values($attrs_by_qname));
-	}
+    if (count($attrs_by_qname) > 1) {
+        uksort($attrs_by_qname, array($this, 'compareQNames'));
+        $element->setAttributeNodes(array_values($attrs_by_qname));
+    }
     }
 
     /**
-	 * pre-defined order of attributes roughly by popularity
-	 */
-	private static $attributes_order = array(
+     * 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',
     );
 
-	/**
-	 * compare names according to $attributes_order array.
-	 * Elements that are not in array, are considered greater than all elements in array,
-	 * and are sorted alphabetically.
-	 */
-	private static function compareQNames($a, $b) {
-		$a_index = array_search($a, self::$attributes_order);
-		$b_index = array_search($b, self::$attributes_order);
-
-		if ($a_index !== false && $b_index !== false) {
-			return $a_index - $b_index;
-		}
-		if ($a_index === false && $b_index === false) {
-			return strcmp($a, $b);
-		}
-		return ($a_index === false) ? 1 : -1;
-	}
+    /**
+     * compare names according to $attributes_order array.
+     * Elements that are not in array, are considered greater than all elements in array,
+     * and are sorted alphabetically.
+     */
+    private static function compareQNames($a, $b) {
+        $a_index = array_search($a, self::$attributes_order);
+        $b_index = array_search($b, self::$attributes_order);
+
+        if ($a_index !== false && $b_index !== false) {
+            return $a_index - $b_index;
+        }
+        if ($a_index === false && $b_index === false) {
+            return strcmp($a, $b);
+        }
+        return ($a_index === false) ? 1 : -1;
+    }
 
     /**
      * HTML5 doesn't care about boilerplate
      */
-	private function elementSpecificOptimizations(PHPTAL_Dom_Element $element)
-	{
-	    if ($element->getNamespaceURI() !== 'http://www.w3.org/1999/xhtml'
-	     && $element->getNamespaceURI() !== '') {
-	        return;
+    private function elementSpecificOptimizations(PHPTAL_Dom_Element $element)
+    {
+        if ($element->getNamespaceURI() !== 'http://www.w3.org/1999/xhtml'
+         && $element->getNamespaceURI() !== '') {
+            return;
         }
 
         if ($this->getPHPTAL()->getOutputMode() !== PHPTAL::HTML5) {
@@ -255,11 +255,11 @@ 
         }
 
         // <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()));
+        if ('meta' === $element->getLocalName() &&
+            $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') ||
             ('style' === $element->getLocalName())) {