Commit graph

16058 commits

Author SHA1 Message Date
David King
2e59450459 [feature/controller] Use assign_display() instead of return_display()
The latter was deemed unnecessary at the moment.

PHPBB3-10864
2012-11-16 16:47:30 -05:00
David King
6900456e90 [feature/controller] Revert changes to template class
As per IRC, assign_display() effectively does what return_display() was added
to do, so no change was needed.

PHPBB3-10864
2012-11-16 16:47:29 -05:00
David King
ef46af8298 [feature/controller] Don't attempt to assign if no variable is give
PHPBB3-10864
2012-11-16 16:47:29 -05:00
David King
b5255d4ea4 [feature/controller] Fix syntax error in template code
PHPBB3-10864
2012-11-16 16:47:28 -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
ac29c7e9d9 [feature/controller] Rework assign_display(), use exceptions instead of return
PHPBB3-10864
2012-11-16 16:47:22 -05:00
David King
4b6d538b06 [feature/controller] Rename kernel pass class properly
PHPBB3-10864
2012-11-16 16:45:29 -05:00
David King
7687f06961 [feature/controller] Inject dependencies instead of container
PHPBB3-10864
2012-11-16 16:45:28 -05:00
David King
6e647cf6e1 [feature/controller] Resolve trivial conflict I missed during rebase
PHPBB3-10864
2012-11-16 16:45:27 -05:00
David King
dd1f8a0e55 [feature/controller-new] Call pass to subscribe the Kernel event listener
PHPBB3-10864
2012-11-16 16:45:26 -05:00
David King
cba0be96a9 [feature/controller] Fix 403 Forbidden error 2012-11-16 16:25:16 -05:00
David King
4e1f17a87d [feature/controller] includes/functions.php is included by default
PHPBB3-10864
2012-11-16 16:25:15 -05:00
David King
97957d6792 [feature/controller-new] Rename kernel compiler pass class
PHPBB3-10864
2012-11-16 16:25:14 -05:00
David King
5c86a1660d [feature/controller] Don't allow a kernel listener to be added with no method
PHPBB3-10864
2012-11-16 16:25:12 -05:00
David King
067a770730 [feature/controller] Transfer kernel-related stuff from container PR
PHPBB3-10864
2012-11-16 16:25:10 -05:00
David King
06158693c7 [feature/controller] Implement a front controller
PHPBB3-10864
2012-11-16 16:25:09 -05:00
Andreas Fischer
65dde648ca Merge remote-tracking branch 'imkingdavid/ticket/11211' into develop
* imkingdavid/ticket/11211:
  [ticket/11211] Fix typo in phpbb_realpath() method name
2012-11-16 21:05:23 +01:00
David King
ca09eb94e3 [ticket/11211] Fix typo in phpbb_realpath() method name
PHPBB3-11211
2012-11-16 14:38:53 -05:00
Marc Alexander
517d3f56ac [feature/avatars] Use correct names of input fields
The name of the avatar input fields seem to have been copied from the local
avatar (gallery avatar). Since the input fields have different names in
the template files of the remote and gravatar avatars this will not
properly default to the entered values.
Additionally, the focused driver wasn't correctly filtered causing use to
always default to no avatar.

PHPBB3-10018
2012-11-16 17:39:32 +01:00
Marc Alexander
0a5d54cc9b [feature/avatars] Shorten avatar driver's class name
The addition of "core_" that was used until now would require additional
avatar drivers (e.g. in extensions) to also include that in their class
name which would be incorrect.

PHPBB3-10018
2012-11-16 17:19:04 +01: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
efd6f1df63 [ticket/11192] Update $value parameter description to support other types.
PHPBB3-11192
2012-11-16 14:56:15 +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
Marc Alexander
cc86bd9267 [feature/avatars] Shorten needed language variable for avatar title
PHPBB3-10018
2012-11-16 14:29:35 +01:00
Joas Schilling
98092add9e [ticket/10411] Move globals to the top and use array for cache destroy
PHPBB3-10411
2012-11-16 11:48:41 +01:00
Joas Schilling
c7f701c1e7 [ticket/11209] Clone disable moving images to allow multiple per page
The disable images need to be clone rather then moved, in order to allow
multiple disable images per page. We do not have such a case at the moment
but it will be required for the new teampage/legend ACP section.

PHPBB3-11209
2012-11-16 11:41:39 +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
9c86f70b4a Merge PR #1041 branch 'cyberalien/ticket/11175' into develop
* cyberalien/ticket/11175:
  [ticket/11175] Add microdata to prosilver
  [ticket/11175] Add microdata to subsilver2
2012-11-15 22:09:52 -05:00
Igor Wiedler
8f8a7f7637 [ticket/11015] Allow full dbms class name in tests/test_config.php
PHPBB3-11015
2012-11-16 01:50:30 +01:00
Igor Wiedler
fc5385c2a5 [ticket/11015] Allow full dbms class name in config.php
PHPBB3-11015
2012-11-16 01:48:03 +01:00
Igor Wiedler
0d4a289778 [ticket/11015] Remove strange method_exists call
PHPBB3-11015
2012-11-16 01:26:36 +01:00
Igor Wiedler
423c79e106 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (22 commits)
  [ticket/11206] Remove includes to non-existent files from download/file.php
  [ticket/11205] Fix merge conflict in readme.html.
  [ticket/11202] Check response success before content assertions.
  [ticket/11204] Reindent.
  [ticket/11198] Remove additional asterix as /** is doc-block only
  [ticket/11200] Add a reminder comment.
  [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.
  [ticket/11200] Make cache available during container construction
  [ticket/11199] Match cache purge container files against container_*
  [ticket/11199] Purge dumped container correctly on cache purge.
  [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
  [ticket/11199] Cache purge does not remove dumped container
  [ticket/11198] Store the swapping partners in vars and simplify the logic
  [ticket/11198] Correctly set links after an item is moved up/down with AJAX
  [ticket/11197] Prefix the css classes for the small arrow with "arrow"
  [ticket/10879] Remove arrow icon from attachment link in editor
  [ticket/11195] Condense logic, remove improperly formatted if()
  [ticket/11190-develop] Functional tests purge cache before running.
  ...

Conflicts:
	tests/test_framework/phpbb_database_test_connection_manager.php
2012-11-16 01:23:24 +01:00
Igor Wiedler
a23eebdb7b [tracker/11015] Prepend phpbb_db_driver_ for PHPBB_TEST_DBMS
PHPBB3-11015
2012-11-16 01:19:57 +01:00
Oleg Pudeyev
f553635491 Merge PR #1094 branch 'igorw/ticket/11206' into develop
* igorw/ticket/11206:
  [ticket/11206] Remove includes to non-existent files from download/file.php
2012-11-15 18:49:45 -05:00
Igor Wiedler
d061a5abf8 [ticket/11206] Remove includes to non-existent files from download/file.php
This makes avatars work again.

PHPBB3-11206
2012-11-16 00:34:08 +01:00
Igor Wiedler
c27e8f0dd3 Merge remote-tracking branch 'p/ticket/11205' into develop
* p/ticket/11205:
  [ticket/11205] Fix merge conflict in readme.html.
2012-11-15 23:54:59 +01:00
Igor Wiedler
bf1325b1b4 [ticket/11015] Re-introduce accidentally removed require in install_convert
PHPBB3-11015
2012-11-15 23:48:49 +01:00
Oleg Pudeyev
5d0796624f [ticket/11205] Fix merge conflict in readme.html.
PHPBB3-11205
2012-11-15 17:45:00 -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
Joas Schilling
a05a73e047 [ticket/10411] Use new ajax callback name row_up/row_down
PHPBB3-10411
2012-11-15 21:53:55 +01: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
Igor Wiedler
51b07364c4 Merge remote-tracking branch 'p/ticket/11204' into develop
* p/ticket/11204:
  [ticket/11204] Reindent.
2012-11-15 20:56:57 +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