Commit graph

2856 commits

Author SHA1 Message Date
Oleg Pudeyev
771bb957ab [ticket/10972] Add mock null cache.
The mock cache has instrumentation methods and therefore is non-trivial
to implement. For those times when we don't care that the cache caches,
null cache is a simpler implementation.

PHPBB3-10972
2012-12-06 23:41:02 -05:00
Oleg Pudeyev
ebdd96592a [ticket/10972] Backport get_db from develop.
PHPBB3-10972
2012-12-06 22:45:12 -05:00
Fyorl
d33accb687 [ticket/10972] Added explicit checks for creating duplicate users.
PHPBB3-10972
2012-12-06 22:10:10 -05:00
Fyorl
cafc7feca1 [ticket/10972] Moved tests into appropriate places and added comments
PHPBB3-10972
2012-12-06 22:10:09 -05:00
Fyorl
7005002069 [ticket/10972] Added methods for creating and deleting basic users
Modified the login method to allow logging in of an arbitrary user.
Also added tests for the new functionality.

PHPBB3-10972
2012-12-06 22:10:09 -05:00
Oleg Pudeyev
26fd70d9cd Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (196 commits)
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP
  [ticket/11247] Fix wrong property reference in flock class.
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
  [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/10103] New and improved wording.
  [ticket/10716] Only lint on php 5.3+.
  [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.
  ...

Conflicts:
	phpBB/includes/functions.php
	tests/cache/cache_test.php
2012-12-06 21:49:24 -05:00
Joas Schilling
b4db972840 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3: (204 commits)
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP
  [ticket/11247] Fix wrong property reference in flock class.
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
  [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/10103] New and improved wording.
  [ticket/10716] Only lint on php 5.3+.
  [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.
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/includes/groupposition/legend.php
2012-12-06 14:26:14 +01:00
Oleg Pudeyev
2364d4b217 Merge PR #1101 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/11219] Only update sequences that are affected by a fixture
  [ticket/11219] Recreate Oracle sequences instead of altering them
  [ticket/11219] Add unit test for inserting into a sequence column
  [ticket/11219] Update sequence values after loading fixtures
2012-12-06 01:18:31 -05:00
Oleg Pudeyev
18bcb9f804 Merge PR #1101 branch 'Noxwizard/ticket/11219' into develop-olympus
* Noxwizard/ticket/11219:
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/11219] Only update sequences that are affected by a fixture
  [ticket/11219] Recreate Oracle sequences instead of altering them
  [ticket/11219] Add unit test for inserting into a sequence column
  [ticket/11219] Update sequence values after loading fixtures
2012-12-06 01:16:55 -05:00
Patrick Webster
dbb54b217b [ticket/11219] Coding guidelines and naming consistency changes
PHPBB3-11219
2012-12-05 22:57:06 -06:00
Oleg Pudeyev
dc649ad3cd [ticket/11248] Line endings to LF.
PHPBB3-11248
2012-12-05 20:11:00 -05:00
Oleg Pudeyev
fe87d441ee [ticket/11162] Review comments fixed.
PHPBB3-11162
2012-12-05 10:44:36 -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
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
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
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
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
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
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
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
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
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
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
f72e435759 [ticket/10103] Test for flock lock class, with concurrency no less.
PHPBB3-10103
2012-12-04 02:21:53 -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
Marc Alexander
fc4069f81d [feature/avatars] Use seperate function for retrieving all drivers
PHPBB3-10018
2012-12-04 00:59:37 +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
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
df78c616aa [ticket/9983] Indeed, it is <?php.
PHPBB3-9983
2012-12-02 23:54:59 -05:00
Patrick Webster
720ef233b1 [ticket/11219] Only update sequences that are affected by a fixture
PHPBB3-11219
2012-12-01 22:34:03 -06:00
Marc Alexander
ce653db491 [feature/avatars] Remove unnecessary "implements" from foobar avatar
PHPBB3-10018
2012-12-02 01:22:42 +01:00
Marc Alexander
232fa5b588 [feature/avatars] Do not use gravatar avatar in tests
PHPBB3-10018
2012-12-02 01:19:10 +01:00