Completed
Pull Request — master (#51)
by Ben
03:05
created
classes/PHPTAL/Php/Attribute/METAL/UseMacro.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -52,14 +52,14 @@
 block discarded – undo
52 52
 
53 53
         $macroname = strtr($this->expression, '-', '_');
54 54
 
55
-	// throw error if attempting to define and use macro at same time
56
-	// [should perhaps be a TemplateException? but I don't know how to set that up...]
57
-	if ($defineAttr = $this->phpelement->getAttributeNodeNS(
58
-		'http://xml.zope.org/namespaces/metal', 'define-macro')) {
59
-		if ($defineAttr->getValue() == $macroname) 
60
-            		throw new PHPTAL_TemplateException("Cannot simultaneously define and use macro '$macroname'",
61
-                		$this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());			
62
-	}
55
+    // throw error if attempting to define and use macro at same time
56
+    // [should perhaps be a TemplateException? but I don't know how to set that up...]
57
+    if ($defineAttr = $this->phpelement->getAttributeNodeNS(
58
+        'http://xml.zope.org/namespaces/metal', 'define-macro')) {
59
+        if ($defineAttr->getValue() == $macroname) 
60
+                    throw new PHPTAL_TemplateException("Cannot simultaneously define and use macro '$macroname'",
61
+                        $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());			
62
+    }
63 63
 
64 64
         // local macro (no filename specified) and non dynamic macro name
65 65
         // can be called directly if it's a known function (just generated or seen in previous compilation)
Please login to merge, or discard this patch.
classes/PHPTAL/Php/Attribute/PHPTAL/Cache.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -67,12 +67,12 @@
 block discarded – undo
67 67
         } elseif ($cache_per_expression == 'nothing') {
68 68
             /* do nothing */
69 69
         } elseif ($cache_per_expression) {
70
-             $code = $codewriter->evaluateExpression($cache_per_expression);
70
+                $code = $codewriter->evaluateExpression($cache_per_expression);
71 71
 
72
-             if (is_array($code)) throw new PHPTAL_ParserException("Chained expressions in per-cache directive are not supported",
72
+                if (is_array($code)) throw new PHPTAL_ParserException("Chained expressions in per-cache directive are not supported",
73 73
                                                 $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
74 74
 
75
-             $cache_tag = '('.$code.')."@".' . $cache_tag;
75
+                $cache_tag = '('.$code.')."@".' . $cache_tag;
76 76
         }
77 77
 
78 78
         $this->cache_filename_var = $codewriter->createTempVariable();
Please login to merge, or discard this patch.
classes/PHPTAL/Dom/XmlnsState.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -1,28 +1,28 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * PHPTAL templating engine
4
- *
5
- * PHP Version 5
6
- *
7
- * @category HTML
8
- * @package  PHPTAL
9
- * @author   Laurent Bedubourg <[email protected]>
10
- * @author   Kornel Lesiński <[email protected]>
11
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
- * @version  SVN: $Id$
13
- * @link     http://phptal.org/
14
- */
3
+     * PHPTAL templating engine
4
+     *
5
+     * PHP Version 5
6
+     *
7
+     * @category HTML
8
+     * @package  PHPTAL
9
+     * @author   Laurent Bedubourg <[email protected]>
10
+     * @author   Kornel Lesiński <[email protected]>
11
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
+     * @version  SVN: $Id$
13
+     * @link     http://phptal.org/
14
+     */
15 15
 /**
16
- * Stores XMLNS aliases fluctuation in the xml flow.
17
- *
18
- * This class is used to bind a PHPTAL namespace to an alias, for example using
19
- * xmlns:t="http://xml.zope.org/namespaces/tal" and later use t:repeat instead
20
- * of tal:repeat.
21
- *
22
- * @package PHPTAL
23
- * @subpackage Dom
24
- * @author Laurent Bedubourg <[email protected]>
25
- */
16
+     * Stores XMLNS aliases fluctuation in the xml flow.
17
+     *
18
+     * This class is used to bind a PHPTAL namespace to an alias, for example using
19
+     * xmlns:t="http://xml.zope.org/namespaces/tal" and later use t:repeat instead
20
+     * of tal:repeat.
21
+     *
22
+     * @package PHPTAL
23
+     * @subpackage Dom
24
+     * @author Laurent Bedubourg <[email protected]>
25
+     */
26 26
 class PHPTAL_Dom_XmlnsState
27 27
 {
28 28
     /** Create a new XMLNS state inheriting provided aliases. */
Please login to merge, or discard this patch.
classes/PHPTAL/Context.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * PHPTAL templating engine
4
- *
5
- * PHP Version 5
6
- *
7
- * @category HTML
8
- * @package  PHPTAL
9
- * @author   Laurent Bedubourg <[email protected]>
10
- * @author   Kornel Lesiński <[email protected]>
11
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
- * @version  SVN: $Id$
13
- * @link     http://phptal.org/
14
- */
3
+     * PHPTAL templating engine
4
+     *
5
+     * PHP Version 5
6
+     *
7
+     * @category HTML
8
+     * @package  PHPTAL
9
+     * @author   Laurent Bedubourg <[email protected]>
10
+     * @author   Kornel Lesiński <[email protected]>
11
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
+     * @version  SVN: $Id$
13
+     * @link     http://phptal.org/
14
+     */
15 15
 
16 16
 /**
17 17
  * You're probably not using PHPTAL class properly
Please login to merge, or discard this patch.
classes/PHPTAL/MacroMissingException.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * PHPTAL templating engine
4
- *
5
- * PHP Version 5
6
- *
7
- * @category HTML
8
- * @package  PHPTAL
9
- * @author   Laurent Bedubourg <[email protected]>
10
- * @author   Kornel Lesiński <[email protected]>
11
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
- * @version  SVN: $Id$
13
- * @link     http://phptal.org/
14
- */
3
+     * PHPTAL templating engine
4
+     *
5
+     * PHP Version 5
6
+     *
7
+     * @category HTML
8
+     * @package  PHPTAL
9
+     * @author   Laurent Bedubourg <[email protected]>
10
+     * @author   Kornel Lesiński <[email protected]>
11
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
+     * @version  SVN: $Id$
13
+     * @link     http://phptal.org/
14
+     */
15 15
 
16 16
 /**
17 17
  * You're probably not using PHPTAL class properly
Please login to merge, or discard this patch.
classes/PHPTAL/FileSourceResolver.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * PHPTAL templating engine
4
- *
5
- * PHP Version 5
6
- *
7
- * @category HTML
8
- * @package  PHPTAL
9
- * @author   Laurent Bedubourg <[email protected]>
10
- * @author   Kornel Lesiński <[email protected]>
11
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
- * @version  SVN: $Id$
13
- * @link     http://phptal.org/
14
- */
3
+     * PHPTAL templating engine
4
+     *
5
+     * PHP Version 5
6
+     *
7
+     * @category HTML
8
+     * @package  PHPTAL
9
+     * @author   Laurent Bedubourg <[email protected]>
10
+     * @author   Kornel Lesiński <[email protected]>
11
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
+     * @version  SVN: $Id$
13
+     * @link     http://phptal.org/
14
+     */
15 15
 
16 16
 /**
17 17
  * You're probably not using PHPTAL class properly
Please login to merge, or discard this patch.
classes/PHPTAL/Namespace/TAL.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * PHPTAL templating engine
4
- *
5
- * PHP Version 5
6
- *
7
- * @category HTML
8
- * @package  PHPTAL
9
- * @author   Laurent Bedubourg <[email protected]>
10
- * @author   Kornel Lesiński <[email protected]>
11
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
- * @version  SVN: $Id$
13
- * @link     http://phptal.org/
14
- */
3
+     * PHPTAL templating engine
4
+     *
5
+     * PHP Version 5
6
+     *
7
+     * @category HTML
8
+     * @package  PHPTAL
9
+     * @author   Laurent Bedubourg <[email protected]>
10
+     * @author   Kornel Lesiński <[email protected]>
11
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
+     * @version  SVN: $Id$
13
+     * @link     http://phptal.org/
14
+     */
15 15
 
16 16
 /**
17 17
  * You're probably not using PHPTAL class properly
Please login to merge, or discard this patch.
classes/PHPTAL/Namespace/I18N.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * PHPTAL templating engine
4
- *
5
- * PHP Version 5
6
- *
7
- * @category HTML
8
- * @package  PHPTAL
9
- * @author   Laurent Bedubourg <[email protected]>
10
- * @author   Kornel Lesiński <[email protected]>
11
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
- * @version  SVN: $Id$
13
- * @link     http://phptal.org/
14
- */
3
+     * PHPTAL templating engine
4
+     *
5
+     * PHP Version 5
6
+     *
7
+     * @category HTML
8
+     * @package  PHPTAL
9
+     * @author   Laurent Bedubourg <[email protected]>
10
+     * @author   Kornel Lesiński <[email protected]>
11
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
+     * @version  SVN: $Id$
13
+     * @link     http://phptal.org/
14
+     */
15 15
 
16 16
 /**
17 17
  * You're probably not using PHPTAL class properly
Please login to merge, or discard this patch.
classes/PHPTAL/Namespace/PHPTAL.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,17 +1,17 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * PHPTAL templating engine
4
- *
5
- * PHP Version 5
6
- *
7
- * @category HTML
8
- * @package  PHPTAL
9
- * @author   Laurent Bedubourg <[email protected]>
10
- * @author   Kornel Lesiński <[email protected]>
11
- * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
- * @version  SVN: $Id$
13
- * @link     http://phptal.org/
14
- */
3
+     * PHPTAL templating engine
4
+     *
5
+     * PHP Version 5
6
+     *
7
+     * @category HTML
8
+     * @package  PHPTAL
9
+     * @author   Laurent Bedubourg <[email protected]>
10
+     * @author   Kornel Lesiński <[email protected]>
11
+     * @license  http://www.gnu.org/licenses/lgpl.html GNU Lesser General Public License
12
+     * @version  SVN: $Id$
13
+     * @link     http://phptal.org/
14
+     */
15 15
 
16 16
 /**
17 17
  * You're probably not using PHPTAL class properly
Please login to merge, or discard this patch.