diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-30 10:59:46 -0700 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-30 10:59:46 -0700 |
| commit | 0bd635f1b49242fc0fb6bf024e3755fc74638dc9 (patch) | |
| tree | a2b38b0c1438a320e33739b334709b22de93d4c4 /tests | |
| parent | c9b4f1211060516924c34dbb67dab25f425631cd (diff) | |
| parent | caf47f8e19da9e725702fe5a6c09f10be23dd473 (diff) | |
| download | forums-0bd635f1b49242fc0fb6bf024e3755fc74638dc9.tar forums-0bd635f1b49242fc0fb6bf024e3755fc74638dc9.tar.gz forums-0bd635f1b49242fc0fb6bf024e3755fc74638dc9.tar.bz2 forums-0bd635f1b49242fc0fb6bf024e3755fc74638dc9.tar.xz forums-0bd635f1b49242fc0fb6bf024e3755fc74638dc9.zip | |
Merge pull request #662 from imkingdavid/ticket/10586
[ticket/10586] Use an abstract class that implements the interface
Diffstat (limited to 'tests')
5 files changed, 9 insertions, 23 deletions
diff --git a/tests/functional/fixtures/ext/error/class/controller.php b/tests/functional/fixtures/ext/error/class/controller.php index eb2ae362a6..74bbbee540 100644 --- a/tests/functional/fixtures/ext/error/class/controller.php +++ b/tests/functional/fixtures/ext/error/class/controller.php @@ -1,13 +1,10 @@ <?php -class phpbb_ext_foobar_controller implements phpbb_extension_controller_interface +class phpbb_ext_foobar_controller extends phpbb_extension_controller { public function handle() { - global $template; - $template->set_ext_dir_prefix($phpbb_root_path . 'ext/error/class/'); - - $template->set_filenames(array( + $this->template->set_filenames(array( 'body' => 'index_body.html' )); diff --git a/tests/functional/fixtures/ext/error/classtype/controller.php b/tests/functional/fixtures/ext/error/classtype/controller.php index 2276548b55..55ac651bdf 100644 --- a/tests/functional/fixtures/ext/error/classtype/controller.php +++ b/tests/functional/fixtures/ext/error/classtype/controller.php @@ -5,8 +5,6 @@ class phpbb_ext_error_classtype_controller public function handle() { global $template; - $template->set_ext_dir_prefix($phpbb_root_path . 'ext/error/classtype/'); - $template->set_filenames(array( 'body' => 'index_body.html' )); diff --git a/tests/functional/fixtures/ext/error/disabled/controller.php b/tests/functional/fixtures/ext/error/disabled/controller.php index b83a949020..57b913f377 100644 --- a/tests/functional/fixtures/ext/error/disabled/controller.php +++ b/tests/functional/fixtures/ext/error/disabled/controller.php @@ -1,13 +1,10 @@ <?php -class phpbb_ext_error_disabled_controller implements phpbb_extension_controller_interface +class phpbb_ext_error_disabled_controller extends phpbb_extension_controller { public function handle() - { - global $template; - $template->set_ext_dir_prefix($phpbb_root_path . 'ext/error/disabled/'); - - $template->set_filenames(array( + { + $this->template->set_filenames(array( 'body' => 'index_body.html' )); diff --git a/tests/functional/fixtures/ext/foo/bar/controller.php b/tests/functional/fixtures/ext/foo/bar/controller.php index 24d218c412..3375e317b3 100644 --- a/tests/functional/fixtures/ext/foo/bar/controller.php +++ b/tests/functional/fixtures/ext/foo/bar/controller.php @@ -1,13 +1,10 @@ <?php -class phpbb_ext_foo_bar_controller implements phpbb_extension_controller_interface +class phpbb_ext_foo_bar_controller extends phpbb_extension_controller { public function handle() { - global $template; - $template->set_ext_dir_prefix($phpbb_root_path . 'ext/foo/bar/'); - - $template->set_filenames(array( + $this->template->set_filenames(array( 'body' => 'foobar_body.html' )); diff --git a/tests/functional/fixtures/ext/foobar/controller.php b/tests/functional/fixtures/ext/foobar/controller.php index bf8d8139ae..ff35f12ee0 100644 --- a/tests/functional/fixtures/ext/foobar/controller.php +++ b/tests/functional/fixtures/ext/foobar/controller.php @@ -1,13 +1,10 @@ <?php -class phpbb_ext_foobar_controller implements phpbb_extension_controller_interface +class phpbb_ext_foobar_controller extends phpbb_extension_controller { public function handle() { - global $template; - $template->set_ext_dir_prefix($phpbb_root_path . 'ext/foobar/'); - - $template->set_filenames(array( + $this->template->set_filenames(array( 'body' => 'foobar_body.html' )); |