Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed typos

  • Loading branch information...
commit 49488b8f2477f444bd0aedd20bc07e5b9aa8d86a 1 parent b6c2171
@pborreli pborreli authored
View
2  CHANGELOG
@@ -386,7 +386,7 @@ Changes:
* enhanced error messages when an unexpected token is parsed in an expression
* fixed filename not being added to syntax error messages
* added the autoescape option to enable/disable autoescaping
- * removed the newline after a comment (mimicks PHP behavior)
+ * removed the newline after a comment (mimics PHP behavior)
* added a syntax error exception when parent block is used on a template that does not extend another one
* made the Escaper extension enabled by default
* fixed sandbox extension when used with auto output escaping
View
2  lib/Twig/TokenParser/Do.php
@@ -10,7 +10,7 @@
*/
/**
- * Evaluates an expression, disgarding the returned value.
+ * Evaluates an expression, discarding the returned value.
*/
class Twig_TokenParser_Do extends Twig_TokenParser
{
View
2  lib/Twig/TokenParser/Set.php
@@ -49,7 +49,7 @@ public function parse(Twig_Token $token)
$stream->expect(Twig_Token::BLOCK_END_TYPE);
if (count($names) !== count($values)) {
- throw new Twig_Error_Syntax("When using set, you must have the same number of variables and assignements.", $stream->getCurrent()->getLine(), $stream->getFilename());
+ throw new Twig_Error_Syntax("When using set, you must have the same number of variables and assignments.", $stream->getCurrent()->getLine(), $stream->getFilename());
}
} else {
$capture = true;
View
4 test/Twig/Tests/Fixtures/tags/autoescape/literal.test
@@ -9,7 +9,7 @@
2. Conditional expression with only literals
{{ true ? "<br />" : "<br>" }}
-3. Conditonal expression with a variable
+3. Conditional expression with a variable
{{ true ? "<br />" : someVar }}
4. Nested conditionals with only literals
@@ -32,7 +32,7 @@ return array()
2. Conditional expression with only literals
<br />
-3. Conditonal expression with a variable
+3. Conditional expression with a variable
&lt;br /&gt;
4. Nested conditionals with only literals
View
2  test/Twig/Tests/ParserTest.php
@@ -23,7 +23,7 @@ public function testSetMacroThrowsExceptionOnReservedMethods()
* @expectedException Twig_Error_Syntax
* @expectedExceptionMessage Unknown tag name "foo". Did you mean "for" at line 1
*/
- public function testUnkownTag()
+ public function testUnknownTag()
{
$stream = new Twig_TokenStream(array(
new Twig_Token(Twig_Token::BLOCK_START_TYPE, '', 1),
View
2  test/Twig/Tests/TemplateTest.php
@@ -67,7 +67,7 @@ public function getAttributeExceptions()
public function testGetAttributeWithSandbox($object, $item, $allowed, $useExt)
{
$twig = new Twig_Environment();
- $policy = new Twig_Sandbox_SecurityPolicy(array(), array(), array(/*methid*/), array(/*peop*/), array());
+ $policy = new Twig_Sandbox_SecurityPolicy(array(), array(), array(/*method*/), array(/*prop*/), array());
$twig->addExtension(new Twig_Extension_Sandbox($policy, !$allowed));
$template = new Twig_TemplateTest($twig, $useExt);
View
6 test/Twig/Tests/escapingTest.php
@@ -29,7 +29,7 @@ class Twig_Test_EscapingTest extends PHPUnit_Framework_TestCase
'.' => '.',
'-' => '-',
'_' => '_',
- /* Basic alnums exluded */
+ /* Basic alnums excluded */
'a' => 'a',
'A' => 'A',
'z' => 'z',
@@ -63,7 +63,7 @@ class Twig_Test_EscapingTest extends PHPUnit_Framework_TestCase
',' => ',',
'.' => '.',
'_' => '_',
- /* Basic alnums exluded */
+ /* Basic alnums excluded */
'a' => 'a',
'A' => 'A',
'z' => 'z',
@@ -127,7 +127,7 @@ class Twig_Test_EscapingTest extends PHPUnit_Framework_TestCase
',' => '\\2C ',
'.' => '\\2E ',
'_' => '\\5F ',
- /* Basic alnums exluded */
+ /* Basic alnums excluded */
'a' => 'a',
'A' => 'A',
'z' => 'z',
Please sign in to comment.
Something went wrong with that request. Please try again.