From e11ae7e9cd5573658b763b1ef72cb889f547f2dd Mon Sep 17 00:00:00 2001 From: JoshyPHP Date: Fri, 1 May 2015 05:32:48 +0200 Subject: [PATCH] [ticket/13803] Hyphenated class names PHPBB3-13803 --- .../container/services_text_reparser.yml | 18 +++++++++--------- ...umdescription.php => forum_description.php} | 2 +- .../{forumrules.php => forum_rules.php} | 2 +- ...updescription.php => group_description.php} | 2 +- .../textreparser/{pmtext.php => pm_text.php} | 2 +- .../{posttext.php => post_text.php} | 2 +- .../{posttext_test.php => post_text_test.php} | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) rename phpBB/phpbb/textreparser/{forumdescription.php => forum_description.php} (97%) rename phpBB/phpbb/textreparser/{forumrules.php => forum_rules.php} (98%) rename phpBB/phpbb/textreparser/{groupdescription.php => group_description.php} (97%) rename phpBB/phpbb/textreparser/{pmtext.php => pm_text.php} (97%) rename phpBB/phpbb/textreparser/{posttext.php => post_text.php} (97%) rename tests/text_reparser/{posttext_test.php => post_text_test.php} (91%) diff --git a/phpBB/config/default/container/services_text_reparser.yml b/phpBB/config/default/container/services_text_reparser.yml index 3113c02f6d..c458be12ac 100644 --- a/phpBB/config/default/container/services_text_reparser.yml +++ b/phpBB/config/default/container/services_text_reparser.yml @@ -1,62 +1,62 @@ services: text_reparser.admin_contact_info: - class: phpbb\textreparser\admincontactinfo + class: phpbb\textreparser\admin_contact_info arguments: - @dbal.conn tags: - { name: text_reparser.plugin } text_reparser.forum_description: - class: phpbb\textreparser\forumdescription + class: phpbb\textreparser\forum_description arguments: - @dbal.conn tags: - { name: text_reparser.plugin } text_reparser.forum_rules: - class: phpbb\textreparser\forumrules + class: phpbb\textreparser\forum_rules arguments: - @dbal.conn tags: - { name: text_reparser.plugin } text_reparser.group_description: - class: phpbb\textreparser\groupdescription + class: phpbb\textreparser\group_description arguments: - @dbal.conn tags: - { name: text_reparser.plugin } text_reparser.pm_text: - class: phpbb\textreparser\pmtext + class: phpbb\textreparser\pm_text arguments: - @dbal.conn tags: - { name: text_reparser.plugin } text_reparser.poll_option: - class: phpbb\textreparser\polloption + class: phpbb\textreparser\poll_option arguments: - @dbal.conn tags: - { name: text_reparser.plugin } text_reparser.poll_title: - class: phpbb\textreparser\polltitle + class: phpbb\textreparser\poll_title arguments: - @dbal.conn tags: - { name: text_reparser.plugin } text_reparser.post_text: - class: phpbb\textreparser\posttext + class: phpbb\textreparser\post_text arguments: - @dbal.conn tags: - { name: text_reparser.plugin } text_reparser.user_signature: - class: phpbb\textreparser\usersignature + class: phpbb\textreparser\user_signature arguments: - @dbal.conn tags: diff --git a/phpBB/phpbb/textreparser/forumdescription.php b/phpBB/phpbb/textreparser/forum_description.php similarity index 97% rename from phpBB/phpbb/textreparser/forumdescription.php rename to phpBB/phpbb/textreparser/forum_description.php index b715abd825..493f8d6c94 100644 --- a/phpBB/phpbb/textreparser/forumdescription.php +++ b/phpBB/phpbb/textreparser/forum_description.php @@ -13,7 +13,7 @@ namespace phpbb\textreparser; -class forumdescription extends base +class forum_description extends base { /** * {@inheritdoc} diff --git a/phpBB/phpbb/textreparser/forumrules.php b/phpBB/phpbb/textreparser/forum_rules.php similarity index 98% rename from phpBB/phpbb/textreparser/forumrules.php rename to phpBB/phpbb/textreparser/forum_rules.php index c0538f6cce..5a3cc7b405 100644 --- a/phpBB/phpbb/textreparser/forumrules.php +++ b/phpBB/phpbb/textreparser/forum_rules.php @@ -13,7 +13,7 @@ namespace phpbb\textreparser; -class forumrules extends base +class forum_rules extends base { /** * {@inheritdoc} diff --git a/phpBB/phpbb/textreparser/groupdescription.php b/phpBB/phpbb/textreparser/group_description.php similarity index 97% rename from phpBB/phpbb/textreparser/groupdescription.php rename to phpBB/phpbb/textreparser/group_description.php index 608cc806b6..61354c832b 100644 --- a/phpBB/phpbb/textreparser/groupdescription.php +++ b/phpBB/phpbb/textreparser/group_description.php @@ -13,7 +13,7 @@ namespace phpbb\textreparser; -class groupdescription extends base +class group_description extends base { /** * {@inheritdoc} diff --git a/phpBB/phpbb/textreparser/pmtext.php b/phpBB/phpbb/textreparser/pm_text.php similarity index 97% rename from phpBB/phpbb/textreparser/pmtext.php rename to phpBB/phpbb/textreparser/pm_text.php index e1b27e60fe..b02cb0083f 100644 --- a/phpBB/phpbb/textreparser/pmtext.php +++ b/phpBB/phpbb/textreparser/pm_text.php @@ -13,7 +13,7 @@ namespace phpbb\textreparser; -class pmtext extends base +class pm_text extends base { /** * {@inheritdoc} diff --git a/phpBB/phpbb/textreparser/posttext.php b/phpBB/phpbb/textreparser/post_text.php similarity index 97% rename from phpBB/phpbb/textreparser/posttext.php rename to phpBB/phpbb/textreparser/post_text.php index 916fc94bfa..288bb0966b 100644 --- a/phpBB/phpbb/textreparser/posttext.php +++ b/phpBB/phpbb/textreparser/post_text.php @@ -13,7 +13,7 @@ namespace phpbb\textreparser; -class posttext extends base +class post_text extends base { /** * {@inheritdoc} diff --git a/tests/text_reparser/posttext_test.php b/tests/text_reparser/post_text_test.php similarity index 91% rename from tests/text_reparser/posttext_test.php rename to tests/text_reparser/post_text_test.php index 4dec53dc63..dc13cebf44 100644 --- a/tests/text_reparser/posttext_test.php +++ b/tests/text_reparser/post_text_test.php @@ -14,7 +14,7 @@ require_once __DIR__ . '/../../phpBB/includes/functions.php'; require_once __DIR__ . '/../../phpBB/includes/functions_content.php'; require_once __DIR__ . '/../test_framework/phpbb_database_test_case.php'; -class phpbb_textreparser_posttext_test extends phpbb_database_test_case +class phpbb_textreparser_post_text_test extends phpbb_database_test_case { public function setUp() { @@ -38,7 +38,7 @@ class phpbb_textreparser_posttext_test extends phpbb_database_test_case public function testReparse($min_id, $max_id, $expected) { $db = $this->new_dbal(); - $reparser = new \phpbb\textreparser\posttext($db); + $reparser = new \phpbb\textreparser\post_text($db); $reparser->reparse_range($min_id, $max_id); $sql = 'SELECT post_id, post_text FROM ' . POSTS_TABLE . "