1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

16086 Commits

Author SHA1 Message Date
Marc Alexander
6a1fa3e0f4 [ticket/11465] Add comments explaining the tests
PHPBB3-11465
2013-05-10 13:54:15 +02:00
Marc Alexander
7240759e34 [ticket/11465] Check if class exists before including info file
PHPBB3-11465
2013-04-14 17:25:45 +02:00
Joas Schilling
bc423f0d97 [ticket/11465] Correctly set the root path for the test
PHPBB3-11465
2013-04-10 13:11:13 +02:00
Joas Schilling
78bcc31a5d [ticket/11465] The info file does not have _info suffix
PHPBB3-11465
2013-04-10 13:08:31 +02:00
Joas Schilling
6110380a35 [ticket/11465] Add phpBB module to test
PHPBB3-11465
2013-04-10 13:07:25 +02:00
Marc Alexander
11477a3f18 [ticket/11465] Move require_once() in unit test to the top of the file
PHPBB3-11465
2013-03-22 16:54:11 +01:00
Marc Alexander
fadcee77b9 [ticket/11465] Add unit tests for acp_modules::get_module_infos()
The tests add 3 different modules. One acp module that should be found
(acp/a_module), one acp module that should not be found (acp/fail_module),
and one mcp module that should work again (mcp/a_module). The modules'
info files had to be included as they were not auto-loaded for some
reason.
There are several test stages. First of, it is tested if the correct mcp
and acp module is returned. Afterwards, the proper loading of specified
modules is tested. One with an existing module and one with a not existing
module. Finally, the test concludes with trying to get the module info of
not existing ucp modules. Other classes like foobar would have also worked
for that check but I decided to use the ucp type of class as that is the
one type missing from the added test modules.

PHPBB3-11465
2013-03-22 10:26:01 +01:00
Marc Alexander
aefca4b40f [ticket/11465] Use extension finder when adding extensions' acp modules
The method acp_modules::get_module_infos() needs to use the extension
finder whenever it is looking for a module's info file. While
transitioning to the new extension system, only the initial search for all
module info files was changed to the new system. Due to this it is not
possible to add an extension's acp/mcp/ucp module manually in the ACP.
This patch will always use the extension finder for the acp module's info
files and therefore properly find the needed file. Additionally, the code
has been cleaned up a little bit.

PHPBB3-11465
2013-03-21 14:59:53 +01:00
Oleg Pudeyev
8b464e87f0 Merge PR #1298 branch 'nickvergessen/ticket/11438' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11438:
  [ticket/11438] Add spaces after # comment start and before \ line breaks
  [ticket/11438] Add helpful comments from sample config to ACP output
  [ticket/11438] Add empty sql_query_pre to delta-source
  [ticket/11438] Move backslash to concatenate the query strings correctly
  [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
2013-03-20 11:43:14 -04:00
Joas Schilling
b51a66b60b Merge remote-tracking branch 'bantu/ticket/11457' into develop
* bantu/ticket/11457:
  [ticket/11457] Remove check and include for set_var function. It's not used.
2013-03-18 13:51:30 +01:00
Joas Schilling
99d0c7e62b Merge remote-tracking branch 'bantu/ticket/11455' into develop
* bantu/ticket/11455:
  [ticket/11455] Restore alphabetic order (underscore first) in config/tables.yml
2013-03-18 10:42:51 +01:00
Andreas Fischer
3c99a33e87 [ticket/11457] Remove check and include for set_var function. It's not used.
PHPBB3-11457
2013-03-17 18:58:43 +01:00
Andreas Fischer
76262f186f [ticket/11455] Restore alphabetic order (underscore first) in config/tables.yml
PHPBB3-11455
2013-03-17 18:31:49 +01:00
Andreas Fischer
51c1ba12c1 Merge remote-tracking branch 'nickvergessen/ticket/11443' into develop
* nickvergessen/ticket/11443:
  [ticket/11443] Fix Migrator Modules Tool by creating a phpbb_log object
  [ticket/11443] Add _test suffix to migration test filenames
2013-03-16 01:44:36 +01:00
Joas Schilling
4168cfd7e6 [ticket/11443] Fix Migrator Modules Tool by creating a phpbb_log object
PHPBB3-11443
2013-03-16 01:24:50 +01:00
Joas Schilling
c50af28077 [ticket/11438] Add spaces after # comment start and before \ line breaks
PHPBB3-11438
2013-03-16 01:18:15 +01:00
Joas Schilling
afd3681208 Merge remote-tracking branch 'bantu/ticket/11441' into develop
* bantu/ticket/11441:
  [ticket/11441] Split user loader tests into multiple test methods.
  [ticket/11441] Use setUp() in phpbb_user_loader_test.
  [ticket/11441] Update/correct copyright year of user loader test.
  [ticket/11441] Correct/fix class name of user loader test.
  [ticket/11441] Add _test prefix to user loader test filename.
2013-03-15 19:06:54 +01:00
Joas Schilling
02fd181198 Merge remote-tracking branch 'bantu/ticket/11439' into develop
* bantu/ticket/11439:
  [ticket/11439] Add _test suffix to notification test filename.
2013-03-15 10:31:59 +01:00
Joas Schilling
2cd1c62403 [ticket/11443] Add _test suffix to migration test filenames
PHPBB3-11443
2013-03-15 10:23:14 +01:00
Andreas Fischer
15cade3dc5 [ticket/11439] Add _test suffix to notification test filename.
PHPBB3-11439
2013-03-15 10:21:09 +01:00
Joas Schilling
2b2bbf787c [ticket/11438] Add helpful comments from sample config to ACP output
PHPBB3-11438
2013-03-15 08:23:39 +01:00
Joas Schilling
ef63c2db8b [ticket/11438] Add empty sql_query_pre to delta-source
PHPBB3-11438
2013-03-15 08:19:50 +01:00
Joas Schilling
8fe776dff7 [ticket/11438] Move backslash to concatenate the query strings correctly
Was broken in 03d2c6413c25b1faf7f37ff20625ce986b19eb88

PHPBB3-11438
2013-03-15 08:16:37 +01:00
Joas Schilling
dc7afd05eb [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
PHPBB3-11438
2013-03-15 08:06:45 +01:00
Andreas Fischer
ba460d98f1 [ticket/11441] Split user loader tests into multiple test methods.
PHPBB3-11441
2013-03-15 01:36:05 +01:00
Andreas Fischer
ef1caf6933 [ticket/11441] Use setUp() in phpbb_user_loader_test.
PHPBB3-11441
2013-03-15 01:32:33 +01:00
Andreas Fischer
e1e9138c3b [ticket/11441] Update/correct copyright year of user loader test.
PHPBB3-11441
2013-03-15 01:28:27 +01:00
Andreas Fischer
3c09612d36 [ticket/11441] Correct/fix class name of user loader test.
PHPBB3-11441
2013-03-15 01:26:26 +01:00
Andreas Fischer
eabcbb9baf [ticket/11441] Add _test prefix to user loader test filename.
PHPBB3-11441
2013-03-15 01:25:10 +01:00
Nathan Guse
d4ee7718b9 Merge remote-tracking branch 'remotes/Marc/ticket/11404' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11404:
  [ticket/11404] Remove version ID from manager_test.php file header
  [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
  [ticket/11404] Convert manager_test to UNIX line endings
  [ticket/11404] Use a default data row if $row is empty in clean_row()
  [ticket/11404] Return empty array of avatar data if $row is empty
2013-03-12 14:48:07 -05:00
Nathan Guse
739dbd9e31 Merge remote-tracking branch 'remotes/Marc/ticket/11433' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11433:
  [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
2013-03-12 14:41:54 -05:00
Nathan Guse
04aceaecb6 Merge remote-tracking branch 'remotes/nickv/ticket/11310' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11310:
  [ticket/11310] Add hashes to action links to prevent CSRF attacks
2013-03-12 11:41:21 -05:00
Joas Schilling
5eef287646 [ticket/11310] Add hashes to action links to prevent CSRF attacks
PHPBB3-11310
2013-03-12 17:19:30 +01:00
Marc Alexander
d378f5ac32 [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
This missing change caused the loading info to appear during ajax
requests. With this patch it will be properly hidden as it should.

PHPBB3-11433
2013-03-12 15:15:21 +01:00
Marc Alexander
4ad8fcbd58 [ticket/11404] Remove version ID from manager_test.php file header
PHPBB3-11404
2013-03-11 10:35:18 +01:00
Marc Alexander
fb1984dadb [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
PHPBB3-11404
2013-03-11 10:34:25 +01:00
Marc Alexander
2ec0dc5b34 [ticket/11404] Convert manager_test to UNIX line endings
PHPBB3-11404
2013-03-11 10:34:12 +01:00
Nathaniel Guse
d6930df7a2 Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into develop
# By Dhruv
# Via Dhruv
* remotes/dhruv/ticket/11303:
  [ticket/11303] rename attribute to timezone-preselect
  [ticket/11303] remove additional brackets
  [ticket/11303] use S_TZ_PRESELECT in subsilver
  [ticket/11303] add S_TZ_PRESELECT template var
2013-03-09 19:08:51 -06:00
Nathaniel Guse
3f5d938a95 Merge remote-tracking branch 'remotes/marc/ticket/11323' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/11323:
  [ticket/11323] Reduce additional code and revert regex to previous one
  [ticket/11323] Enable tests for inclusion of defined variables
  [ticket/11323] Correctly treat variables in template defines
2013-03-09 19:02:44 -06:00
Nathaniel Guse
48bad80f4a Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into develop
# By OpenShift guest
# Via OpenShift guest
* remotes/Blitze/ticket/11383:
  [ticket/11383] Correctly revert modules added/removed by migrator
2013-03-09 18:33:19 -06:00
David King
606e392d40 Merge remote-tracking branch 'EXreaction/ticket/11423' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11423:
  [ticket/11423] Send unformatted usernames to the email template
2013-03-09 18:38:05 -05:00
Nathaniel Guse
36de18e174 [ticket/11423] Send unformatted usernames to the email template
PHPBB3-11423
2013-03-09 09:12:46 -06:00
Nathan Guse
7bb32d27ac Merge remote-tracking branch 'remotes/nickv/ticket/11421' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11421:
  [ticket/11421] Correctly display submit button when needed
2013-03-07 11:33:33 -06:00
Nathan Guse
683e17c403 Merge remote-tracking branch 'remotes/nickv/ticket/11417' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11417:
  [ticket/11417] FIx submit button description on notifications options page
2013-03-07 11:33:02 -06:00
Nathan Guse
e826edb6fe Merge remote-tracking branch 'remotes/nickv/ticket/11390' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11390:
  [ticket/11390] Correctly separate list of notifications from header
  [ticket/11390] Hide pagination when there are no notifications
2013-03-07 11:32:17 -06:00
Nathan Guse
0c8c8484d0 Merge remote-tracking branch 'remotes/nickv/ticket/11407' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11407:
  [ticket/11407] Fix <dfn> description of "notification" option.
2013-03-07 11:31:29 -06:00
Marc Alexander
bb58462724 [ticket/11404] Use a default data row if $row is empty in clean_row()
A statically defined $default_row will be used inside the
phpbb_avatar_manager::clean_row() method if the $row passed to it is
empty.

PHPBB3-11404
2013-03-07 13:03:27 +01:00
Joas Schilling
d219eafa16 [ticket/11407] Fix <dfn> description of "notification" option.
PHPBB3-11407
2013-03-07 12:18:53 +01:00
Joas Schilling
7ac945358e [ticket/11390] Correctly separate list of notifications from header
PHPBB3-11390
2013-03-07 11:39:55 +01:00
Joas Schilling
899d857929 [ticket/11390] Hide pagination when there are no notifications
PHPBB3-11390
2013-03-07 11:39:33 +01:00