2 files changed, 36 insertions, 24 deletions
diff --git a/tests/lint_test.php b/tests/lint_test.php
index 9fb1c7624c..fb43196bae 100644
--- a/tests/lint_test.php
+++ b/tests/lint_test.php
@@ -38,31 +38,34 @@ class phpbb_lint_test extends phpbb_test_case
 				self::markTestSkipped(sprintf('Could not run PHP_BINARY %s. Output: %s', self::$php_binary, $output));
 			}
 		}
-
-		self::$exclude = array(
-			dirname(__FILE__) . '/../.git',
-			dirname(__FILE__) . '/../build/new_version',
-			dirname(__FILE__) . '/../build/old_versions',
-			dirname(__FILE__) . '/../phpBB/cache',
-			// PHP Fatal error:  Cannot declare class Container because the name is already in use in /var/www/projects/phpbb3/tests/../phpBB/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php on line 20
-			// https://gist.github.com/e003913ffd493da63cbc
-			dirname(__FILE__) . '/../phpBB/vendor',
-		);
 	}
 
-	public function test_lint()
+	/**
+	 * @dataProvider lint_data
+	 */
+	public function test_lint($path)
 	{
 		if (version_compare(PHP_VERSION, '5.3.0', '<'))
 		{
 			$this->markTestSkipped('phpBB uses PHP 5.3 syntax in some files, linting on PHP < 5.3 will fail');
 		}
 
-		$root = dirname(__FILE__) . '/..';
-		$this->check($root);
+		$cmd = sprintf('(%s -l %s) 2>&1', self::$php_binary, escapeshellarg($path));
+		$output = array();
+		$status = 1;
+		exec($cmd, $output, $status);
+		$output = implode("\n", $output);
+		$this->assertEquals(0, $status, "PHP lint failed for $path:\n$output");
+	}
+
+	public function lint_data()
+	{
+		return $this->check(dirname(__FILE__) . '/..');
 	}
 
 	protected function check($root)
 	{
+		$files = array();
 		$dh = opendir($root);
 		while (($filename = readdir($dh)) !== false)
 		{
@@ -76,19 +79,23 @@ class phpbb_lint_test extends phpbb_test_case
 			{
 				continue;
 			}
-			if (is_dir($path) && !in_array($path, self::$exclude))
+			if (is_dir($path) && !in_array($path, array(
+					dirname(__FILE__) . '/../.git',
+					dirname(__FILE__) . '/../build/new_version',
+					dirname(__FILE__) . '/../build/old_versions',
+					dirname(__FILE__) . '/../phpBB/cache',
+					// PHP Fatal error:  Cannot declare class Container because the name is already in use in /var/www/projects/phpbb3/tests/../phpBB/vendor/symfony/dependency-injection/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php on line 20
+					// https://gist.github.com/e003913ffd493da63cbc
+					dirname(__FILE__) . '/../phpBB/vendor',
+				)))
 			{
-				$this->check($path);
+				$files = array_merge($files, $this->check($path));
 			}
 			else if (substr($filename, strlen($filename)-4) == '.php')
 			{
-				$cmd = sprintf('(%s -l %s) 2>&1', self::$php_binary, escapeshellarg($path));
-				$output = array();
-				$status = 1;
-				exec($cmd, $output, $status);
-				$output = implode("\n", $output);
-				$this->assertEquals(0, $status, "PHP lint failed for $path:\n$output");
+				$files[] = array($path);
 			}
 		}
+		return $files;
 	}
 }
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
index 21fb103ed1..a88fc63858 100644
--- a/tests/security/redirect_test.php
+++ b/tests/security/redirect_test.php
@@ -23,9 +23,9 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
 	{
 		// array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false))
 		return array(
-			array('data://x', false, false, 'http://localhost/phpBB'),
+			array('data://x', false, 'INSECURE_REDIRECT', false),
 			array('bad://localhost/phpBB/index.php', false, 'INSECURE_REDIRECT', false),
-			array('http://www.otherdomain.com/somescript.php', false, false, 'http://localhost/phpBB'),
+			array('http://www.otherdomain.com/somescript.php', false, 'INSECURE_REDIRECT', false),
 			array("http://localhost/phpBB/memberlist.php\n\rConnection: close", false, 'INSECURE_REDIRECT', false),
 			array('javascript:test', false, false, 'http://localhost/phpBB/javascript:test'),
 			array('http://localhost/phpBB/index.php;url=', false, 'INSECURE_REDIRECT', false),
@@ -51,6 +51,11 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
 			array('../index.php', false, false, 'http://localhost/index.php'),
 			array('../index.php', true, false, 'http://localhost/index.php'),
 			array('./index.php', false, false, 'http://localhost/phpBB/index.php'),
+			array('https://foobar.com\@http://localhost/phpBB', false, 'INSECURE_REDIRECT', false),
+			array('https://foobar.com\@localhost/troll/http://localhost/', false, 'INSECURE_REDIRECT', false),
+			array('http://localhost.foobar.com\@localhost/troll/http://localhost/', false, 'INSECURE_REDIRECT', false),
+			array('http://localhost/phpBB', false, false, 'http://localhost/phpBB'),
+			array('http://localhost/phpBB/', false, false, 'http://localhost/phpBB/'),
 		);
 	}
 
@@ -105,7 +110,7 @@ class phpbb_security_redirect_test extends phpbb_security_test_base
 
 		if ($expected_error !== false)
 		{
-			$this->setExpectedTriggerError(E_USER_ERROR, $expected_error);
+			$this->setExpectedTriggerError(E_USER_ERROR, $user->lang[$expected_error]);
 		}
 
 		$result = redirect($test, true, $disable_cd_check);