mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 02:06:32 +02:00
Code Issues Releases Wiki Activity

[ticket/14948] Adjust calls for twig and phpunit updates

Browse Source 
PHPBB3-14948
This commit is contained in:
Marc Alexander
2018-12-30 11:36:08 +01:00
parent 8e78d829b1
commit c6cc6ba8d8
194 changed files with 281 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/template/context_test.php
View File

@@ -14,7 +14,7 @@
class context_test extends phpbb_test_case
{
protected $context;
protected function setUp()
protected function setUp(): void
{
$this->context = new \phpbb\template\context();
@@ -31,7 +31,7 @@ class context_test extends phpbb_test_case
'SUBFOO' => 'subfoo' . $j,
'SUBBAR' => 'subbar' . $j,
));
for ($k = 0; $k < 10; $k++)
{
$this->context->assign_block_vars('block' . $i . '.subblock.subsubblock', array(

4
tests/template/template_test.php
View File

@@ -521,7 +521,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
$this->template->set_filenames(array('test' => $filename));
$this->assertFileNotExists($this->template_path . '/' . $filename, 'Testing missing file, file cannot exist');
$this->setExpectedException('Twig_Error_Loader');
$this->expectException('Twig_Error_Loader');
$this->display('test');
}
@@ -529,7 +529,7 @@ class phpbb_template_template_test extends phpbb_template_template_test_case
public function test_invalid_handle()
{
$this->setExpectedException('Twig_Error_Loader');
$this->expectException('Twig_Error_Loader');
$this->display('test');
}

4
tests/template/template_test_case.php
View File

@@ -117,7 +117,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
$this->template->set_custom_style('tests', $this->template_path);
}
protected function setUp()
protected function setUp(): void
{
// Test the engine can be used
$this->setup_engine();
@@ -129,7 +129,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
$phpbb_filesystem = new \phpbb\filesystem\filesystem();
}
protected function tearDown()
protected function tearDown(): void
{
if ($this->template)
{

2
tests/template/templates/expressions.html
View File

@@ -3,7 +3,7 @@
<!-- IF not 390 is even -->fail<!-- ELSE -->pass<!-- ENDIF -->
<!-- IF 9 is odd -->pass<!-- ELSE -->fail<!-- ENDIF -->
<!-- IF 32 is odd -->fail<!-- ELSE -->pass<!-- ENDIF -->
<!-- IF 32 is div by 16 -->pass<!-- ELSE -->fail<!-- ENDIF -->
<!-- IF 32 is divisible by(16) -->pass<!-- ELSE -->fail<!-- ENDIF -->
<!-- IF 10 is not even -->fail<!-- ELSE -->pass<!-- ENDIF -->
<!-- IF 24 == 24 -->pass<!-- ELSE -->fail<!-- ENDIF -->
<!-- IF 24 eq 24 -->pass<!-- ELSE -->fail<!-- ENDIF -->