mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 05:25:01 +02:00
Code Issues Releases Wiki Activity

[ticket/11768] Removed the cached renderer

Browse Source 
We don't need to cache an instance of the renderer, we can just instantiate
it every time we need one.

PHPBB3-11768
This commit is contained in:
JoshyPHP 2015-03-03 02:14:09 +01:00
parent 6cb3fb6140
commit d37f2d10f0
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/phpbb/textformatter/s9e/factory.php
View File

@ -314,13 +314,8 @@ class factory implements \phpbb\textformatter\cache
// Cache the parser as-is
$this->cache->put($this->cache_key_parser, $parser);
// We need to cache the name of the renderer's generated class so that we can load the class
// before the renderer is unserialized. That's why we save them together, with the renderer
// in serialized form
$renderer_data = array(
'class' => get_class($renderer),
'renderer' => serialize($renderer)
);
// We need to cache the name of the renderer's generated class
$renderer_data = array('class' => get_class($renderer));
if (isset($censor))
{
$renderer_data['censor'] = $censor;

2
phpBB/phpbb/textformatter/s9e/renderer.php
View File

@ -77,7 +77,7 @@ class renderer extends \phpbb\textformatter\renderer
if (class_exists($class, false))
{
$renderer = unserialize($renderer_data['renderer']);
$renderer = new $class;
}
if (isset($renderer_data['censor']))

1
tests/text_formatter/s9e/factory_test.php
View File

@ -94,7 +94,6 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
$renderer_data = $this->cache->get('_foo_renderer');
$this->assertEquals($parser, $this->cache->get('_foo_parser'), 'The parser was not cached');
$this->assertEquals(get_class($renderer), $renderer_data['class']);
$this->assertEquals(serialize($renderer), $renderer_data['renderer']);
$this->assertInstanceOf('s9e\\TextFormatter\\Plugins\\Censor\\Helper', $renderer_data['censor']);
$file = $this->get_cache_dir() . get_class($renderer) . '.php';

2
tests/text_formatter/s9e/renderer_test.php
View File

@ -34,7 +34,7 @@ class phpbb_textformatter_s9e_renderer_test extends phpbb_test_case
$cache->expects($this->once())
->method('get')
->with('_foo_renderer')
->will($this->returnValue(array('class' => 'renderer_foo', 'renderer' => serialize($mock))));
->will($this->returnValue(array('class' => 'renderer_foo')));
$factory = $this->getMockBuilder('phpbb\\textformatter\\s9e\\factory')
->disableOriginalConstructor()