@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | * |
| 176 | 176 | * @param string $path Template file path. |
| 177 | 177 | */ |
| 178 | - public function __construct($path=false) |
|
| 178 | + public function __construct($path = false) |
|
| 179 | 179 | { |
| 180 | 180 | $this->_path = $path; |
| 181 | 181 | $this->_globalContext = new stdClass(); |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | * |
| 204 | 204 | * @return PHPTAL |
| 205 | 205 | */ |
| 206 | - public static function create($path=false) |
|
| 206 | + public static function create($path = false) |
|
| 207 | 207 | { |
| 208 | 208 | return new PHPTAL($path); |
| 209 | 209 | } |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | */ |
| 409 | 409 | public function setPhpCodeDestination($path) |
| 410 | 410 | { |
| 411 | - $this->_phpCodeDestination = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; |
|
| 411 | + $this->_phpCodeDestination = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; |
|
| 412 | 412 | $this->resetPrepared(); |
| 413 | 413 | return $this; |
| 414 | 414 | } |
@@ -548,7 +548,7 @@ discard block |
||
| 548 | 548 | private function getPreFiltersCacheId() |
| 549 | 549 | { |
| 550 | 550 | $cacheid = ''; |
| 551 | - foreach($this->getPreFilters() as $key => $prefilter) { |
|
| 551 | + foreach ($this->getPreFilters() as $key => $prefilter) { |
|
| 552 | 552 | if ($prefilter instanceof PHPTAL_PreFilter) { |
| 553 | 553 | $cacheid .= $key.$prefilter->getCacheId(); |
| 554 | 554 | } elseif ($prefilter instanceof PHPTAL_Filter) { |
@@ -569,7 +569,7 @@ discard block |
||
| 569 | 569 | { |
| 570 | 570 | $prefilters = $this->getPreFilters(); |
| 571 | 571 | |
| 572 | - foreach($prefilters as $prefilter) { |
|
| 572 | + foreach ($prefilters as $prefilter) { |
|
| 573 | 573 | if ($prefilter instanceof PHPTAL_PreFilter) { |
| 574 | 574 | $prefilter->setPHPTAL($this); |
| 575 | 575 | } |
@@ -675,12 +675,12 @@ discard block |
||
| 675 | 675 | |
| 676 | 676 | // unshift doctype |
| 677 | 677 | if ($this->_context->_docType) { |
| 678 | - $res = $this->_context->_docType . $res; |
|
| 678 | + $res = $this->_context->_docType.$res; |
|
| 679 | 679 | } |
| 680 | 680 | |
| 681 | 681 | // unshift xml declaration |
| 682 | 682 | if ($this->_context->_xmlDeclaration) { |
| 683 | - $res = $this->_context->_xmlDeclaration . "\n" . $res; |
|
| 683 | + $res = $this->_context->_xmlDeclaration."\n".$res; |
|
| 684 | 684 | } |
| 685 | 685 | |
| 686 | 686 | if ($this->_postfilter) { |
@@ -768,7 +768,7 @@ discard block |
||
| 768 | 768 | $this->externalMacroTemplatesCache[$file] = $tpl; |
| 769 | 769 | } |
| 770 | 770 | |
| 771 | - $fun = $tpl->getFunctionName() . '_' . strtr($macroName, "-", "_"); |
|
| 771 | + $fun = $tpl->getFunctionName().'_'.strtr($macroName, "-", "_"); |
|
| 772 | 772 | if (!function_exists($fun)) { |
| 773 | 773 | throw new PHPTAL_MacroMissingException("Macro '$macroName' is not defined in $file", $this->_source->getRealPath()); |
| 774 | 774 | } |
@@ -777,11 +777,11 @@ discard block |
||
| 777 | 777 | |
| 778 | 778 | } else { |
| 779 | 779 | // call local macro |
| 780 | - $fun = $local_tpl->getFunctionName() . '_' . strtr($path, "-", "_"); |
|
| 780 | + $fun = $local_tpl->getFunctionName().'_'.strtr($path, "-", "_"); |
|
| 781 | 781 | if (!function_exists($fun)) { |
| 782 | 782 | throw new PHPTAL_MacroMissingException("Macro '$path' is not defined", $local_tpl->_source->getRealPath()); |
| 783 | 783 | } |
| 784 | - $fun( $local_tpl, $this); |
|
| 784 | + $fun($local_tpl, $this); |
|
| 785 | 785 | } |
| 786 | 786 | } |
| 787 | 787 | |
@@ -791,7 +791,7 @@ discard block |
||
| 791 | 791 | private function setCodeFile() |
| 792 | 792 | { |
| 793 | 793 | $this->findTemplate(); |
| 794 | - $this->_codeFile = $this->getPhpCodeDestination() . $this->getFunctionName() . '.' . $this->getPhpCodeExtension(); |
|
| 794 | + $this->_codeFile = $this->getPhpCodeDestination().$this->getFunctionName().'.'.$this->getPhpCodeExtension(); |
|
| 795 | 795 | } |
| 796 | 796 | |
| 797 | 797 | protected function resetPrepared() |
@@ -819,7 +819,7 @@ discard block |
||
| 819 | 819 | |
| 820 | 820 | // i'm not sure where that belongs, but not in normal path of execution |
| 821 | 821 | // because some sites have _a lot_ of files in temp |
| 822 | - if ($this->getCachePurgeFrequency() && mt_rand()%$this->getCachePurgeFrequency() == 0) { |
|
| 822 | + if ($this->getCachePurgeFrequency() && mt_rand() % $this->getCachePurgeFrequency() == 0) { |
|
| 823 | 823 | $this->cleanUpGarbage(); |
| 824 | 824 | } |
| 825 | 825 | |
@@ -836,16 +836,16 @@ discard block |
||
| 836 | 836 | try { |
| 837 | 837 | eval("?>\n".$result); |
| 838 | 838 | } |
| 839 | - catch(ParseError $parseError) { |
|
| 839 | + catch (ParseError $parseError) { |
|
| 840 | 840 | ob_end_clean(); |
| 841 | 841 | throw new PHPTAL_TemplateException( |
| 842 | - 'Parse error: ' . $parseError->getMessage(), |
|
| 842 | + 'Parse error: '.$parseError->getMessage(), |
|
| 843 | 843 | $this->getCodePath(), |
| 844 | 844 | $parseError->getLine(), |
| 845 | 845 | $parseError |
| 846 | 846 | ); |
| 847 | 847 | } |
| 848 | - catch(Exception $e) { |
|
| 848 | + catch (Exception $e) { |
|
| 849 | 849 | ob_end_clean(); |
| 850 | 850 | throw $e; |
| 851 | 851 | } |
@@ -854,7 +854,7 @@ discard block |
||
| 854 | 854 | $msg = str_replace('eval()\'d code', $this->getCodePath(), ob_get_clean()); |
| 855 | 855 | |
| 856 | 856 | // greedy .* ensures last match |
| 857 | - if (preg_match('/.*on line (\d+)$/m', $msg, $m)) $line=$m[1]; else $line=0; |
|
| 857 | + if (preg_match('/.*on line (\d+)$/m', $msg, $m)) $line = $m[1]; else $line = 0; |
|
| 858 | 858 | throw new PHPTAL_TemplateException(trim($msg), $this->getCodePath(), $line); |
| 859 | 859 | } |
| 860 | 860 | ob_end_clean(); |
@@ -895,7 +895,7 @@ discard block |
||
| 895 | 895 | */ |
| 896 | 896 | public function setCachePurgeFrequency($n) |
| 897 | 897 | { |
| 898 | - $this->_cachePurgeFrequency = (int)$n; |
|
| 898 | + $this->_cachePurgeFrequency = (int) $n; |
|
| 899 | 899 | return $this; |
| 900 | 900 | } |
| 901 | 901 | |
@@ -915,14 +915,14 @@ discard block |
||
| 915 | 915 | */ |
| 916 | 916 | public function cleanUpGarbage() |
| 917 | 917 | { |
| 918 | - $cacheFilesExpire = time() - $this->getCacheLifetime() * 3600 * 24; |
|
| 918 | + $cacheFilesExpire = time()-$this->getCacheLifetime() * 3600 * 24; |
|
| 919 | 919 | |
| 920 | 920 | // relies on templates sorting order being related to their modification dates |
| 921 | - $upperLimit = $this->getPhpCodeDestination() . $this->getFunctionNamePrefix($cacheFilesExpire) . '_'; |
|
| 922 | - $lowerLimit = $this->getPhpCodeDestination() . $this->getFunctionNamePrefix(0); |
|
| 921 | + $upperLimit = $this->getPhpCodeDestination().$this->getFunctionNamePrefix($cacheFilesExpire).'_'; |
|
| 922 | + $lowerLimit = $this->getPhpCodeDestination().$this->getFunctionNamePrefix(0); |
|
| 923 | 923 | |
| 924 | 924 | // second * gets phptal:cache |
| 925 | - $cacheFiles = glob($this->getPhpCodeDestination() . 'tpl_????????_*.' . $this->getPhpCodeExtension() . '*'); |
|
| 925 | + $cacheFiles = glob($this->getPhpCodeDestination().'tpl_????????_*.'.$this->getPhpCodeExtension().'*'); |
|
| 926 | 926 | |
| 927 | 927 | if ($cacheFiles) { |
| 928 | 928 | foreach ($cacheFiles as $index => $file) { |
@@ -945,7 +945,7 @@ discard block |
||
| 945 | 945 | public function cleanUpCache() |
| 946 | 946 | { |
| 947 | 947 | $filename = $this->getCodePath(); |
| 948 | - $cacheFiles = glob($filename . '?*'); |
|
| 948 | + $cacheFiles = glob($filename.'?*'); |
|
| 949 | 949 | if ($cacheFiles) { |
| 950 | 950 | foreach ($cacheFiles as $file) { |
| 951 | 951 | if (substr($file, 0, strlen($filename)) !== $filename) continue; // safety net |
@@ -984,7 +984,7 @@ discard block |
||
| 984 | 984 | $basename = preg_replace('/\.[a-z]{3,5}$/', '', basename($this->_source->getRealPath())); |
| 985 | 985 | $basename = substr(trim(preg_replace('/[^a-zA-Z0-9]+/', '_', $basename), "_"), 0, 20); |
| 986 | 986 | |
| 987 | - $hash = md5(PHPTAL_VERSION . PHP_VERSION |
|
| 987 | + $hash = md5(PHPTAL_VERSION.PHP_VERSION |
|
| 988 | 988 | . $this->_source->getRealPath() |
| 989 | 989 | . $this->getEncoding() |
| 990 | 990 | . $this->getPrefiltersCacheId() |
@@ -995,10 +995,10 @@ discard block |
||
| 995 | 995 | // uses base64 rather than hex to make filename shorter. |
| 996 | 996 | // there is loss of some bits due to name constraints and case-insensivity, |
| 997 | 997 | // but that's still over 110 bits in addition to basename and timestamp. |
| 998 | - $hash = strtr(rtrim(base64_encode($hash),"="),"+/=","_A_"); |
|
| 998 | + $hash = strtr(rtrim(base64_encode($hash), "="), "+/=", "_A_"); |
|
| 999 | 999 | |
| 1000 | - $this->_functionName = $this->getFunctionNamePrefix($this->_source->getLastModifiedTime()) . |
|
| 1001 | - $basename . '__' . $hash; |
|
| 1000 | + $this->_functionName = $this->getFunctionNamePrefix($this->_source->getLastModifiedTime()). |
|
| 1001 | + $basename.'__'.$hash; |
|
| 1002 | 1002 | } |
| 1003 | 1003 | return $this->_functionName; |
| 1004 | 1004 | } |
@@ -1015,7 +1015,7 @@ discard block |
||
| 1015 | 1015 | { |
| 1016 | 1016 | // tpl_ prefix and last modified time must not be changed, |
| 1017 | 1017 | // because cache cleanup relies on that |
| 1018 | - return 'tpl_' . sprintf("%08x", $timestamp) .'_'; |
|
| 1018 | + return 'tpl_'.sprintf("%08x", $timestamp).'_'; |
|
| 1019 | 1019 | } |
| 1020 | 1020 | |
| 1021 | 1021 | /** |
@@ -1045,7 +1045,7 @@ discard block |
||
| 1045 | 1045 | */ |
| 1046 | 1046 | public function addError(Exception $error) |
| 1047 | 1047 | { |
| 1048 | - $this->_errors[] = $error; |
|
| 1048 | + $this->_errors[] = $error; |
|
| 1049 | 1049 | } |
| 1050 | 1050 | |
| 1051 | 1051 | /** |
@@ -1101,7 +1101,7 @@ discard block |
||
| 1101 | 1101 | $data = $this->_source->getData(); |
| 1102 | 1102 | |
| 1103 | 1103 | $prefilters = $this->getPreFilterInstances(); |
| 1104 | - foreach($prefilters as $prefilter) { |
|
| 1104 | + foreach ($prefilters as $prefilter) { |
|
| 1105 | 1105 | $data = $prefilter->filter($data); |
| 1106 | 1106 | } |
| 1107 | 1107 | |
@@ -1111,7 +1111,7 @@ discard block |
||
| 1111 | 1111 | $builder = new PHPTAL_Dom_PHPTALDocumentBuilder(); |
| 1112 | 1112 | $tree = $parser->parseString($builder, $data, $realpath)->getResult(); |
| 1113 | 1113 | |
| 1114 | - foreach($prefilters as $prefilter) { |
|
| 1114 | + foreach ($prefilters as $prefilter) { |
|
| 1115 | 1115 | if ($prefilter instanceof PHPTAL_PreFilter) { |
| 1116 | 1116 | if ($prefilter->filterDOM($tree) !== NULL) { |
| 1117 | 1117 | throw new PHPTAL_ConfigurationException("Don't return value from filterDOM()"); |
@@ -1198,7 +1198,7 @@ discard block |
||
| 1198 | 1198 | |
| 1199 | 1199 | if (substr($class, 0, 7) !== 'PHPTAL_') return; |
| 1200 | 1200 | |
| 1201 | - $path = dirname(__FILE__) . strtr("_".$class, "_", DIRECTORY_SEPARATOR) . '.php'; |
|
| 1201 | + $path = dirname(__FILE__).strtr("_".$class, "_", DIRECTORY_SEPARATOR).'.php'; |
|
| 1202 | 1202 | |
| 1203 | 1203 | require $path; |
| 1204 | 1204 | } |
@@ -1223,9 +1223,9 @@ discard block |
||
| 1223 | 1223 | // Prepending PHPTAL's autoloader helps if there are other autoloaders |
| 1224 | 1224 | // that throw/die when file is not found. Only >5.3 though. |
| 1225 | 1225 | if (version_compare(PHP_VERSION, '5.3', '>=')) { |
| 1226 | - @spl_autoload_register(array(__CLASS__,'autoload'), false, true); |
|
| 1226 | + @spl_autoload_register(array(__CLASS__, 'autoload'), false, true); |
|
| 1227 | 1227 | } else { |
| 1228 | - spl_autoload_register(array(__CLASS__,'autoload')); |
|
| 1228 | + spl_autoload_register(array(__CLASS__, 'autoload')); |
|
| 1229 | 1229 | } |
| 1230 | 1230 | |
| 1231 | 1231 | if ($uses_autoload) { |