Commit graph

15198 commits

Author SHA1 Message Date
Oleg Pudeyev
0916dc14ef Merge PR #1119 branch 'develop-olympus' into develop
While merging into develop, also move self::$config['table_prefix']
initialization into setup before class from install_board, as
install_board is only called to install the board and not for each test case.

* develop-olympus:
  [ticket/10491] Make recreate_database static.
  [ticket/10491] Install board once per test run.
  [ticket/10491] Move board installation into setup before class.
  [ticket/10491] Set up functional tests sensibly.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2012-12-13 03:39:47 -05:00
Oleg Pudeyev
a4e4841082 Merge PR #1119 branch 'p/ticket/10491' into develop-olympus
* p/ticket/10491:
  [ticket/10491] Make recreate_database static.
  [ticket/10491] Install board once per test run.
  [ticket/10491] Move board installation into setup before class.
  [ticket/10491] Set up functional tests sensibly.
2012-12-13 03:11:07 -05:00
Oleg Pudeyev
a686910958 [ticket/11162] Reformat.
PHPBB3-11162
2012-12-13 03:07:25 -05:00
Oleg Pudeyev
1441b70ae8 [ticket/10491] Make recreate_database static.
PHPBB3-10491
2012-12-12 21:47:48 -05:00
Oleg Pudeyev
e2c67a8e42 [ticket/11162] Rename tricky updates to database helper.
PHPBB3-11162
2012-12-12 21:46:38 -05:00
Oleg Pudeyev
5da78cae09 Merge PR #985 branch 'imkingdavid/ticket/11088' into develop
* imkingdavid/ticket/11088:
  [ticket/11088] Pass required objects in as arguments
  [ticket/11088] Globalize objects in new permission function
  [ticket/11088] Move permission creation to a function
  [ticket/11088] Copy a_styles permission for a_extensions
  [ticket/11088] Remove extraneous word from sentence in comment
  [ticket/11088] Changed "file extensions" to "attachment extensions"
  [ticket/11088] Fix the database updater to correctly manipulate the modules
  [ticket/11088] Put language pack module move below extension module creation
  [ticket/11088] Untested, progress on update script
  [ticket/11088] Fix typo (period instead of comma)
  [ticket/11088] Untested progress for update script
  [ticket/11088] Added missing comma
  [ticket/11088] Removed added space
  [ticket/11088] Move style, extension and language pack management to customise
2012-12-12 21:01:20 -05:00
David King
a5783211c9 [ticket/11088] Pass required objects in as arguments
PHPBB3-11088
2012-12-12 20:19:06 -05:00
David King
5fc6752178 [ticket/11088] Globalize objects in new permission function
PHPBB3-11088
2012-12-12 20:04:20 -05:00
David King
13f8e64a33 [ticket/11088] Move permission creation to a function
PHPBB3-11088
2012-12-12 20:01:58 -05:00
David King
8e4c1526fc [ticket/11088] Copy a_styles permission for a_extensions
PHPBB3-11088
2012-12-12 19:39:48 -05:00
David King
61adfa5026 [ticket/11088] Remove extraneous word from sentence in comment
PHPBB3-11088
2012-12-12 19:37:39 -05:00
David King
6dc89d6e31 [ticket/11088] Changed "file extensions" to "attachment extensions"
PHPBB3-11088
2012-12-12 19:36:52 -05:00
Nathaniel Guse
ffd531e4fd [ticket/11103] Revert changes to constants.php from my IDE
Readd a blank line at the end of the file

PHPBB3-11103
2012-12-12 16:33:30 -06:00
Nathaniel Guse
7ae5b62fc6 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 2012-12-12 16:30:50 -06:00
David King
70aea6fd7c [ticket/11088] Fix the database updater to correctly manipulate the modules
PHPBB3-11088
2012-12-12 12:48:27 -05:00
David King
80f68c358f [ticket/11088] Put language pack module move below extension module creation
PHPBB3-11088
2012-12-12 11:40:47 -05:00
David King
30c64f6a01 [ticket/11088] Untested, progress on update script
This should rename Styles category to Customise, move language packs, and add extension management

PHPBB3-11088
2012-12-12 11:40:46 -05:00
David King
72d1a210de [ticket/11088] Fix typo (period instead of comma)
PHPBB3-11088
2012-12-12 11:40:43 -05:00
David King
e58c6536f0 [ticket/11088] Untested progress for update script
PHPBB3-11088
2012-12-12 11:39:17 -05:00
David King
e2aef2bfd1 [ticket/11088] Added missing comma
PHPBB3-11088
2012-12-12 11:39:16 -05:00
David King
f7d9b15a97 [ticket/11088] Removed added space
PHPBB3-11088
2012-12-12 11:39:15 -05:00
David King
4980d8b011 [ticket/11088] Move style, extension and language pack management to customise
Instead of being separated, these related ACP modules are now grouped
intuitively.

PHPBB3-11088
2012-12-12 11:39:14 -05:00
Nathan Guse
9420647c43 Merge remote-tracking branch 'remotes/imkingdavid/ticket/11243' into develop 2012-12-11 12:24:28 -06:00
David King
53c4a328a6 [ticket/11243] Show download all link on all pages of topic with attachments
PHPBB3-11243
2012-12-11 11:42:34 -05:00
David King
2212294ba3 Merge remote-tracking branch 'p/feature/template-events' into develop
* p/feature/template-events:
  [feature/template-events] Pass arguments in correct order.

Conflicts:
	phpBB/includes/style/style.php
2012-12-10 14:27:18 -05:00
David King
a9db155c28 Merge remote-tracking branch 'p/feature/template-events' into develop
# By Oleg Pudeyev (36) and others
# Via Oleg Pudeyev
* p/feature/template-events: (47 commits)
  [feature/template-events] Pass arguments in correct order.
  [feature/template-events] Order extensions in mock extension manager.
  [feature/template-events] Changes per imkingdavid's review.
  [feature/template-events] Make style names private on template.
  [feature/template-events] Test for event that is defined in parent style only.
  [feature/template-events] Specify style names, add inheritance tests.
  [feature/template-events] Normalize expected directory trees.
  [feature/template-events] Allow dataset to be correctly selectable.
  [feature/template-events] Dataset for template event testing with inheritance.
  [feature/template-events] Use style names array in template filter.
  [feature/template-events] Generate style names array in set_style.
  [feature/template-events] Convert a single style name to array of them.
  [feature/template-events] Chase dependency injection for template context.
  [feature/template-events] Adjust template events test to use the dataset.
  [feature/template-events] Create a dataset for template event tests.
  [feature/template-events] Indentation fix.
  [feature/template-events] Cosmetic changes.
  [feature/template-events] Wording: wrongly -> improperly.
  [feature/template-events] Indentation fix.
  [feature/template-events] Rename template_name to style_name.
  ...
2012-12-10 14:09:10 -05:00
Oleg Pudeyev
a0211ff2eb [feature/template-events] Pass arguments in correct order.
Thank you imkingdavid.

PHPBB3-9550
2012-12-10 14:02:57 -05:00
Oleg Pudeyev
0446886f91 [feature/template-events] Pass arguments in correct order.
Thank you imkingdavid.

PHPBB3-9550
2012-12-10 13:35:15 -05:00
Oleg Pudeyev
2bc2cb1f6f [ticket/10491] Install board once per test run.
This is how things used to be. Installing for each test class brings
3-4x performance penalty compared to installing once for the entire
test run. However, with a single installation for all tests an
individual test can see different data when it is invoked by itself
vs when it is executed as part of the entire test suite.

PHPBB3-10491
2012-12-10 06:42:43 -05:00
Oleg Pudeyev
eaa0319867 Merge PR #1125 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users

Conflicts:
	tests/mock/cache.php
	tests/test_framework/phpbb_functional_test_case.php
2012-12-10 06:25:51 -05:00
Oleg Pudeyev
3c542b852a Merge PR #1125 branch 'p/ticket/10972' into develop-olympus
* p/ticket/10972:
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users
2012-12-10 06:04:24 -05:00
Nathan Guse
84284a9cce [ticket/11103] Use scope: prototype
This lets us clean up the mess that was in load_object(), but requires
scope: prototype to be added to the service definitions for all types
or methods!

PHPBB3-11103
2012-12-09 13:43:06 -06:00
Nathan Guse
357a4facf6 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/includes/functions.php
2012-12-09 13:24:43 -06:00
Igor Wiedler
3fe381eed5 Merge remote-tracking branch 'exreaction/ticket/11257' into develop
* exreaction/ticket/11257:
  [ticket/11257] Do not require set_name() method to exist
2012-12-09 19:02:04 +01:00
Nathan Guse
37565f37e4 [ticket/11103] Some improvements to the user loader
PHPBB3-11103
2012-12-08 18:40:41 -06:00
Nathan Guse
53decec6e3 Merge branch 'ticket/11257' of github.com:EXreaction/phpbb3 into ticket/11103 2012-12-08 17:33:40 -06:00
Nathan Guse
c0534f9e5d [ticket/11103] User Loader constructor docs
PHPBB3-11103
2012-12-08 14:28:38 -06:00
Nathan Guse
0d6c8f46ff [ticket/11103] Update indexes on notifications/user notifications tables
PHPBB3-11103
2012-12-08 14:12:25 -06:00
Nathan Guse
2227ceab8b [ticket/11103] Use $request->variable rather than request_var
PHPBB3-11103
2012-12-08 13:56:39 -06:00
Nathan Guse
6b7443adac [ticket/11103] User loader test.bat
PHPBB3-11103
2012-12-08 13:41:44 -06:00
Nathan Guse
b91ba8d5f1 [ticket/11103] Newlines at end of files
PHPBB3-11103
2012-12-08 13:20:14 -06:00
Andreas Fischer
bd987b6e14 Merge remote-tracking branch 'p/ticket/11095-develop' into develop
* p/ticket/11095-develop:
  [ticket/11095] Restore brace on previous line.
  [ticket/11095] Docs and tests for phpbb_build_hidden_fields_for_query_params.
  [ticket/11095] Forward GET parameters into hidden fields for jumpbox.
  [ticket/11095] Python quoteattr port.
  [ticket/11095] Use get method in jumpboxes.
2012-12-08 16:14:42 +01:00
Andreas Fischer
f043b14f79 Merge remote-tracking branch 'p/ticket/11255' into develop
* p/ticket/11255:
  [ticket/11255] Change search tests to use mock cache.
  [ticket/11255] Fix dbal write sequence test to run standalone.
2012-12-08 14:11:34 +01:00
Nathan Guse
8a28271dd5 [ticket/11257] Do not require set_name() method to exist
To use Service Collection

PHPBB3-11257
2012-12-07 21:25:42 -06:00
Nathan Guse
0042f07147 Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-12-07 21:14:39 -06:00
Andreas Fischer
b7b8fefdd0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10205] Reduce nesting in mysql drivers.
  [ticket/10205] Rewrite _sql_error implementations to have a single return.
  [ticket/10205] Cosmetic changes.
  [ticket/10205] Add some columns to the empty fixture file for mssqlnative.
  [ticket/10205] Delete stray return.
  [ticket/10205] Test failed connection attempts.
  [ticket/10205] Check for function existence in mssql connect method.
  [ticket/10205] Convert mssqlnative driver to the same logic.
  [ticket/10205] Fix a parse error in oracle driver.
  [ticket/10205] Fix remaining db drivers.
  [ticket/10205] Avoid calling mysqli functions when mysqli is missing.
  [ticket/10205] Account for potentially missing extensions in dbal.

Conflicts:
	tests/fixtures/empty.xml
2012-12-08 03:08:21 +01:00
Andreas Fischer
b5f94a14f1 Merge remote-tracking branch 'p/ticket/10205' into develop-olympus
* p/ticket/10205:
  [ticket/10205] Reduce nesting in mysql drivers.
  [ticket/10205] Rewrite _sql_error implementations to have a single return.
  [ticket/10205] Cosmetic changes.
  [ticket/10205] Add some columns to the empty fixture file for mssqlnative.
  [ticket/10205] Delete stray return.
  [ticket/10205] Test failed connection attempts.
  [ticket/10205] Check for function existence in mssql connect method.
  [ticket/10205] Convert mssqlnative driver to the same logic.
  [ticket/10205] Fix a parse error in oracle driver.
  [ticket/10205] Fix remaining db drivers.
  [ticket/10205] Avoid calling mysqli functions when mysqli is missing.
  [ticket/10205] Account for potentially missing extensions in dbal.
2012-12-08 03:04:05 +01:00
Oleg Pudeyev
ebc15a8b6c Merge PR #1127 branch 'igorw/ticket/11256' into develop
* igorw/ticket/11256:
  [ticket/11256] Remove unused controller.provider service
  [ticket/11256] Remove unused service with non-existent class
2012-12-07 20:35:18 -05:00
Igor Wiedler
2973539760 [ticket/11256] Remove unused controller.provider service
PHPBB3-11256
2012-12-07 23:18:38 +01:00
Igor Wiedler
cf956e8f53 [ticket/11256] Remove unused service with non-existent class
PHPBB3-11256
2012-12-07 23:14:07 +01:00