makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15214] Replace arrow functions with anonymous functions

Browse source 
Arrow functions aren't added until PHP 7.4, so we can't use them yet.
Anonymous functions have been added since PHP 5.3

PHPBB3-15214
This commit is contained in:
toxyy 2023-12-03 17:44:38 -05:00 • committed by rxu
parent 71fe9d60c4
commit 82a5e20f3e
No known key found for this signature in database
GPG key ID: 8117904FEDEFDD17
1 changed files with 29 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
phpBB/phpbb/template/twig/node/event.php
View file

@ -46,77 +46,49 @@ class event extends \Twig\Node\Node
$location = $this->listener_directory . $this->getNode('expr')->getAttribute('name'); $location = $this->listener_directory . $this->getNode('expr')->getAttribute('name');
$compiler_steps = []; $template_events = [];
// Group and sort extension template events in according to their priority (0 by default if not set)
foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path) foreach ($this->environment->get_phpbb_extensions() as $ext_namespace => $ext_path)
{ {
$ext_namespace = str_replace('/', '_', $ext_namespace); $ext_namespace = str_replace('/', '_', $ext_namespace);
if ($this->environment->isDebug() || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html'))
if (isset($this->template_event_priority_array[$ext_namespace][$location]))
{ {
$priority_key = $this->template_event_priority_array[$ext_namespace][$location]; $priority_key = $this->template_event_priority_array[$ext_namespace][$location] ?? 0;
$template_events[$priority_key][] = $ext_namespace;
} }
}
krsort($template_events);
$compiler_calls = []; foreach ($template_events as $events)
{
foreach ($events as $ext_namespace)
{
if ($this->environment->isDebug()) if ($this->environment->isDebug())
{ {
// If debug mode is enabled, lets check for new/removed EVENT // If debug mode is enabled, lets check for new/removed EVENT
// templates on page load rather than at compile. This is // templates on page load rather than at compile. This is
// slower, but makes developing extensions easier (no need to // slower, but makes developing extensions easier (no need to
// purge the cache when a new event template file is added) // purge the cache when a new event template file is added)
$compiler_calls[] = fn() => $compiler $compiler
->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n") ->write("if (\$this->env->getLoader()->exists('@{$ext_namespace}/{$location}.html')) {\n")
->indent() ->indent();
;
} }
if ($this->environment->isDebug() || $this->environment->getLoader()->exists('@' . $ext_namespace . '/' . $location . '.html')) $compiler
{
$compiler_calls[] = fn() => $compiler
->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n") ->write("\$previous_look_up_order = \$this->env->getNamespaceLookUpOrder();\n")
// We set the namespace lookup order to be this extension first, then the main path // We set the namespace lookup order to be this extension first, then the main path
->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n") ->write("\$this->env->setNamespaceLookUpOrder(array('{$ext_namespace}', '__main__'));\n")
->write("\$this->env->loadTemplate(\$this->env->getTemplateClass('@{$ext_namespace}/{$location}.html'), '@{$ext_namespace}/{$location}.html')->display(\$context);\n") ->write("\$this->env->loadTemplate(\$this->env->getTemplateClass('@{$ext_namespace}/{$location}.html'), '@{$ext_namespace}/{$location}.html')->display(\$context);\n")
->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n") ->write("\$this->env->setNamespaceLookUpOrder(\$previous_look_up_order);\n");
;
}
if ($this->environment->isDebug()) if ($this->environment->isDebug())
{ {
$compiler_calls[] = fn() => $compiler $compiler
->outdent() ->outdent()
->write("}\n\n") ->write("}\n\n");
;
} }
if (!empty($compiler_calls))
{
if (isset($priority_key))
{
if (array_key_exists($priority_key, $compiler_steps))
{
array_splice($compiler_steps, $priority_key, 0, [$compiler_calls]);
}
else
{
$compiler_steps[$priority_key] = $compiler_calls;
}
}
else
{
array_unshift($compiler_steps, $compiler_calls);
}
}
}
krsort($compiler_steps);
foreach ($compiler_steps as $ext_namespace_steps)
{
foreach ($ext_namespace_steps as $step)
{
$step();
} }
} }
} }