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

14791 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
ceae276cd6 Merge PR #1085 branch 'nickvergessen/ticket/11198' into develop
* nickvergessen/ticket/11198:
  [ticket/11198] Remove additional asterix as /** is doc-block only
  [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
2012-11-15 11:20:27 -05:00
Joas Schilling
132163d4ec [ticket/11198] Remove additional asterix as /** is doc-block only
PHPBB3-11198
2012-11-15 16:26:36 +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
dd2c89fb8d Merge PR #1069 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11190] Functional tests purge cache before running.

develop fix needs no code from develop-olympus.
2012-11-15 09:42:47 -05:00
Oleg Pudeyev
27594130b0 Merge PR #1069 branch 'Fyorl/ticket/11190' into develop-olympus
* Fyorl/ticket/11190:
  [ticket/11190] Functional tests purge cache before running.
2012-11-15 09:42:21 -05:00
Oleg Pudeyev
c30b38ba10 Merge PR #1088 branch 'igorw/ticket/11199' into develop
* igorw/ticket/11199:
  [ticket/11199] Match cache purge container files against container_*
  [ticket/11199] Purge dumped container correctly on cache purge.
2012-11-15 09:07:41 -05:00
Oleg Pudeyev
f16f33c5ed Merge PR #1089 branch 'igorw/ticket/11200' into develop
* igorw/ticket/11200:
  [ticket/11200] Add a reminder comment.
  [ticket/11200] Make cache available during container construction
2012-11-15 09:01:19 -05:00
Oleg Pudeyev
f2cffd6a6c [ticket/11200] Add a reminder comment.
PHPBB3-11200
2012-11-15 08:50:04 -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
Igor Wiedler
31843ecd8c [ticket/11200] Make cache available during container construction
Fixes fatal errors in the dbal.

PHPBB3-11200
2012-11-15 05:00:24 +01:00
Igor Wiedler
a0cc2878a3 [ticket/11199] Match cache purge container files against container_*
Previously it was matching against only container*, checking for the
underscore is consistent with the other checks.

PHPBB3-11199
2012-11-15 02:30:43 +01:00
Igor Wiedler
73ce1a5a97 [ticket/11199] Purge dumped container correctly on cache purge.
This patch changes the dumped container suffix to a prefix instead which
makes the existing code for purging 'cache/container_*' files work
as intended.

PHPBB3-11199
2012-11-15 01:56:33 +01:00
Igor Wiedler
56b7ba2085 Merge remote-tracking branch 'p/ticket/11199' into develop
* p/ticket/11199:
  [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
2012-11-15 01:13:30 +01:00
Oleg Pudeyev
30e9d2d600 [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
This reverts commit 303fc646adf9104d7c82cf8bcebbc8fc0d328624, reversing
changes made to 9c28470ad7b45c10ce3a32065650e4b17f9f27ea.

The correct fix should be to alter the container file name to start with
container_ prefix.

PHPBB3-11199
2012-11-14 19:07:28 -05:00
David King
303fc646ad Merge remote-tracking branch 'marc1706/ticket/11199' into develop
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11199:
  [ticket/11199] Cache purge does not remove dumped container
2012-11-14 18:54:06 -05:00
Marc Alexander
d982d432eb [ticket/11199] Cache purge does not remove dumped container
PHPBB3-11199
2012-11-14 23:34:28 +01:00
Joas Schilling
e39947e57e [ticket/11198] Store the swapping partners in vars and simplify the logic
PHPBB3-11198
2012-11-14 23:30:29 +01:00