mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
[ticket/11768] Updated phpbb\textformatter\s9e\factory::regenerate()
Returns an associative array rather than a numerically-indexed array. Feels cleaner and more extensible. PHPBB3-11768
This commit is contained in:
@@ -294,7 +294,7 @@ class factory implements \phpbb\textformatter\cache
|
||||
/**
|
||||
* Regenerate and cache a new parser and renderer
|
||||
*
|
||||
* @return array Array with two elements: an instance of the parser, an instance of the renderer
|
||||
* @return array Associative array with at least two elements: "parser" and "renderer"
|
||||
*/
|
||||
public function regenerate()
|
||||
{
|
||||
@@ -315,7 +315,7 @@ class factory implements \phpbb\textformatter\cache
|
||||
);
|
||||
$this->cache->put($this->cache_key_renderer, $renderer_data);
|
||||
|
||||
return array($parser, $renderer);
|
||||
return array('parser' => $parser, 'renderer' => $renderer);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -48,7 +48,7 @@ class parser extends \phpbb\textformatter\parser
|
||||
$parser = $cache->get($key);
|
||||
if (!$parser)
|
||||
{
|
||||
list($parser) = $factory->regenerate();
|
||||
extract($factory->regenerate());
|
||||
}
|
||||
|
||||
$this->parser = $parser;
|
||||
|
@@ -80,7 +80,7 @@ class renderer extends \phpbb\textformatter\renderer
|
||||
|
||||
if (!isset($renderer))
|
||||
{
|
||||
list(, $renderer) = $factory->regenerate();
|
||||
extract($factory->regenerate());
|
||||
}
|
||||
|
||||
$this->renderer = $renderer;
|
||||
|
Reference in New Issue
Block a user