Merge branch 'ticket/11568' into ticket/11568-develop

* ticket/11568:
  [ticket/11568] Split status code and html debug assertion into two methods
  [ticket/11568] Add comma at end of array key-value couple
  [ticket/11568] Invert logic for asserting the response
  [ticket/11568] Use static calls for static methods

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/functional/forgot_password_test.php b/tests/functional/forgot_password_test.php
index 65d07672cf..906224efbb 100644
--- a/tests/functional/forgot_password_test.php
+++ b/tests/functional/forgot_password_test.php
@@ -16,7 +16,7 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
 	{
 		global $config;
 		$this->add_lang('ucp');
-		$crawler = $this->request('GET', 'ucp.php?mode=sendpassword');
+		$crawler = self::request('GET', 'ucp.php?mode=sendpassword');
 		$this->assertEquals($this->lang('SEND_PASSWORD'), $crawler->filter('h2')->text());
 	}
 
@@ -25,18 +25,18 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case
 		$this->login();
 		$this->admin_login();
 		$this->add_lang('ucp');
-		$crawler = $this->request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=security');
+		$crawler = self::request('GET', 'adm/index.php?sid=' . $this->sid . '&i=acp_board&mode=security');
 
 		$form = $crawler->selectButton('Submit')->form();
 		$values = $form->getValues();
 
 		$values["config[allow_password_reset]"] = 0;
 		$form->setValues($values);
-		$crawler = $this->submit($form);
+		$crawler = self::submit($form);
 
 		$this->logout();
 
-		$crawler = $this->request('GET', 'ucp.php?mode=sendpassword');
+		$crawler = self::request('GET', 'ucp.php?mode=sendpassword');
 		$this->assertContains($this->lang('UCP_PASSWORD_RESET_DISABLED', '', ''), $crawler->text());
 
 	}