Browse code

Merge branch '1.x' into 2.x

* 1.x:
updated copyright year
Minor typo in class name
fixed CS

Fabien Potencier authored on 02/01/2017 20:22:25
Showing 8 changed files
... ...
@@ -1,4 +1,4 @@
1
-Copyright (c) 2009-2016 by the Twig Team.
1
+Copyright (c) 2009-2017 by the Twig Team.
2 2
 
3 3
 Some rights reserved.
4 4
 
... ...
@@ -153,7 +153,7 @@ Twig supports dynamic inheritance by using a variable as the base template:
153 153
 
154 154
     {% extends some_var %}
155 155
 
156
-If the variable evaluates to a ``Twig_Template`` or a ``Twig_TemplateWraper``
156
+If the variable evaluates to a ``Twig_Template`` or a ``Twig_TemplateWrapper``
157 157
 instance, Twig will use it as the parent template::
158 158
 
159 159
     // {% extends layout %}
... ...
@@ -3,7 +3,7 @@
3 3
 /*
4 4
  * This file is part of Twig.
5 5
  *
6
- * (c) 2016 Fabien Potencier
6
+ * (c) Fabien Potencier
7 7
  *
8 8
  * For the full copyright and license information, please view the LICENSE
9 9
  * file that was distributed with this source code.
... ...
@@ -3,7 +3,7 @@
3 3
 /*
4 4
  * This file is part of Twig.
5 5
  *
6
- * (c) 2016 Fabien Potencier
6
+ * (c) Fabien Potencier
7 7
  *
8 8
  * For the full copyright and license information, please view the LICENSE
9 9
  * file that was distributed with this source code.
... ...
@@ -3,7 +3,7 @@
3 3
 /*
4 4
  * This file is part of Twig.
5 5
  *
6
- * (c) 2016 Fabien Potencier
6
+ * (c) Fabien Potencier
7 7
  *
8 8
  * For the full copyright and license information, please view the LICENSE
9 9
  * file that was distributed with this source code.
... ...
@@ -3,7 +3,7 @@
3 3
 /*
4 4
  * This file is part of Twig.
5 5
  *
6
- * (c) 2016 Fabien Potencier
6
+ * (c) Fabien Potencier
7 7
  *
8 8
  * For the full copyright and license information, please view the LICENSE
9 9
  * file that was distributed with this source code.
... ...
@@ -3,7 +3,7 @@
3 3
 /*
4 4
  * This file is part of Twig.
5 5
  *
6
- * (c) 2016 Fabien Potencier
6
+ * (c) Fabien Potencier
7 7
  *
8 8
  * For the full copyright and license information, please view the LICENSE
9 9
  * file that was distributed with this source code.
... ...
@@ -324,7 +324,7 @@ final class CoreTestIterator implements Iterator
324 324
             return $this->array[$this->key()];
325 325
         }
326 326
 
327
-        throw new \LogicException('Code should only use the keys, not the values provided by iterator.');
327
+        throw new LogicException('Code should only use the keys, not the values provided by iterator.');
328 328
     }
329 329
 
330 330
     public function key()
... ...
@@ -336,7 +336,7 @@ final class CoreTestIterator implements Iterator
336 336
     {
337 337
         ++$this->position;
338 338
         if ($this->position === $this->maxPosition) {
339
-             throw new \LogicException(sprintf('Code should not iterate beyond %d.', $this->maxPosition));
339
+             throw new LogicException(sprintf('Code should not iterate beyond %d.', $this->maxPosition));
340 340
         }
341 341
     }
342 342