aboutsummaryrefslogtreecommitdiffstats
path: root/tests/template
diff options
context:
space:
mode:
Diffstat (limited to 'tests/template')
-rw-r--r--tests/template/context_test.php4
-rw-r--r--tests/template/template_allfolder_test.php4
-rw-r--r--tests/template/template_events_test.php4
-rw-r--r--tests/template/template_includecss_test.php4
-rw-r--r--tests/template/template_test.php4
-rw-r--r--tests/template/template_test_case.php8
-rw-r--r--tests/template/template_test_case_with_tree.php4
-rw-r--r--tests/template/templates/expressions.html2
8 files changed, 17 insertions, 17 deletions
diff --git a/tests/template/context_test.php b/tests/template/context_test.php
index 52ce6c8fde..a1be672f51 100644
--- a/tests/template/context_test.php
+++ b/tests/template/context_test.php
@@ -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(
diff --git a/tests/template/template_allfolder_test.php b/tests/template/template_allfolder_test.php
index 63a6ef08ea..a9a8ecc287 100644
--- a/tests/template/template_allfolder_test.php
+++ b/tests/template/template_allfolder_test.php
@@ -40,7 +40,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
new phpbb_mock_request()
),
$filesystem,
- $this->getMock('\phpbb\request\request'),
+ $this->createMock('\phpbb\request\request'),
$phpbb_root_path,
$phpEx
);
@@ -75,7 +75,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
'autoescape' => false,
)
);
- $this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user)), $this->extension_manager);
+ $this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)), $this->extension_manager);
$twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->template_path = $this->test_path . '/templates';
diff --git a/tests/template/template_events_test.php b/tests/template/template_events_test.php
index 3a93c91e11..9243390937 100644
--- a/tests/template/template_events_test.php
+++ b/tests/template/template_events_test.php
@@ -145,7 +145,7 @@ Zeta test event in all',
new phpbb_mock_request()
),
new \phpbb\filesystem\filesystem(),
- $this->getMock('\phpbb\request\request'),
+ $this->createMock('\phpbb\request\request'),
$phpbb_root_path,
$phpEx
);
@@ -169,7 +169,7 @@ Zeta test event in all',
'autoescape' => false,
)
);
- $this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user)), $this->extension_manager);
+ $this->template = new \phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)), $this->extension_manager);
$twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->template->set_custom_style(((!empty($style_names)) ? $style_names : 'silver'), array($this->template_path));
diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php
index 4eb30eda1e..5f9875a556 100644
--- a/tests/template/template_includecss_test.php
+++ b/tests/template/template_includecss_test.php
@@ -35,7 +35,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
new phpbb_mock_request()
),
$filesystem,
- $this->getMock('\phpbb\request\request'),
+ $this->createMock('\phpbb\request\request'),
$phpbb_root_path,
$phpEx
);
@@ -68,7 +68,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
$twig,
$cache_path,
$this->user,
- array(new \phpbb\template\twig\extension($context, $this->user)),
+ array(new \phpbb\template\twig\extension($context, $twig, $this->user)),
new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
array(
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 727f35e9d2..01c132e032 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -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');
}
diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php
index 8adbafb1b2..0389088ec8 100644
--- a/tests/template/template_test_case.php
+++ b/tests/template/template_test_case.php
@@ -87,7 +87,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
new phpbb_mock_request()
),
$filesystem,
- $this->getMock('\phpbb\request\request'),
+ $this->createMock('\phpbb\request\request'),
$phpbb_root_path,
$phpEx
);
@@ -113,12 +113,12 @@ class phpbb_template_template_test_case extends phpbb_test_case
'autoescape' => false,
)
);
- $this->template = new phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user)));
+ $this->template = new phpbb\template\twig\twig($path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)));
$twig->setLexer(new \phpbb\template\twig\lexer($twig));
$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();
@@ -130,7 +130,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)
{
diff --git a/tests/template/template_test_case_with_tree.php b/tests/template/template_test_case_with_tree.php
index 75e3918f44..c0238b6f03 100644
--- a/tests/template/template_test_case_with_tree.php
+++ b/tests/template/template_test_case_with_tree.php
@@ -29,7 +29,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
new phpbb_mock_request()
),
$filesystem,
- $this->getMock('\phpbb\request\request'),
+ $this->createMock('\phpbb\request\request'),
$phpbb_root_path,
$phpEx
);
@@ -56,7 +56,7 @@ class phpbb_template_template_test_case_with_tree extends phpbb_template_templat
'autoescape' => false,
)
);
- $this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $this->user)));
+ $this->template = new phpbb\template\twig\twig($this->phpbb_path_helper, $config, $context, $twig, $cache_path, $this->user, array(new \phpbb\template\twig\extension($context, $twig, $this->user)));
$twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->template->set_custom_style('tests', array($this->template_path, $this->parent_template_path));
}
diff --git a/tests/template/templates/expressions.html b/tests/template/templates/expressions.html
index e1283f165f..17a5b8d265 100644
--- a/tests/template/templates/expressions.html
+++ b/tests/template/templates/expressions.html
@@ -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 -->
generated by cgit v1.2.1 (git 2.21.0) at 2025-05-28 13:56:59 +0000