Commit graph

16058 commits

Author SHA1 Message Date
Joas Schilling
c7ae790d16 [ticket/10714] Remove type hinting to allow the usage of mocks in tests
PHPBB3-10714
2012-12-11 10:25:38 +01:00
Joas Schilling
f4bc9c1673 [ticket/10714] Fix dependency injections in unit tests with mocks
PHPBB3-10714
2012-12-11 10:24:49 +01:00
Nathan Guse
61391f648c [ticket/11259] htmlspecialchars($phpbb_admin_path)
PHPBB3-11259
2012-12-10 21:16:08 -06: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
30de17f69f [ticket/11259] adm_relative_path -> phpbb_adm_relative_path
We can assume they properly format their config settings, right?

PHPBB3-11259
2012-12-09 19:29:51 -06:00
Nathan Guse
bff76f9ca8 [ticket/11259] Also make adm_relative_path available in the container
PHPBB3-11259
2012-12-09 17:05:12 -06:00
Nathan Guse
6dee253941 [ticket/11259] Make phpbb_admin_path available everywhere
PHPBB3-11259
2012-12-09 17:01:08 -06:00
Joas Schilling
83b8b65016 [ticket/10714] Use dependencies instead of globals
We use a setter for the admin root path, as it is not defined all the time.
Aswell as we added a setter for the table name, so it can still be used
for custom tables.

PHPBB3-10714
2012-12-09 23:47:46 +01:00
Marc Alexander
1aae72961a Merge branch 'develop' into feature/avatars
Conflicts:
	phpBB/install/database_update.php
2012-12-09 21:02:31 +01: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
Marc Alexander
26bde05a30 [feature/avatars] Call set_name() method in avatars.yml
This is needed after 8a28271d was merged.

PHPBB3-10018
2012-12-09 19:42:50 +01: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
Oleg Pudeyev
03d2c6413c [ticket/11248] Convert line endings to LF - develop edition.
PHPBB3-11248
2012-12-07 21:57:33 -05: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
Igor Wiedler
b0b5a13131 Merge pull request #18 from p/ticket/11015
Ticket/11015
2012-12-07 13:31:37 -08:00
Oleg Pudeyev
5af3d14af3 [ticket/11255] Change search tests to use mock cache.
PHPBB3-11255
2012-12-07 15:32:26 -05:00
Oleg Pudeyev
5b368dd53a [ticket/11255] Fix dbal write sequence test to run standalone.
PHPBB3-11255
2012-12-07 15:32:06 -05:00
Igor Wiedler
108a6c35a6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11248] Line endings to LF.

Conflicts:
	tests/session/append_sid_test.php
2012-12-07 19:13:42 +01:00
Igor Wiedler
a8deb7f87b Merge remote-tracking branch 'p/ticket/11248' into develop-olympus
* p/ticket/11248:
  [ticket/11248] Line endings to LF.
2012-12-07 19:09:12 +01:00
Joas Schilling
7f1b0eeb71 [ticket/10714] Compare log_type to false, rather then null
PHPBB3-10714
2012-12-07 16:28:46 +01:00
Joas Schilling
0f94ff9138 [ticket/10714] Add global variables for the unit tests
PHPBB3-10714
2012-12-07 16:05:57 +01:00
Bruno Ais
9eecaa21e3 [ticket/11171] Moved the DB schema changes to its place
Moved the db changes schema to the place where all the other
schema changes are.

PHPBB3-11171
2012-12-07 15:05:07 +00:00
Joas Schilling
37530abd39 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (645 commits)
  [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
  [ticket/10679] Use module_auth to limit access to the module
  [ticket/10679] Add new permission for changing profile field information
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP
  [ticket/11247] Fix wrong property reference in flock class.
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
  [ticket/10716] Collect standard error from executed php process.
  [ticket/10716] Skip test if php is not in PATH.
  [ticket/10716] Exclude our dependencies from linting.
  [ticket/10103] New and improved wording.
  [ticket/10716] Only lint on php 5.3+.
  [ticket/10103] Assert with messages.
  [ticket/10103] assertLessThan/assertGreaterThan.
  ...
2012-12-07 15:50:24 +01:00
Joas Schilling
70d23380aa [ticket/10714] Rely on global instead of creating an instance
PHPBB3-10714
2012-12-07 15:11:56 +01:00
Joas Schilling
5213ee1829 [ticket/10714] Make attributed protected rather then private
PHPBB3-10714
2012-12-07 14:39:57 +01:00
Oleg Pudeyev
b0948fb347 Merge PR #607 branch 'nickvergessen/ticket/10679' into develop
* nickvergessen/ticket/10679:
  [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
  [ticket/10679] Use module_auth to limit access to the module
  [ticket/10679] Add new permission for changing profile field information
2012-12-07 08:32:13 -05:00
Joas Schilling
c23d2457e9 [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
PHPBB3-10679
2012-12-07 12:50:21 +01:00
Bruno Ais
73971ef0fa [ticket/11171] Cleanup of leftovers
I didn't notice that there were actually leftovers from the other
PR. Anyway, this will remove all the leftovers I noticed from the
other PR.

PHPBB3-11171
2012-12-07 08:53:17 +00:00