Harden the debugging of Twig filters and functions

stof · stof · commit 63a8aff2c887 · 2017-05-31T17:20:46.000+02:00
Removing the environment and context arguments is now based on Twig metadata
rather than on some wild guessing which might go wrong.
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -159,14 +159,20 @@ private function getMetadata($type, $entity)
                 throw new \UnexpectedValueException('Unsupported callback type');
             }
 
+            $args = $refl->getParameters();
+
             // filter out context/environment args
-            $args = array_filter($refl->getParameters(), function ($param) use ($entity) {
-                if ($entity->needsContext() && $param->getName() === 'context') {
-                    return false;
-                }
+            if ($entity->needsEnvironment()) {
+                array_shift($args);
+            }
+            if ($entity->needsContext()) {
+                array_shift($args);
+            }
 
-                return !$param->getClass() || $param->getClass()->getName() !== 'Twig_Environment';
-            });
+            if ($type === 'filters') {
+                // remove the value the filter is applied on
+                array_shift($args);
+            }
 
             // format args
             $args = array_map(function ($param) {
@@ -177,11 +183,6 @@ private function getMetadata($type, $entity)
                 return $param->getName();
             }, $args);
 
-            if ($type === 'filters') {
-                // remove the value the filter is applied on
-                array_shift($args);
-            }
-
             return $args;
         }
     }
