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

14776 Commits

Author SHA1 Message Date
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
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
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
8897efe087 [ticket/10716] Exclude our dependencies from linting.
PHPBB3-10716
2012-12-04 16:42:58 -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
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
af2887f3a7 [ticket/10716] php parse all php files as part of the test suite.
PHPBB3-10716
2012-12-04 03:34:51 -05:00
Oleg Pudeyev
b67f112e03 [ticket/10091] Bump minimum supported postgresql version to 8.3.
PHPBB3-10091
2012-12-04 02:52:18 -05:00
Oleg Pudeyev
cf3080b83e [ticket/9983] Correct incorrect markTestSkipped call.
PHPBB3-9983
2012-12-04 02:39:50 -05:00
Oleg Pudeyev
fc410e1cd0 [ticket/10103] Try a longer sleep for travis.
Apparently travis takes longer than half a second to fork php.

PHPBB3-10103
2012-12-04 02:38:57 -05:00
Oleg Pudeyev
318140b4d6 [ticket/10103] Convert the rest of the tree to flock class.
PHPBB3-10103
2012-12-04 02:26:55 -05:00
Oleg Pudeyev
f72e435759 [ticket/10103] Test for flock lock class, with concurrency no less.
PHPBB3-10103
2012-12-04 02:21:53 -05:00
Oleg Pudeyev
4010f4085a [ticket/10103] Use flock lock class in messenger.
PHPBB3-10103
2012-12-04 02:00:27 -05:00
Oleg Pudeyev
f08c28c77a [ticket/10103] Factor out flock lock class.
PHPBB3-10103
2012-12-04 02:00:10 -05:00
Oleg Pudeyev
913a2a773a Merge PR #1112 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11240] Enable PHPUnit's verbose mode so we get a list of skipped tests.
2012-12-04 00:41:05 -05:00
Oleg Pudeyev
e64c5117b9 Merge PR #1112 branch 'bantu/ticket/11240' into develop-olympus
* bantu/ticket/11240:
  [ticket/11240] Enable PHPUnit's verbose mode so we get a list of skipped tests.
2012-12-04 00:40:32 -05:00
Oleg Pudeyev
d93f582b04 [ticket/9983] Make sql cache test into a black box.
This makes it non-driver-specific and also makes it possible
to make prefix variable private on drivers.

PHPBB3-9983
2012-12-03 21:47:29 -05:00
Andreas Fischer
e845e2ed89 [ticket/11240] Enable PHPUnit's verbose mode so we get a list of skipped tests.
PHPBB3-11240
2012-12-04 00:40:24 +01:00
Andreas Fischer
49f2925900 Merge remote-tracking branch 'p/ticket/9983' into develop
* p/ticket/9983:
  [ticket/9983] Also check generic APC enable/disable.
  [ticket/9983] Use APC instead of apc in error messages.
  [ticket/9983] Skip tests if APC is not enabled for CLI.
  [ticket/9983] Test for apc cache driver.
  [ticket/9983] Add phpbb prefix to global variables.
  [ticket/9983] Empty line by request.
  [ticket/9983] Indeed, it is <?php.
  [ticket/9983] Add a test for destroy.
  [ticket/9983] Exercise exists also.
  [ticket/9983] Add a purge test.
  [ticket/9983] Rename test methods.
  [ticket/9983] get/put cache test moved to a base class.
  [ticket/9983] Create driver in setup in null driver test.
  [ticket/9983] Split cache test into per-driver files.
  [ticket/9983] Add redis cache driver tests.
2012-12-03 17:17:50 +01:00
Andreas Fischer
db6b11a390 [ticket/9983] Also check generic APC enable/disable.
PHPBB3-9983
2012-12-03 14:37:57 +01:00
Andreas Fischer
2e851baab9 [ticket/9983] Use APC instead of apc in error messages.
PHPBB3-9983
2012-12-03 14:29:02 +01:00
Andreas Fischer
0b4b7e68a7 [ticket/9983] Skip tests if APC is not enabled for CLI.
PHPBB3-9983
2012-12-03 14:29:02 +01:00
Andreas Fischer
34018ed1d6 Merge remote-tracking branch 'p/ticket/11238-develop' into develop
* p/ticket/11238-develop:
  [ticket/11238] Set goutte to 0.1.0 in develop.
2012-12-03 13:44:08 +01:00
Andreas Fischer
d951cef32b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11238] Set goutte version to 0.1.0.

Conflicts:
	phpBB/composer.lock
2012-12-03 13:43:45 +01:00
Andreas Fischer
cf64007ab6 Merge remote-tracking branch 'p/ticket/11238-olympus' into develop-olympus
* p/ticket/11238-olympus:
  [ticket/11238] Set goutte version to 0.1.0.
2012-12-03 13:39:16 +01:00
Oleg Pudeyev
f2bee4b383 [ticket/9983] Test for apc cache driver.
PHPBB3-9983
2012-12-03 00:18:52 -05:00
Oleg Pudeyev
7d09b9b4bb [ticket/9983] Add phpbb prefix to global variables.
PHPBB3-9983
2012-12-02 23:57:37 -05:00
Oleg Pudeyev
5f9133c213 [ticket/9983] Empty line by request.
PHPBB3-9983
2012-12-02 23:55:42 -05:00
Oleg Pudeyev
df78c616aa [ticket/9983] Indeed, it is <?php.
PHPBB3-9983
2012-12-02 23:54:59 -05:00
Oleg Pudeyev
6f7e39996c [ticket/11238] Set goutte version to 0.1.0.
PHPBB3-11238
2012-12-02 23:44:49 -05:00
Oleg Pudeyev
9d5fc4ae33 [ticket/11238] Set goutte to 0.1.0 in develop.
PHPBB3-11238
2012-12-02 13:16:11 -05:00
Oleg Pudeyev
1823674514 Merge PR #1065 branch 'dhruvgoel92/ticket/10771' into develop
* dhruvgoel92/ticket/10771:
  [ticket/10771] fix remember me language
  [ticket/10771] use remember me in ucp
  [ticket/10771] use remember me in acp
  [ticket/10771] changed value in help_faq.php
  [ticket/10771] Using Remember Me instead of autologin or persistent keys
2012-12-02 11:47:15 -05:00
Dhruv
37f2841af2 [ticket/10771] fix remember me language
PHPBB3-10771
2012-12-02 15:40:25 +05:30
Dhruv
619e15378d [ticket/10771] use remember me in ucp
PHPBB3-10771
2012-12-02 14:51:31 +05:30