Update skeleton’s own test files too

Author: iMattPro

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,15 +62,15 @@ 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],
 				'extension' => ['vendor_name' => null],
 				'requirements' => ['php_version' => '>=5.4'],
 			]);
 
-		$this->packager->expects(self::atMost(1))
+		$this->packager->expects($this->atMost(1))
 			->method('get_component_dialog_values')
 			->willReturn([
 				'phplistener' => [

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,15 +289,15 @@ 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],
 				'extension' => ['vendor_name' => null],
 				'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,35 +323,35 @@ 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],
 				'extension' => ['vendor_name' => null],
 				'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'));

tests/event_listener_test.php

@@ -41,15 +41,15 @@ public function setUp(): void
 
 	public function test_construct()
 	{
-		self::assertInstanceOf('\Symfony\Component\EventDispatcher\EventSubscriberInterface', $this->listener);
+		$this->assertInstanceOf('\Symfony\Component\EventDispatcher\EventSubscriberInterface', $this->listener);
 	}
 
 	/**
 	 * Test the event listener is subscribing events
 	 */
 	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');
 

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());
 	}
 }

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