diff --git a/tests/console/create_test.php b/tests/console/create_test.php
index 37bed9f..feb06c0 100644
--- a/tests/console/create_test.php
+++ b/tests/console/create_test.php
@@ -50,7 +50,7 @@ public function setUp(): void
->getMock();
$this->language->method('lang')
- ->will($this->returnArgument(0));
+ ->willReturnArgument(0);
$this->user = $this->user = $this->getMockBuilder('\phpbb\user')
->disableOriginalConstructor()
@@ -62,7 +62,7 @@ public function setUp(): void
->disableOriginalConstructor()
->getMock();
- $this->packager->expects(self::atMost(1))
+ $this->packager->expects($this->atMost(1))
->method('get_composer_dialog_values')
->willReturn([
'author' => ['author_name' => null],
@@ -70,7 +70,7 @@ public function setUp(): void
'requirements' => ['php_version' => '>=5.4'],
]);
- $this->packager->expects(self::atMost(1))
+ $this->packager->expects($this->atMost(1))
->method('get_component_dialog_values')
->willReturn([
'phplistener' => [
diff --git a/tests/controller/main_test.php b/tests/controller/main_test.php
index e42469a..cb804f8 100644
--- a/tests/controller/main_test.php
+++ b/tests/controller/main_test.php
@@ -132,16 +132,16 @@ public function test_handle($status_code, $page_content)
$this->user->data['is_bot'] = false;
$this->language->method('lang')
- ->will(self::returnArgument(0));
+ ->willReturnArgument(0);
$this->language->method('is_set')
->willReturn(true);
- $this->request->expects(self::once())
+ $this->request->expects($this->once())
->method('is_set_post')
->willReturn(false);
$this->request->method('variable')
- ->with(self::anything())
+ ->with($this->anything())
->willReturnMap([
['vendor_name', '', true, \phpbb\request\request_interface::REQUEST, 'foo'],
['author_name', [''], true, \phpbb\request\request_interface::REQUEST, ['bar']],
@@ -150,13 +150,13 @@ public function test_handle($status_code, $page_content)
['component_phplistener', false, false, \phpbb\request\request_interface::REQUEST, true],
]);
- $this->controller_helper->expects(self::once())
+ $this->controller_helper->expects($this->once())
->method('render')
->willReturnCallback(function ($template_file, $page_title = '', $status_code = 200) {
return new \Symfony\Component\HttpFoundation\Response($template_file, $status_code);
});
- $this->template->expects(self::atLeastOnce())
+ $this->template->expects($this->atLeastOnce())
->method('assign_block_vars')
->withConsecutive(
['extension', [
@@ -254,9 +254,9 @@ public function test_handle($status_code, $page_content)
$response = $this->get_controller($this->packager)->handle();
- self::assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
- self::assertEquals($status_code, $response->getStatusCode());
- self::assertEquals($page_content, $response->getContent());
+ $this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
+ $this->assertEquals($status_code, $response->getStatusCode());
+ $this->assertEquals($page_content, $response->getContent());
}
/**
@@ -276,7 +276,7 @@ public function test_submit_success()
{
$this->user->data['is_bot'] = false;
- $this->request->expects(self::once())
+ $this->request->expects($this->once())
->method('is_set_post')
->willReturn(true);
@@ -289,7 +289,7 @@ public function test_submit_success()
['component_githubactions', true, false, \phpbb\request\request_interface::REQUEST, true],
]);
- $this->packager_mock->expects(self::once())
+ $this->packager_mock->expects($this->once())
->method('get_composer_dialog_values')
->willReturn([
'author' => ['author_name' => null],
@@ -297,7 +297,7 @@ public function test_submit_success()
'requirements' => ['php_version' => '>=5.4'],
]);
- $this->packager_mock->expects(self::once())
+ $this->packager_mock->expects($this->once())
->method('get_component_dialog_values')
->willReturn([
'phplistener' => [
@@ -323,27 +323,27 @@ public function test_submit_success()
$response = $this->get_controller($this->packager_mock)->handle();
- self::assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
+ $this->assertInstanceOf('\Symfony\Component\HttpFoundation\Response', $response);
}
public function test_submit_exception()
{
$this->user->data['is_bot'] = false;
- $this->request->expects(self::once())
+ $this->request->expects($this->once())
->method('is_set_post')
->with('submit')
->willReturn(true);
$this->request->method('variable')
- ->with(self::anything())
+ ->with($this->anything())
->willReturnMap([
['author_name', [''], true, \phpbb\request\request_interface::REQUEST, ['']],
['vendor_name', '', true, \phpbb\request\request_interface::REQUEST, 'foo_vendor'],
['php_version', '>=5.4', true, \phpbb\request\request_interface::REQUEST, '>=5.4'],
]);
- $this->packager_mock->expects(self::atLeastOnce())
+ $this->packager_mock->expects($this->atLeastOnce())
->method('get_composer_dialog_values')
->willReturn([
'author' => ['author_name' => null],
@@ -351,7 +351,7 @@ public function test_submit_exception()
'requirements' => ['php_version' => '>=5.4'],
]);
- $this->packager_mock->expects(self::atLeastOnce())
+ $this->packager_mock->expects($this->atLeastOnce())
->method('get_component_dialog_values')
->willReturn([
'phplistener' => [
@@ -362,7 +362,7 @@ public function test_submit_exception()
],
]);
- $this->validator->expects(self::once())
+ $this->validator->expects($this->once())
->method('validate_vendor_name')
->with('foo_vendor')
->willThrowException(new runtime_exception('SKELETON_INVALID_VENDOR_NAME'));
diff --git a/tests/event_listener_test.php b/tests/event_listener_test.php
index d8c8fa9..7d6a0a5 100644
--- a/tests/event_listener_test.php
+++ b/tests/event_listener_test.php
@@ -41,7 +41,7 @@ public function setUp(): void
public function test_construct()
{
- self::assertInstanceOf('\Symfony\Component\EventDispatcher\EventSubscriberInterface', $this->listener);
+ $this->assertInstanceOf('\Symfony\Component\EventDispatcher\EventSubscriberInterface', $this->listener);
}
/**
@@ -49,7 +49,7 @@ public function test_construct()
*/
public function test_getSubscribedEvents()
{
- self::assertEquals(array(
+ $this->assertEquals(array(
'core.user_setup',
'core.page_header',
), array_keys(\phpbb\skeleton\event\main_listener::getSubscribedEvents()));
@@ -65,16 +65,16 @@ public function test_load_language_on_setup()
$event_data_after = $dispatcher->trigger_event('core.user_setup', compact($event_data));
extract($event_data_after, EXTR_OVERWRITE);
- self::assertEquals([['ext_name' => 'phpbb/skeleton', 'lang_set' => 'common']], $lang_set_ext);
+ $this->assertEquals([['ext_name' => 'phpbb/skeleton', 'lang_set' => 'common']], $lang_set_ext);
}
public function test_add_page_header_link()
{
- $this->controller_helper->expects(self::once())
+ $this->controller_helper->expects($this->once())
->method('route')
->willReturnArgument(0);
- $this->template->expects(self::once())
+ $this->template->expects($this->once())
->method('assign_var')
->with('U_PHPBB_SKELETON_EXT', 'phpbb_skeleton_controller');
diff --git a/tests/functional/view_test.php b/tests/functional/view_test.php
index 2682070..cef574d 100644
--- a/tests/functional/view_test.php
+++ b/tests/functional/view_test.php
@@ -30,6 +30,6 @@ public function test_view_skeleton()
{
$this->add_lang_ext('phpbb/skeleton', 'common');
$crawler = self::request('GET', 'app.php/skeleton');
- self::assertStringContainsString($this->lang('PHPBB_CREATE_SKELETON_EXT'), $crawler->filter('h2')->text());
+ $this->assertStringContainsString($this->lang('PHPBB_CREATE_SKELETON_EXT'), $crawler->filter('h2')->text());
}
}
diff --git a/tests/helper/packager_test.php b/tests/helper/packager_test.php
index d9b87e5..7ffa987 100644
--- a/tests/helper/packager_test.php
+++ b/tests/helper/packager_test.php
@@ -132,12 +132,66 @@ public function test_create_zip_creates_zip_file()
// Clean up or further assertions here
}
- public function test_get_language_version_data_returns_expected()
+ /**
+ * @dataProvider provide_language_version_data
+ */
+ public function test_get_language_version_data_returns_expected($phpbb_version, $expected)
{
- $data_31 = $this->invokeMethod($this->packager, 'get_language_version_data', [true]);
- $data_32 = $this->invokeMethod($this->packager, 'get_language_version_data', [false]);
- $this->assertArrayHasKey('class', $data_31);
- $this->assertArrayHasKey('class', $data_32);
+ $data = [
+ 'requirements' => [
+ 'phpbb_version_min' => $phpbb_version
+ ]
+ ];
+
+ $result = $this->invokeMethod($this->packager, 'get_language_version_data', [$data]);
+
+ $this->assertSame($expected['class'], $result['class']);
+ $this->assertSame($expected['object'], $result['object']);
+ $this->assertSame($expected['function'], $result['function']);
+ $this->assertSame($expected['indent']['class'], $result['indent']['class']);
+ $this->assertSame($expected['indent']['object'], $result['indent']['object']);
+ }
+
+ public function provide_language_version_data()
+ {
+ return [
+ '3.1 version' => [
+ '3.1.0',
+ [
+ 'class' => '\phpbb\user',
+ 'object' => 'user',
+ 'function' => 'add_lang_ext',
+ 'indent' => [
+ 'class' => "\t\t\t",
+ 'object' => "\t"
+ ]
+ ]
+ ],
+ '3.2 version' => [
+ '3.2.0',
+ [
+ 'class' => '\phpbb\language\language',
+ 'object' => 'language',
+ 'function' => 'add_lang',
+ 'indent' => [
+ 'class' => '',
+ 'object' => ''
+ ]
+ ]
+ ],
+ 'null version' => [
+ null,
+ [
+ 'class' => '\phpbb\language\language',
+ 'object' => 'language',
+ 'function' => 'add_lang',
+ 'indent' => [
+ 'class' => '',
+ 'object' => ''
+ ]
+ ]
+ ]
+ ];
}
public function test_get_template_engine_returns_twig_instance()
diff --git a/tests/helper/validator_test.php b/tests/helper/validator_test.php
index 5c4e74e..b06fa1b 100644
--- a/tests/helper/validator_test.php
+++ b/tests/helper/validator_test.php
@@ -119,7 +119,7 @@ public function valid_data(): array
*/
public function test_validator_valid($validator, $value)
{
- self::assertEquals($value, call_user_func([$this->validator, "validate_{$validator}"], $value));
+ $this->assertEquals($value, call_user_func([$this->validator, "validate_{$validator}"], $value));
}
public function invalid_data(): array