fixed support for Twig_Test_* classes

CHANGELOG

@@ -1,6 +1,6 @@
 * 1.21.1 (2015-XX-XX)
 
- * n/a
+ * fixed regression when using the deprecated Twig_Test_* classes
 
 * 1.21.0 (2015-08-24)
 

lib/Twig/Extension/Core.php

@@ -298,10 +298,10 @@ class Twig_Extension_Core extends Twig_Extension
     public function parseTestExpression(Twig_Parser $parser, Twig_NodeInterface $node)
     {
         $stream = $parser->getStream();
-        $test = $this->getTest($parser, $node->getLine());
+        list($name, $test) = $this->getTest($parser, $node->getLine());
 
         if ($test instanceof Twig_SimpleTest && $test->isDeprecated()) {
-            $message = sprintf('Twig Test "%s" is deprecated', $test->getName());
+            $message = sprintf('Twig Test "%s" is deprecated', $name);
             if ($test->getAlternative()) {
                 $message .= sprintf('. Use "%s" instead', $test->getAlternative());
             }
@@ -316,7 +316,7 @@ class Twig_Extension_Core extends Twig_Extension
             $arguments = $parser->getExpressionParser()->parseArguments(true);
         }
 
-        return new $class($node, $test->getName(), $arguments, $parser->getCurrentToken()->getLine());
+        return new $class($node, $name, $arguments, $parser->getCurrentToken()->getLine());
     }
 
     protected function getTest(Twig_Parser $parser, $line)
@@ -324,25 +324,24 @@ class Twig_Extension_Core extends Twig_Extension
         $stream = $parser->getStream();
         $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
         $env = $parser->getEnvironment();
-        $testMap = $env->getTests();
 
-        if (isset($testMap[$name])) {
-            return $testMap[$name];
+        if ($test = $env->getTest($name)) {
+            return array($name, $test);
         }
 
         if ($stream->test(Twig_Token::NAME_TYPE)) {
             // try 2-words tests
             $name = $name.' '.$parser->getCurrentToken()->getValue();
 
-            if (isset($testMap[$name])) {
+            if ($test = $env->getTest($name)) {
                 $parser->getStream()->next();
 
-                return $testMap[$name];
+                return array($name, $test);
             }
         }
 
         $message = sprintf('The test "%s" does not exist', $name);
-        if ($alternatives = $env->computeAlternatives($name, array_keys($testMap))) {
+        if ($alternatives = $env->computeAlternatives($name, array_keys($env->getTests()))) {
             $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
         }
 

test/Twig/Tests/LegacyFixtures/test.legacy.test

@@ -0,0 +1,8 @@
+--TEST--
+Old test classes usage
+--TEMPLATE--
+{{ 'foo' is multi word ? 'yes' : 'no' }}
+--DATA--
+return array()
+--EXPECT--
+no

test/Twig/Tests/LegacyIntegrationTest.php

@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+class Twig_Tests_LegacyIntegrationTest extends Twig_Test_IntegrationTestCase
+{
+    public function getExtensions()
+    {
+        return array(
+            new LegacyTwigTestExtension(),
+        );
+    }
+
+    public function getFixturesDir()
+    {
+        return dirname(__FILE__).'/LegacyFixtures/';
+    }
+}
+
+class LegacyTwigTestExtension extends Twig_Extension
+{
+    public function getTests()
+    {
+        return array(
+            'multi word' => new Twig_Test_Method($this, 'is_multi_word'),
+        );
+    }
+
+    public function is_multi_word($value)
+    {
+        return false !== strpos($value, ' ');
+    }
+
+    public function getName()
+    {
+        return 'legacy_integration_test';
+    }
+}