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

14837 Commits

Author SHA1 Message Date
Joas Schilling
c7ae790d16 [ticket/10714] Remove type hinting to allow the usage of mocks in tests
PHPBB3-10714
2012-12-11 10:25:38 +01:00
Joas Schilling
f4bc9c1673 [ticket/10714] Fix dependency injections in unit tests with mocks
PHPBB3-10714
2012-12-11 10:24:49 +01:00
Joas Schilling
83b8b65016 [ticket/10714] Use dependencies instead of globals
We use a setter for the admin root path, as it is not defined all the time.
Aswell as we added a setter for the table name, so it can still be used
for custom tables.

PHPBB3-10714
2012-12-09 23:47:46 +01:00
Joas Schilling
7f1b0eeb71 [ticket/10714] Compare log_type to false, rather then null
PHPBB3-10714
2012-12-07 16:28:46 +01:00
Joas Schilling
0f94ff9138 [ticket/10714] Add global variables for the unit tests
PHPBB3-10714
2012-12-07 16:05:57 +01:00
Joas Schilling
37530abd39 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (645 commits)
  [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
  [ticket/10679] Use module_auth to limit access to the module
  [ticket/10679] Add new permission for changing profile field information
  [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.
  ...
2012-12-07 15:50:24 +01:00
Joas Schilling
70d23380aa [ticket/10714] Rely on global instead of creating an instance
PHPBB3-10714
2012-12-07 15:11:56 +01:00
Joas Schilling
5213ee1829 [ticket/10714] Make attributed protected rather then private
PHPBB3-10714
2012-12-07 14:39:57 +01:00
Oleg Pudeyev
b0948fb347 Merge PR #607 branch 'nickvergessen/ticket/10679' into develop
* nickvergessen/ticket/10679:
  [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
  [ticket/10679] Use module_auth to limit access to the module
  [ticket/10679] Add new permission for changing profile field information
2012-12-07 08:32:13 -05:00
Joas Schilling
c23d2457e9 [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
PHPBB3-10679
2012-12-07 12:50:21 +01:00
Joas Schilling
2f490293e4 [ticket/10679] Use module_auth to limit access to the module
PHPBB3-10679
2012-12-06 16:33:12 +01:00
Joas Schilling
4103c99a86 [ticket/10679] Add new permission for changing profile field information
The setting is copied from "Can use signature"

PHPBB3-10679
2012-12-06 15:10:29 +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
b07ae3fe59 Merge PR #1053 branch 'develop-olympus' into develop
* develop-olympus:
  [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

Conflicts:
	phpBB/includes/ucp/ucp_prefs.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
2012-12-05 12:21:25 -05:00
Oleg Pudeyev
0f7cdfe9f4 Merge PR #1053 branch 'p/ticket/10841' into develop-olympus
* p/ticket/10841:
  [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
2012-12-05 12:15:27 -05:00
Oleg Pudeyev
a8e74f5292 [ticket/10841] Revert more whitespace changes.
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Oleg Pudeyev
0793f8e2e6 [ticket/10841] Revert whitespace changes.
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
120accb9d4 [ticket/10841] adding space after if
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
f7508c3f04 [ticket/10841] removing unnecessary spacing
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
dd6983b14b [ticket/10841] changing affectedrows check to COUNT in sql
this sould reduce load and be faster. Also freeresult functions added

PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
af064cdaad [ticket/10841] Modifying style and language selectors in UCP
Commit also deletes all unnecessary blank spaces at
the end of the lines in both ucp_prefs_personal.html

PHPBB3-10841
2012-12-05 12:07:37 -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
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