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

Merge remote-tracking branch 'EXreaction/ticket/11665' into develop

Browse source 
* EXreaction/ticket/11665:
  [ticket/11665] Fix test class name
  [ticket/11665] Can't change file names already sent to set_filenames
This commit is contained in:
Andreas Fischer 2013-07-12 19:15:25 +02:00
commit ac9dfd023c
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/template/twig/twig.php
View file

@ -172,7 +172,7 @@ class phpbb_template_twig implements phpbb_template
*/ */
public function set_filenames(array $filename_array) public function set_filenames(array $filename_array)
{ {
$this->filenames = array_merge($filename_array, $this->filenames); $this->filenames = array_merge($this->filenames, $filename_array);
return $this; return $this;
} }

29
tests/template/template_parser_test.php Normal file
View file

@ -0,0 +1,29 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/template_test_case.php';
class phpbb_template_template_parser_test extends phpbb_template_template_test_case
{
public function test_set_filenames()
{
$this->template->set_filenames(array(
'basic' => 'basic.html',
));
$this->assertEquals("passpasspass<!-- DUMMY var -->", str_replace(array("\n", "\r", "\t"), '', $this->template->assign_display('basic')));
$this->template->set_filenames(array(
'basic' => 'if.html',
));
$this->assertEquals("03!false", str_replace(array("\n", "\r", "\t"), '', $this->template->assign_display('basic')));
}
}