Commit graph

19105 commits

Author SHA1 Message Date
Oleg Pudeyev
fe87d441ee [ticket/11162] Review comments fixed.
PHPBB3-11162
2012-12-05 10:44:36 -05:00
Oleg Pudeyev
16966f52d3 [ticket/11162] Reformat.
PHPBB3-11162
2012-12-05 10:41:08 -05:00
Oleg Pudeyev
94ebc57078 [ticket/11162] Newlines to LF.
PHPBB3-11162
2012-12-05 10:40:42 -05:00
Andreas Fischer
4f947ebb47 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.

Conflicts:
	phpBB/includes/functions_messenger.php
2012-12-05 10:03:29 +01:00
Andreas Fischer
819206a336 Merge remote-tracking branch 'p/ticket/10602' into develop-olympus
* p/ticket/10602:
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
2012-12-05 09:59:59 +01:00
Andreas Fischer
40343006a9 Merge remote-tracking branch 'p/ticket/11247' into develop
* p/ticket/11247:
  [ticket/11247] Fix wrong property reference in flock class.
2012-12-05 09:34:12 +01:00
Oleg Pudeyev
a8d02ffc27 [ticket/11247] Fix wrong property reference in flock class.
PHPBB3-11247
2012-12-05 01:54:29 -05:00
Oleg Pudeyev
1e50116c54 [ticket/10602] Avoid a race condition.
PHPBB3-10602
2012-12-05 00:57:24 -05:00
Oleg Pudeyev
03f819862f [ticket/10602] Use last_queue_run for its intended purpose.
We keep the last queue run time around, therefore for determining
whether enough time has passed since the last run we can simply
use this config variable.

When there is no queue file we consider a queue run successful.

Previously queue.php ("cache file") modification time would be used
for determining whether enough time has passed since last queue run.
The problem was that modification time would be updated whenever
anything was added to the queue, creating a situation where if
queue is processed less frequently than it is added to that email
would not be sent.

PHPBB3-10602
2012-12-05 00:41:47 -05:00
Oleg Pudeyev
1a411c5658 [ticket/11162] Use correct functions.
PHPBB3-11162
2012-12-05 00:11:14 -05:00
Oleg Pudeyev
6872104aa9 [ticket/11162] Account for notify_status.
PHPBB3-11162
2012-12-05 00:07:01 -05:00
Oleg Pudeyev
efe122b032 [ticket/11162] This test really only works for bookmarks.
PHPBB3-11162
2012-12-04 23:40:30 -05:00
Oleg Pudeyev
58951ef105 [ticket/11162] The test is not at all trivial.
PHPBB3-11162
2012-12-04 23:37:57 -05:00
Oleg Pudeyev
abca64b1df [ticket/11162] Add includes.
PHPBB3-11162
2012-12-04 23:37:14 -05:00
Oleg Pudeyev
0f96b1aad3 [ticket/11162] Move to a separate file to avoid blowing out functions.php.
PHPBB3-11162
2012-12-04 23:35:34 -05:00
Oleg Pudeyev
5120f36a25 [ticket/10205] Reduce nesting in mysql drivers.
PHPBB3-10205
2012-12-04 21:33:13 -05:00
Oleg Pudeyev
597dea1e04 [ticket/10205] Rewrite _sql_error implementations to have a single return.
PHPBB3-10205
2012-12-04 21:32:02 -05:00
Oleg Pudeyev
89c9c9d4b0 [ticket/10205] Cosmetic changes.
PHPBB3-10205
2012-12-04 21:22:33 -05:00
Andreas Fischer
d9f554fe03 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [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/10716] Only lint on php 5.3+.
  [ticket/10716] php parse all php files as part of the test suite.
2012-12-05 01:20:01 +01:00
Andreas Fischer
58a7050fac Merge remote-tracking branch 'p/ticket/10716' into develop-olympus
* p/ticket/10716:
  [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/10716] Only lint on php 5.3+.
  [ticket/10716] php parse all php files as part of the test suite.
2012-12-05 01:13:45 +01:00
Oleg Pudeyev
29c4da6162 [ticket/10205] Add some columns to the empty fixture file for mssqlnative.
Supposedly it choked on the version without any columns thusly:

phpbb_dbal_connect_test::test_failing_connect
PDOException: SQLSTATE[HY090]: [Microsoft][ODBC Driver Manager] Invalid string or buffer length

PHPBB3-10205
2012-12-04 19:00:42 -05:00
Oleg Pudeyev
fb261e19ff [ticket/10716] Collect standard error from executed php process.
php executes everything via a shell. The standard error of this
top level shell is not captured by exec/shell_exec/popen/etc.
and there is no way to capture it. proc_open might work but it
is a nightmare to use and without multiplexing reads from
standard error and standard output it can deadlock.

Thus the solution in this commit. Put the command into a subshell
and redirect standard error to standard output for the subshell.

PHPBB3-10716
2012-12-04 18:52:27 -05:00
Oleg Pudeyev
8ea52b5619 [ticket/10716] Skip test if php is not in PATH.
PHPBB3-10716
2012-12-04 17:43:36 -05:00
Oleg Pudeyev
38d2868ba8 [ticket/10491] Move board installation into setup before class.
Functional posting test already assumed that board is installed
once per test case and not once per test.

PHPBB3-10491
2012-12-04 17:37:46 -05:00
Oleg Pudeyev
bdc3ddf2bc [ticket/10491] Set up functional tests sensibly.
PHPBB_FUNCTIONAL_URL goes into setup before class.

Drop PHPBB_FUNCTIONAL_URL check in board installation and
silent return if it is not set.

Take board installation out of constructor.

Install board in setup method.

PHPBB3-10491
2012-12-04 17:19:25 -05:00
Oleg Pudeyev
8897efe087 [ticket/10716] Exclude our dependencies from linting.
PHPBB3-10716
2012-12-04 16:42:58 -05:00
Oleg Pudeyev
2d3882c412 [ticket/10205] Delete stray return.
PHPBB3-10205
2012-12-04 16:32:57 -05:00
Oleg Pudeyev
f3c043a569 [ticket/10205] Test failed connection attempts.
PHPBB3-10205
2012-12-04 16:29:37 -05:00
Oleg Pudeyev
dc521692f3 [ticket/10205] Check for function existence in mssql connect method.
PHPBB3-10205
2012-12-04 16:14:39 -05:00
Oleg Pudeyev
de2fe1a308 [ticket/10205] Convert mssqlnative driver to the same logic.
PHPBB3-10205
2012-12-04 16:12:31 -05:00
Oleg Pudeyev
40db60e45f [ticket/10205] Fix a parse error in oracle driver.
PHPBB3-10205
2012-12-04 16:07:02 -05:00
Andreas Fischer
2fdd039e52 Merge remote-tracking branch 'p/ticket/10103' into develop
* p/ticket/10103:
  [ticket/10103] New and improved wording.
  [ticket/10103] Assert with messages.
  [ticket/10103] assertLessThan/assertGreaterThan.
  [ticket/10103] Inline assignment is bad?
  [ticket/10103] $rv had too few characters.
  [ticket/10103] Correct flock class documentation.
  [ticket/10103] Try a longer sleep for travis.
  [ticket/10103] Convert the rest of the tree to flock class.
  [ticket/10103] Test for flock lock class, with concurrency no less.
  [ticket/10103] Use flock lock class in messenger.
  [ticket/10103] Factor out flock lock class.
2012-12-04 20:26:43 +01:00
Oleg Pudeyev
3e093c282a [ticket/10103] New and improved wording.
PHPBB3-10103
2012-12-04 14:05:49 -05:00
Oleg Pudeyev
4133fae99e [ticket/10716] Only lint on php 5.3+.
PHPBB3-10716
2012-12-04 13:58:14 -05:00
Oleg Pudeyev
e22dd7dfad [ticket/10103] Assert with messages.
PHPBB3-10103
2012-12-04 13:50:35 -05:00
Oleg Pudeyev
285feb49f8 [ticket/10103] assertLessThan/assertGreaterThan.
PHPBB3-10103
2012-12-04 13:47:57 -05:00
Oleg Pudeyev
a553cfbc30 [ticket/10103] Inline assignment is bad?
PHPBB3-10103
2012-12-04 13:46:01 -05:00
Oleg Pudeyev
3924676f2b [ticket/10103] $rv had too few characters.
PHPBB3-10103
2012-12-04 13:45:02 -05:00
Oleg Pudeyev
4cc81f1ffa [ticket/10103] Correct flock class documentation.
PHPBB3-10103
2012-12-04 13:44:22 -05:00
Marc Alexander
fb139a8820 [feature/avatars] Fix behavior of avatar manager and variables
The $force_all variable was only partially removed and the behavior was
not consistent in all files.

PHPBB3-10018
2012-12-04 15:12:04 +01:00
Marc Alexander
8aaa3e055f [feature/avatars] Use seperate function for retrieving the config name
PHPBB3-10018
2012-12-04 15:11:14 +01:00
Andreas Fischer
d7a23df2d9 Merge remote-tracking branch 'p/ticket/9983' into develop
* p/ticket/9983:
  [ticket/9983] Make sql cache test into a black box.
2012-12-04 14:06:15 +01:00
Andreas Fischer
78479a6bf0 Merge remote-tracking branch 'p/ticket/10091' into develop
* p/ticket/10091:
  [ticket/10091] Bump minimum supported postgresql version to 8.3.
2012-12-04 13:01:19 +01:00
Andreas Fischer
8622b1648d Merge remote-tracking branch 'p/ticket/9983-redis' into develop
* p/ticket/9983-redis:
  [ticket/9983] Correct incorrect markTestSkipped call.
2012-12-04 12:56:50 +01:00
Oleg Pudeyev
9f549e8249 [ticket/10205] Fix remaining db drivers.
PHPBB3-10205
2012-12-04 04:50:41 -05:00
Oleg Pudeyev
1a7e2211c3 [ticket/10205] Avoid calling mysqli functions when mysqli is missing.
PHPBB3-10205
2012-12-04 04:41:46 -05:00
Oleg Pudeyev
025a95ea90 [ticket/10205] Account for potentially missing extensions in dbal.
PHPBB3-10205
2012-12-04 04:40:47 -05:00
Oleg Pudeyev
74093d0fd3 [ticket/11015] Fix functional test case.
PHPBB3-11015
2012-12-04 04:32:37 -05:00
Oleg Pudeyev
3687febdac [ticket/11015] Change more docblocks.
PHPBB3-11015
2012-12-04 04:29:31 -05:00
Oleg Pudeyev
e765ccd075 [ticket/11015] Include dbms name in exception message.
PHPBB3-11015
2012-12-04 04:22:10 -05:00