Merge branch '1.x' into 2.x

* 1.x:
  added more final classes
  add a comma to clarify the meaning

doc/functions/range.rst

@@ -36,7 +36,7 @@ decrement for negative values):
         {# outputs 3, 2, 1, 0, #}
 
 The Twig built-in ``..`` operator is just syntactic sugar for the ``range``
-function (with a step of ``1`` or ``-1`` if the start is greater than the end):
+function (with a step of ``1``, or ``-1`` if the start is greater than the end):
 
 .. code-block:: jinja
 

lib/Twig/Filter.php

@@ -12,6 +12,8 @@
 /**
  * Represents a template filter.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  *
  * @see http://twig.sensiolabs.org/doc/templates.html#filters

lib/Twig/Function.php

@@ -12,6 +12,8 @@
 /**
  * Represents a template function.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  *
  * @see http://twig.sensiolabs.org/doc/templates.html#functions

lib/Twig/SimpleFilter.php

@@ -12,6 +12,6 @@
 /**
  * Empty class for Twig 1.x compatibility.
  */
-class Twig_SimpleFilter extends Twig_Filter
+final class Twig_SimpleFilter extends Twig_Filter
 {
 }

lib/Twig/SimpleFunction.php

@@ -12,6 +12,6 @@
 /**
  * Empty class for Twig 1.x compatibility.
  */
-class Twig_SimpleFunction extends Twig_Function
+final class Twig_SimpleFunction extends Twig_Function
 {
 }

lib/Twig/SimpleTest.php

@@ -12,6 +12,6 @@
 /**
  * Empty class for Twig 1.x compatibility.
  */
-class Twig_SimpleTest extends Twig_Test
+final class Twig_SimpleTest extends Twig_Test
 {
 }

lib/Twig/Test.php

@@ -12,6 +12,8 @@
 /**
  * Represents a template test.
  *
+ * @final
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  *
  * @see http://twig.sensiolabs.org/doc/templates.html#test-operator