diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #22994 Harden the debugging of Twig filters and functions (stof)

Browse Source 
This PR was merged into the 2.7 branch.

Discussion
----------

Harden the debugging of Twig filters and functions

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Removing the environment and context arguments is now based on Twig metadata rather than on some wild guessing which might go wrong:

- the environment argument may not be typehinted
- the context argument may not be named `$context`
- an argument may be named `$context` without being the special context argument

Commits
-------

63a8aff2c8 Harden the debugging of Twig filters and functions
This commit is contained in:
Fabien Potencier 2017-05-31 10:23:50 -07:00
commit e33cdc2336
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Symfony/Bridge/Twig/Command/DebugCommand.php
View File

@ -159,14 +159,20 @@ EOF
throw new \UnexpectedValueException('Unsupported callback type');
}
// filter out context/environment args
$args = array_filter($refl->getParameters(), function ($param) use ($entity) {
if ($entity->needsContext() && $param->getName() === 'context') {
return false;
}
$args = $refl->getParameters();
return !$param->getClass() || $param->getClass()->getName() !== 'Twig_Environment';
});
// filter out context/environment args
if ($entity->needsEnvironment()) {
array_shift($args);
}
if ($entity->needsContext()) {
array_shift($args);
}
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 @@ EOF
return $param->getName();
}, $args);
if ($type === 'filters') {
// remove the value the filter is applied on
array_shift($args);
}
return $args;
}
}