diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-10-05 14:54:47 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2017-10-05 14:54:47 +0200 |
| commit | 5514b1069968d451adb7eaf89278a6e1e5dc20df (patch) | |
| tree | 245b21642c134c4509e46fab60d130065e123624 /tests/regex | |
| parent | 93621aa1844ab48d9bae068d9872d2c49ae86de4 (diff) | |
| parent | ca5678cc1c2a1f723d39127e0c066eba6c9a3336 (diff) | |
| download | forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar.gz forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar.bz2 forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.tar.xz forums-5514b1069968d451adb7eaf89278a6e1e5dc20df.zip | |
Merge pull request #4960 from rxu/ticket/15367
[ticket/15367] Escape special characters in Sphinx search backend
Diffstat (limited to 'tests/regex')
| -rw-r--r-- | tests/regex/censor_test.php | 16 | ||||
| -rw-r--r-- | tests/regex/email_test.php | 2 | ||||
| -rw-r--r-- | tests/regex/ipv4_test.php | 2 | ||||
| -rw-r--r-- | tests/regex/ipv6_test.php | 2 | ||||
| -rw-r--r-- | tests/regex/password_complexity_test.php | 1 | ||||
| -rw-r--r-- | tests/regex/table_prefix_test.php | 2 | ||||
| -rw-r--r-- | tests/regex/url_test.php | 2 |
7 files changed, 2 insertions, 25 deletions
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php index 50c6778c8c..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() @@ -37,18 +35,8 @@ class phpbb_regex_censor_test extends phpbb_test_case */ public function test_censor_unicode($pattern, $subject) { - $regex = get_censor_preg_expression($pattern, true); - - $this->assertRegExp($regex, $subject); - } - - /** - * @dataProvider censor_test_data - */ - public function test_censor_no_unicode($pattern, $subject) - { - $regex = get_censor_preg_expression($pattern, false); + $regex = get_censor_preg_expression($pattern); $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() |