geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-08-28 11:06:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed remaining code supporting PSR-0 class names

Browse Source
This commit is contained in:
Fabien Potencier
2019-04-23 18:21:46 +02:00
parent 7fb5fb4468
commit 5b1aad86f3
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ExtensionSet.php
+1 -13
View File
@@ -69,22 +69,12 @@ final class ExtensionSet
public function hasExtension(string $class): bool
{
$class = ltrim($class, '\\');
if (!isset($this->extensions[$class]) && class_exists($class, false)) {
// For BC/FC with namespaced aliases
$class = (new \ReflectionClass($class))->name;
}
return isset($this->extensions[$class]);
return isset($this->extensions[ltrim($class, '\\')]);
}
public function getExtension(string $class): ExtensionInterface
{
$class = ltrim($class, '\\');
if (!isset($this->extensions[$class]) && class_exists($class, false)) {
// For BC/FC with namespaced aliases
$class = (new \ReflectionClass($class))->name;
}
if (!isset($this->extensions[$class])) {
throw new RuntimeError(sprintf('The "%s" extension is not enabled.', $class));
@@ -149,8 +139,6 @@ final class ExtensionSet
throw new \LogicException(sprintf('Unable to register extension "%s" as it is already registered.', $class));
}
// For BC/FC with namespaced aliases
$class = (new \ReflectionClass($class))->name;
$this->extensions[$class] = $extension;
}
src/Node/Expression/CallExpression.php
+1 -2
View File
@@ -37,8 +37,7 @@ abstract class CallExpression extends AbstractExpression
$compiler->raw(sprintf('$this->env->getRuntime(\'%s\')->%s', $callable[0], $callable[1]));
}
} elseif ($r instanceof \ReflectionMethod && $callable[0] instanceof ExtensionInterface) {
// For BC/FC with namespaced aliases
$class = (new \ReflectionClass(\get_class($callable[0])))->name;
$class = \get_class($callable[0]);
if (!$compiler->getEnvironment()->hasExtension($class)) {
// Compile a non-optimized call to trigger a \Twig\Error\RuntimeError, which cannot be a compile-time error
$compiler->raw(sprintf('$this->env->getExtension(\'%s\')', $class));