aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2016-03-31 11:06:47 -0700
committerMatt Friedman <maf675@gmail.com>2016-03-31 11:06:47 -0700
commit14e8113fcf01be7dbdb080458fcbf4e75668cc1a (patch)
treef09afcdafc012ba293501856f31cfa8b9c46ee14 /tests/regex
parentMerge branch '3.1.x' into 3.2.x (diff)
downloadphpbb-14e8113fcf01be7dbdb080458fcbf4e75668cc1a.tar.gz
phpbb-14e8113fcf01be7dbdb080458fcbf4e75668cc1a.tar.bz2
phpbb-14e8113fcf01be7dbdb080458fcbf4e75668cc1a.zip
[ticket/14576] Move common required files to bootstrap
PHPBB3-14576
Diffstat (limited to 'tests/regex')
-rw-r--r--tests/regex/censor_test.php4
-rw-r--r--tests/regex/email_test.php2
-rw-r--r--tests/regex/ipv4_test.php2
-rw-r--r--tests/regex/ipv6_test.php2
-rw-r--r--tests/regex/password_complexity_test.php1
-rw-r--r--tests/regex/table_prefix_test.php2
-rw-r--r--tests/regex/url_test.php2
7 files changed, 1 insertions, 14 deletions
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php
index 5625b0020b..5a516b71de 100644
--- a/tests/regex/censor_test.php
+++ b/tests/regex/censor_test.php
@@ -11,8 +11,6 @@
*
*/
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
class phpbb_regex_censor_test extends phpbb_test_case
{
public function censor_test_data()
@@ -41,4 +39,4 @@ class phpbb_regex_censor_test extends phpbb_test_case
$this->assertRegExp($regex, $subject);
}
-} \ No newline at end of file
+}
diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php
index ede35c49bc..5187b8bda6 100644
--- a/tests/regex/email_test.php
+++ b/tests/regex/email_test.php
@@ -11,8 +11,6 @@
*
*/
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
class phpbb_regex_email_test extends phpbb_test_case
{
protected $regex;
diff --git a/tests/regex/ipv4_test.php b/tests/regex/ipv4_test.php
index 62c2567517..e21a2d77fa 100644
--- a/tests/regex/ipv4_test.php
+++ b/tests/regex/ipv4_test.php
@@ -11,8 +11,6 @@
*
*/
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
class phpbb_regex_ipv4_test extends phpbb_test_case
{
protected $regex;
diff --git a/tests/regex/ipv6_test.php b/tests/regex/ipv6_test.php
index 41039c819d..223161df7f 100644
--- a/tests/regex/ipv6_test.php
+++ b/tests/regex/ipv6_test.php
@@ -11,8 +11,6 @@
*
*/
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
class phpbb_regex_ipv6_test extends phpbb_test_case
{
protected $regex;
diff --git a/tests/regex/password_complexity_test.php b/tests/regex/password_complexity_test.php
index 8a1a9edd41..933dc1ac91 100644
--- a/tests/regex/password_complexity_test.php
+++ b/tests/regex/password_complexity_test.php
@@ -11,7 +11,6 @@
*
*/
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
class phpbb_password_complexity_test extends phpbb_test_case
diff --git a/tests/regex/table_prefix_test.php b/tests/regex/table_prefix_test.php
index c593085b25..bf7b59ccc6 100644
--- a/tests/regex/table_prefix_test.php
+++ b/tests/regex/table_prefix_test.php
@@ -11,8 +11,6 @@
*
*/
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
class phpbb_regex_table_prefix_test extends phpbb_test_case
{
public function table_prefix_test_data()
diff --git a/tests/regex/url_test.php b/tests/regex/url_test.php
index e5d7c3256a..5e2a22bf73 100644
--- a/tests/regex/url_test.php
+++ b/tests/regex/url_test.php
@@ -11,8 +11,6 @@
*
*/
-require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
-
class phpbb_regex_url_test extends phpbb_test_case
{
public function url_test_data()