mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00
Code Issues Releases Wiki Activity

[ticket/13654] Moving reporting into controller

Browse Source 
Moving report.php's content into different services and controllers to
better comply with the MVC model.

Also implementing:
 * Replacement for reasons_display()
 * Adding assign_meta_refresh_var() to \controller\helper
 * Adding separate routes for easy configuration
 * Updating unit tests to expect to correct results
 * Add BC tests

PHPBB3-13654
This commit is contained in:
MateBartus
2015-02-25 21:13:20 +01:00
parent 2c0b1252c8
commit a089ff5eb0
26 changed files with 1208 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/functional/controllers_compatibility_test.php Normal file
View File

@@ -0,0 +1,43 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
/**
* @group functional
*/
class phpbb_functional_controllers_compatibility_test extends phpbb_functional_test_case
{
public function test_report_compatibility()
{
$this->assert301('report.php?f=1&p=1', 'app.php/post/1/report');
$this->assert301('report.php?p=1', 'app.php/post/1/report');
$this->assert301('report.php?pm=1', 'app.php/pm/1/report');
}
protected function assert301($from, $to)
{
self::$client->followRedirects(false);
self::request('GET', $from, array(), false);
// Fix sid issues
$location = self::$client->getResponse()->getHeader('Location');
$location = preg_replace('#sid=[^&]+(&(amp;)?)?#', '', $location);
if (substr($location, -1) === '?')
{
$location = substr($location, 0, -1);
}
$this->assertEquals(301, self::$client->getResponse()->getStatus());
$this->assertStringEndsWith($to, $location);
}
}

7
tests/functional/report_post_captcha_test.php
View File

@@ -18,12 +18,13 @@ class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_ca
{
public function test_guest_report_post()
{
$crawler = self::request('GET', 'report.php?f=2&p=1');
$crawler = self::request('GET', 'app.php/post/1/report', array(), false);
$this->assert_response_html(403);
$this->add_lang('mcp');
$this->assertContains($this->lang('USER_CANNOT_REPORT'), $crawler->filter('html')->text());
$this->set_reporting_guest(1);
$crawler = self::request('GET', 'report.php?f=2&p=1');
$crawler = self::request('GET', 'app.php/post/1/report');
$this->assertContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
$this->set_reporting_guest(-1);
}
@@ -31,7 +32,7 @@ class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_ca
public function test_user_report_post()
{
$this->login();
$crawler = self::request('GET', 'report.php?f=2&p=1');
$crawler = self::request('GET', 'app.php/post/1/report');
$this->assertNotContains($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text());
$this->add_lang('mcp');