1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-27 13:40:28 +01:00
Commit Graph

754 Commits

Author SHA1 Message Date
Nathan Guse
61aa53f91a Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/config/services.yml
	phpBB/index.php
2012-11-20 23:19:51 -06:00
Nathan Guse
2afb8b9df8 [ticket/11103] Create user loader class, update for DIC
Create a very basic user loader class to handle querying/storing
user data in a centralized location.

Use DIC collection service for notification types/methods.

Cleanup unused dependencies.

Fix some other issues.

PHPBB3-11103
2012-11-20 22:54:16 -06:00
Igor Wiedler
b453f359ff Merge remote-tracking branch 'imkingdavid/feature/controller-new' into develop
* imkingdavid/feature/controller-new: (67 commits)
  [feature/controller] Fix misnamed route for functional test
  [feature/controller] Fix comments, check against more general HttpException
  [feature/controller] Check for proper status codes from controllers
  [feature/controller] Correctly create Symfony object from globals
  [feature/controller] Add documentation about input being HTML-escaped
  [feature/controller] Create Symfony Request in new function
  [feature/controller] Remove unused language strings
  [feature/controller] Don't use $user->lang() before container compilation
  [feature/controller] Update routing documentation for using query string
  [feature/controller] Remove now-unused code
  [feature/controller] Remove url rewriting until we use pathinfo in controllers
  [feature/controller] Fix functional tests to use query string for controllers
  [feature/controller] Allow injecting Symfony Request into controllers
  [feature/controller] Use query string, not path info, for controller access
  [feature/controller] Fix line endings and permissions, and check responses
  [feature/controller] Remove URL rewriting by default
  [feature/controller] Add controller functional test with template
  [feature/controller] Use warning instead of echo for copy() and unlink()
  [feature/controller] Flip method parameters, require $message
  [feature/controller] Rename $root_path class property to $phpbb_root_path
  ...
2012-11-19 22:28:12 +01:00
David King
305f41cf1a [feature/controller] Fix misnamed route for functional test
PHPBB3-10864
2012-11-19 13:16:55 -05:00
David King
01ec608593 [feature/controller] Fix comments, check against more general HttpException
PHPBB3-10864
2012-11-19 12:55:15 -05:00
David King
f8614bfc84 [feature/controller] Check for proper status codes from controllers
PHPBB3-10864
2012-11-19 12:37:20 -05:00
David King
7a3d9ed85d [feature/controller] Fix functional tests to use query string for controllers
PHPBB3-10864
2012-11-18 13:11:24 -05:00
Igor Wiedler
b5e069f879 Merge remote-tracking branch 'p/ticket/10933' into develop
* p/ticket/10933:
  [ticket/10933] Prose for get_first_file_location.
  [ticket/10933] Remaining documentation for added functions in resource locator
  [ticket/10933] Update template locator test to use style resource locator.
  [ticket/10933] Dispose of locate function in template class.
  [ticket/10933] Add mutators for template_path to style resource locator.
  [ticket/10933] Delete template_path assignment.
  [ticket/10933] Delete template_path from template class.
  [ticket/10933] Add get_first_template_location.
2012-11-17 19:49:03 +01:00
David King
4efbb893b7 [feature/controller] Fix line endings and permissions, and check responses
PHPBB3-10864
2012-11-16 17:36:39 -05:00
David King
5b013ddf5c [feature/controller] Add controller functional test with template
PHPBB3-10864
2012-11-16 17:06:01 -05:00
David King
ba1acdca03 [feature/controller] Use warning instead of echo for copy() and unlink()
PHPBB3-10864
2012-11-16 17:06:00 -05:00
David King
0c75d3d7da [feature/controller] Add test for missing argument in controller class
PHPBB3-10864
2012-11-16 17:05:57 -05:00
David King
230897723c [feature/controller] Reword comment for clarification
PHPBB3-10864
2012-11-16 17:05:57 -05:00
David King
e516680859 [feature/controller] Use sizeof() instead of count() as per guidelines
PHPBB3-10864
2012-11-16 17:05:56 -05:00
David King
7691755883 [feature/controller] Adapt functional tests given new controller framework
PHPBB3-10864
2012-11-16 17:05:54 -05:00
David King
a87a5dd566 [feature/controller] Fix tests
PHPBB3-10864
2012-11-16 17:05:53 -05:00
David King
46cb0fb068 [feature/controller] Removed another empty construct method
PHPBB3-10864
2012-11-16 16:47:32 -05:00
David King
1c5a82c411 [feature/controller] Remove empty __construct() method
PHPBB3-10864
2012-11-16 16:47:27 -05:00
David King
79bcbd3691 [feature/controller] Add _controller attribute to Request after instantiation
PHPBB3-10864
2012-11-16 16:47:26 -05:00
David King
06158693c7 [feature/controller] Implement a front controller
PHPBB3-10864
2012-11-16 16:25:09 -05:00
Oleg Pudeyev
1a2dfa6d4c Merge PR #1074 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11192] Merge dataProvider arrays because the test is the same now.
  [ticket/11192] Update $value parameter description to support other types.
  [ticket/11192] Mark negative byte numbers as unsupported.
  [ticket/11192] Test strings not converted to int/float before.
  [ticket/11192] Also test strings, e.g. sums returned by the database.
  [ticket/11192] Also test powers of 10 / 1000.
  [ticket/11192] Add tests.
  [ticket/11192] Add Tebibyte to get_formatted_filesize().
2012-11-16 10:29:22 -05:00
Oleg Pudeyev
af5d8b502e Merge PR #1074 branch 'bantu/ticket/11192' into develop-olympus
* bantu/ticket/11192:
  [ticket/11192] Merge dataProvider arrays because the test is the same now.
  [ticket/11192] Update $value parameter description to support other types.
  [ticket/11192] Mark negative byte numbers as unsupported.
  [ticket/11192] Test strings not converted to int/float before.
  [ticket/11192] Also test strings, e.g. sums returned by the database.
  [ticket/11192] Also test powers of 10 / 1000.
  [ticket/11192] Add tests.
  [ticket/11192] Add Tebibyte to get_formatted_filesize().
2012-11-16 10:25:06 -05:00
Andreas Fischer
8851f9589a [ticket/11192] Merge dataProvider arrays because the test is the same now.
PHPBB3-11192
2012-11-16 16:20:55 +01:00
Andreas Fischer
7cbd440e7a [ticket/11192] Mark negative byte numbers as unsupported.
PHPBB3-11192
2012-11-16 14:56:15 +01:00
Andreas Fischer
4e3a42f59f [ticket/11192] Test strings not converted to int/float before.
PHPBB3-11192
2012-11-16 14:56:15 +01:00
Andreas Fischer
09c8c58a5c [ticket/11192] Also test strings, e.g. sums returned by the database.
PHPBB3-11192
2012-11-16 08:00:12 +01:00
Andreas Fischer
b7ec639945 [ticket/11192] Also test powers of 10 / 1000.
PHPBB3-11192
2012-11-16 08:00:07 +01:00
Oleg Pudeyev
c15b98999e [ticket/11192] Add tests.
PHPBB3-11192
2012-11-15 23:57:55 -05:00
Oleg Pudeyev
109a86520f Merge PR #1060 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11186] Database unit tests fail on windows using sqlite2
2012-11-15 16:31:03 -05:00
Oleg Pudeyev
17a7c4821a Merge PR #1060 branch 'nickvergessen/ticket/11186' into develop-olympus
* nickvergessen/ticket/11186:
  [ticket/11186] Database unit tests fail on windows using sqlite2
2012-11-15 16:00:39 -05:00
Andreas Fischer
3408662e16 Merge remote-tracking branch 'p/ticket/11202' into develop
* p/ticket/11202:
  [ticket/11202] Check response success before content assertions.
2012-11-15 21:43:33 +01:00
Oleg Pudeyev
8917b31e31 [ticket/11202] Check response success before content assertions.
This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
2012-11-15 14:54:13 -05:00
Oleg Pudeyev
ec06d5c5d9 [ticket/11204] Reindent.
PHPBB3-11204
2012-11-15 14:52:53 -05:00
Andreas Fischer
b9e1caa81a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11202] Custom message does not make sense here, delete it.
  [ticket/11202] Check response success before content assertions.
  [ticket/11202] Add a heuristic function to check for response success.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2012-11-15 20:24:37 +01:00
Andreas Fischer
14a42a97a8 Merge remote-tracking branch 'p/ticket/11202-olympus' into develop-olympus
* p/ticket/11202-olympus:
  [ticket/11202] Custom message does not make sense here, delete it.
  [ticket/11202] Check response success before content assertions.
  [ticket/11202] Add a heuristic function to check for response success.
2012-11-15 19:48:46 +01:00
Oleg Pudeyev
7402520d2f Merge PR #1070 branch 'Fyorl/ticket/11190-develop' into develop
* Fyorl/ticket/11190-develop:
  [ticket/11190-develop] Functional tests purge cache before running.
2012-11-15 09:47:51 -05:00
Oleg Pudeyev
af7ab2d3ac [ticket/11202] Custom message does not make sense here, delete it.
PHPBB3-11202
2012-11-15 08:40:29 -05:00
Oleg Pudeyev
dc61fd1091 [ticket/11202] Check response success before content assertions.
This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
2012-11-15 08:25:14 -05:00
Oleg Pudeyev
4ab178f3ef [ticket/11202] Add a heuristic function to check for response success.
This tries to account for php sending fatal errors with 200 status code.

PHPBB3-11202
2012-11-15 08:24:27 -05:00
Nathan Guse
d2187424da Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
2012-11-14 11:33:24 -06:00
Nils Adermann
69845585a2 Merge pull request #1056 from igorw/feature/compiled-dic
[feature/compiled-dic] Compile the DI Container into a cached class
2012-11-11 09:05:15 -08:00
Igor Wiedler
1bf7f0bde7 [ticket/11152] Basic tests for the container functions
PHPBB3-11152
2012-11-11 17:56:09 +01:00
Fyorl
db0cc74af0 [ticket/11190-develop] Functional tests purge cache before running.
PHPBB3-11190
2012-11-11 10:53:44 +00:00
Fyorl
e3b0e1a8a2 [ticket/11190] Functional tests purge cache before running.
Added functions to get and purge cache to functional framework also.

PHPBB3-11190
2012-11-11 10:44:47 +00:00
Nathaniel Guse
84ba10ec8c Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 2012-11-11 04:42:06 -06:00
Andreas Fischer
e86ecc0f3b Merge remote-tracking branch 'Fyorl/ticket/10939' into develop
* Fyorl/ticket/10939:
  [ticket/10939] Added documentation for phpbb_request::file
  [ticket/10939] Added tests for phpbb_request::file
  [ticket/10939] Modified the default return for $request->file
  [ticket/10939] Modified fileupload tests to deal with new behaviour
  [ticket/10939] Modified mock request class to handle deactivated $_FILES
  [ticket/10939] Modified acp_groups.php to not use $_FILES
  [ticket/10939] Modified ucp_groups.php to not use $_FILES
  [ticket/10939] Modified functions_user.php to not use $_FILES
  [ticket/10939] Modified message_parser.php to not use $_FILES
  [ticket/10939] Modified functions_upload to not use $_FILES
  [ticket/10939] Modified request test slightly to include $_FILES
  [ticket/10939] Added $_FILES handling to phpbb_request
2012-11-10 23:49:29 +01:00
Nathaniel Guse
68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
2012-11-10 10:58:44 -06:00
Nils Adermann
f0cfae1f01 Merge pull request #881 from Fyorl/ticket/10970
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
2012-11-10 07:46:50 -08:00
Andreas Fischer
3f933c6870 Merge remote-tracking branch 'Fyorl/ticket/11187' into develop
* Fyorl/ticket/11187:
  [ticket/11187] Added a blank array to fix errors in functional tests
2012-11-10 14:58:03 +01:00
Fyorl
c73293d826 [ticket/11187] Added a blank array to fix errors in functional tests
PHPBB3-11187
2012-11-10 13:46:40 +00:00