diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 22:40:37 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 23:15:49 +0100 |
| commit | 677b5b2cd4937ee6c777728082084c661223dee8 (patch) | |
| tree | 4342890f46004943e15a2cfd8ccdd559619bb53c /tests/avatar | |
| parent | 93f61a4a7d34f8ad565bdc1605784284994ecdfc (diff) | |
| download | forums-677b5b2cd4937ee6c777728082084c661223dee8.tar forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.gz forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.bz2 forums-677b5b2cd4937ee6c777728082084c661223dee8.tar.xz forums-677b5b2cd4937ee6c777728082084c661223dee8.zip | |
[ticket/12620] Fix rebase
PHPBB3-12620
Diffstat (limited to 'tests/avatar')
| -rw-r--r-- | tests/avatar/driver/barfoo.php | 52 | ||||
| -rw-r--r-- | tests/avatar/driver/foobar.php | 52 |
2 files changed, 52 insertions, 52 deletions
diff --git a/tests/avatar/driver/barfoo.php b/tests/avatar/driver/barfoo.php index 0bf30b8a91..067bb3ef97 100644 --- a/tests/avatar/driver/barfoo.php +++ b/tests/avatar/driver/barfoo.php @@ -1,26 +1,26 @@ -<?php
-
-namespace phpbb\avatar\driver;
-
-class barfoo extends \phpbb\avatar\driver\driver
-{
- public function get_data($row)
- {
- return array();
- }
-
- public function prepare_form($request, $template, $user, $row, &$error)
- {
- return false;
- }
-
- public function process_form($request, $template, $user, $row, &$error)
- {
- return false;
- }
-
- public function get_template_name()
- {
- return 'barfoo.html';
- }
-}
+<?php + +namespace phpbb\avatar\driver; + +class barfoo extends \phpbb\avatar\driver\driver +{ + public function get_data($row) + { + return array(); + } + + public function prepare_form($request, $template, $user, $row, &$error) + { + return false; + } + + public function process_form($request, $template, $user, $row, &$error) + { + return false; + } + + public function get_template_name() + { + return 'barfoo.html'; + } +} diff --git a/tests/avatar/driver/foobar.php b/tests/avatar/driver/foobar.php index aabdaf5ac4..16d50ccad4 100644 --- a/tests/avatar/driver/foobar.php +++ b/tests/avatar/driver/foobar.php @@ -1,26 +1,26 @@ -<?php
-
-namespace phpbb\avatar\driver;
-
-class foobar extends \phpbb\avatar\driver\driver
-{
- public function get_data($row)
- {
- return array();
- }
-
- public function prepare_form($request, $template, $user, $row, &$error)
- {
- return false;
- }
-
- public function process_form($request, $template, $user, $row, &$error)
- {
- return false;
- }
-
- public function get_template_name()
- {
- return 'foobar.html';
- }
-}
+<?php + +namespace phpbb\avatar\driver; + +class foobar extends \phpbb\avatar\driver\driver +{ + public function get_data($row) + { + return array(); + } + + public function prepare_form($request, $template, $user, $row, &$error) + { + return false; + } + + public function process_form($request, $template, $user, $row, &$error) + { + return false; + } + + public function get_template_name() + { + return 'foobar.html'; + } +} |