Skip to content
This repository
Browse code

Fixed typos

  • Loading branch information...
commit 49488b8f2477f444bd0aedd20bc07e5b9aa8d86a 1 parent b6c2171
Pascal Borreli pborreli authored
2  CHANGELOG
@@ -386,7 +386,7 @@ Changes:
386 386 * enhanced error messages when an unexpected token is parsed in an expression
387 387 * fixed filename not being added to syntax error messages
388 388 * added the autoescape option to enable/disable autoescaping
389   - * removed the newline after a comment (mimicks PHP behavior)
  389 + * removed the newline after a comment (mimics PHP behavior)
390 390 * added a syntax error exception when parent block is used on a template that does not extend another one
391 391 * made the Escaper extension enabled by default
392 392 * fixed sandbox extension when used with auto output escaping
2  lib/Twig/TokenParser/Do.php
@@ -10,7 +10,7 @@
10 10 */
11 11
12 12 /**
13   - * Evaluates an expression, disgarding the returned value.
  13 + * Evaluates an expression, discarding the returned value.
14 14 */
15 15 class Twig_TokenParser_Do extends Twig_TokenParser
16 16 {
2  lib/Twig/TokenParser/Set.php
@@ -49,7 +49,7 @@ public function parse(Twig_Token $token)
49 49 $stream->expect(Twig_Token::BLOCK_END_TYPE);
50 50
51 51 if (count($names) !== count($values)) {
52   - throw new Twig_Error_Syntax("When using set, you must have the same number of variables and assignements.", $stream->getCurrent()->getLine(), $stream->getFilename());
  52 + throw new Twig_Error_Syntax("When using set, you must have the same number of variables and assignments.", $stream->getCurrent()->getLine(), $stream->getFilename());
53 53 }
54 54 } else {
55 55 $capture = true;
4 test/Twig/Tests/Fixtures/tags/autoescape/literal.test
@@ -9,7 +9,7 @@
9 9 2. Conditional expression with only literals
10 10 {{ true ? "<br />" : "<br>" }}
11 11
12   -3. Conditonal expression with a variable
  12 +3. Conditional expression with a variable
13 13 {{ true ? "<br />" : someVar }}
14 14
15 15 4. Nested conditionals with only literals
@@ -32,7 +32,7 @@ return array()
32 32 2. Conditional expression with only literals
33 33 <br />
34 34
35   -3. Conditonal expression with a variable
  35 +3. Conditional expression with a variable
36 36 &lt;br /&gt;
37 37
38 38 4. Nested conditionals with only literals
2  test/Twig/Tests/ParserTest.php
@@ -23,7 +23,7 @@ public function testSetMacroThrowsExceptionOnReservedMethods()
23 23 * @expectedException Twig_Error_Syntax
24 24 * @expectedExceptionMessage Unknown tag name "foo". Did you mean "for" at line 1
25 25 */
26   - public function testUnkownTag()
  26 + public function testUnknownTag()
27 27 {
28 28 $stream = new Twig_TokenStream(array(
29 29 new Twig_Token(Twig_Token::BLOCK_START_TYPE, '', 1),
2  test/Twig/Tests/TemplateTest.php
@@ -67,7 +67,7 @@ public function getAttributeExceptions()
67 67 public function testGetAttributeWithSandbox($object, $item, $allowed, $useExt)
68 68 {
69 69 $twig = new Twig_Environment();
70   - $policy = new Twig_Sandbox_SecurityPolicy(array(), array(), array(/*methid*/), array(/*peop*/), array());
  70 + $policy = new Twig_Sandbox_SecurityPolicy(array(), array(), array(/*method*/), array(/*prop*/), array());
71 71 $twig->addExtension(new Twig_Extension_Sandbox($policy, !$allowed));
72 72 $template = new Twig_TemplateTest($twig, $useExt);
73 73
6 test/Twig/Tests/escapingTest.php
@@ -29,7 +29,7 @@ class Twig_Test_EscapingTest extends PHPUnit_Framework_TestCase
29 29 '.' => '.',
30 30 '-' => '-',
31 31 '_' => '_',
32   - /* Basic alnums exluded */
  32 + /* Basic alnums excluded */
33 33 'a' => 'a',
34 34 'A' => 'A',
35 35 'z' => 'z',
@@ -63,7 +63,7 @@ class Twig_Test_EscapingTest extends PHPUnit_Framework_TestCase
63 63 ',' => ',',
64 64 '.' => '.',
65 65 '_' => '_',
66   - /* Basic alnums exluded */
  66 + /* Basic alnums excluded */
67 67 'a' => 'a',
68 68 'A' => 'A',
69 69 'z' => 'z',
@@ -127,7 +127,7 @@ class Twig_Test_EscapingTest extends PHPUnit_Framework_TestCase
127 127 ',' => '\\2C ',
128 128 '.' => '\\2E ',
129 129 '_' => '\\5F ',
130   - /* Basic alnums exluded */
  130 + /* Basic alnums excluded */
131 131 'a' => 'a',
132 132 'A' => 'A',
133 133 'z' => 'z',

0 comments on commit 49488b8

Please sign in to comment.
Something went wrong with that request. Please try again.