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

11390 Commits

Author SHA1 Message Date
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
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
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
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
Oleg Pudeyev
4133fae99e [ticket/10716] Only lint on php 5.3+.
PHPBB3-10716
2012-12-04 13:58:14 -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
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
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
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
6f7e39996c [ticket/11238] Set goutte version to 0.1.0.
PHPBB3-11238
2012-12-02 23:44:49 -05:00
Oleg Pudeyev
ae14ac7ba9 Merge PR #893 branch 'nickvergessen/ticket/10184' into develop-olympus
* nickvergessen/ticket/10184:
  [ticket/10184] Query bots table to get the user_ids of the bots
  [ticket/10184] Disable receiving pms for bots by default
2012-12-01 04:55:00 -05:00
Joas Schilling
ad2d560f3f [ticket/10184] Query bots table to get the user_ids of the bots
PHPBB3-10184
2012-12-01 10:54:26 +01:00
Joas Schilling
314462d835 [ticket/10184] Disable receiving pms for bots by default
PHPBB3-10184
2012-12-01 10:54:16 +01:00
Andreas Fischer
b2a252d274 Merge remote-tracking branch 'p/ticket/11227' into develop-olympus
* p/ticket/11227:
  [ticket/11227] @return void -> @return null in develop-olympus.
2012-11-29 23:17:48 +01:00
Oleg Pudeyev
65253a3023 [ticket/11227] @return void -> @return null in develop-olympus.
PHPBB3-11227
2012-11-29 15:37:12 -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
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
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
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
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
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
Andreas Fischer
8b156c3d83 Merge remote-tracking branch 'marc1706/ticket/10879' into develop-olympus
* marc1706/ticket/10879:
  [ticket/10879] Remove arrow icon from attachment link in editor
2012-11-13 20:35:50 +01:00
Marc Alexander
170967c48a [ticket/10879] Remove arrow icon from attachment link in editor
If you upload a file with a long filename the filename will partially
cover the arrow icon background image. Remove the icon as it's not needed
anyways.

PHPBB3-10879
2012-11-13 20:26:49 +01:00
Andreas Fischer
c699b88bc5 [ticket/11192] Add Tebibyte to get_formatted_filesize().
PHPBB3-11192
2012-11-11 14:35:31 +01:00
Fyorl
e3b0e1a8a2 [ticket/11190] Functional tests purge cache before running.
Added functions to get and purge cache to functional framework also.

PHPBB3-11190
2012-11-11 10:44:47 +00:00
Joas Schilling
f7f21fa692 [ticket/11186] Database unit tests fail on windows using sqlite2
The problem is, that we try to recreate the db and reconnect to it, while the
old connection is still hold. To resolve this, we just drop all tables and
recreate the tables instead of the hole db.

PHPBB3-11186
2012-11-10 14:34:52 +01:00
Oleg Pudeyev
3ebabc8da2 Merge PR #1052 branch 'p/ticket/10865' into develop-olympus
* p/ticket/10865:
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10865] Add .css, .js, and .htaccess to the list of ASCII mode files
  [ticket/10865] Phrase change for visiting with browser
  [ticket/10865] Grammar corrections for the entire document
  [ticket/10865] Typo and phrasing change
  [ticket/10865] Updates and additions to /docs/INSTALL.html
2012-11-09 20:14:52 -05:00
Oleg Pudeyev
7c4318c033 [ticket/10865] Use code tags for install/database_update.php.
PHPBB3-10865
2012-11-09 20:13:06 -05:00
Oleg Pudeyev
6e6cc28b76 [ticket/10865] Should have been a slash.
PHPBB3-10865
2012-11-09 20:10:43 -05:00
Nils Adermann
0209431e4f Merge remote-tracking branch 'github-igorw/ticket/11181-olympus' into develop-olympus
* github-igorw/ticket/11181-olympus:
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
2012-11-09 23:46:51 +01:00
Igor Wiedler
923137cf31 [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
PHPBB3-11181
2012-11-09 23:22:02 +01:00
Oleg Pudeyev
a16b9d17da Merge PR #1044 branch 'bantu/ticket/11178' into develop-olympus
* bantu/ticket/11178:
  [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
2012-11-09 09:57:33 -05:00
Oleg Pudeyev
100acddf55 Merge PR #1042 branch 'bantu/ticket/10897' into develop-olympus
* bantu/ticket/10897:
  [ticket/10897] Combine bot updates and bot delete.
  [ticket/10897] Use same code/query for deleting.
  [ticket/10897] Make sure the user we're fetching is a bot.
  [ticket/10897] Do not handle IP address. There is no need.
  [ticket/10897] Update by user_id instead of bot_name.
  [ticket/10897] Move bot delete data to the relevant foreach loop.
  [ticket/10897] Add comment about what's going on.
  [ticket/10897] Remove unnecessary string casting.
  [ticket/10897] Add space after foreach.
  [ticket/10897] Update bots during phpBB update
  [ticket/10897] Bot list updated
2012-11-09 09:20:43 -05:00
Andreas Fischer
ed74c9c487 [ticket/11178] Do not set error_reporting to E_ALL in database_updater.php
Take whatever startup.php sets instead.

This especially takes care of E_STRICT messages that are generated because of
PHP4 compatibility.

PHPBB3-11178
2012-11-09 14:30:44 +01:00
Andreas Fischer
60ea1c10ef [ticket/10897] Combine bot updates and bot delete.
PHPBB3-10897
2012-11-09 13:40:48 +01:00
Andreas Fischer
54700f5ba2 [ticket/10897] Use same code/query for deleting.
PHPBB3-10897
2012-11-09 12:53:33 +01:00
Andreas Fischer
520ffdf368 [ticket/10897] Make sure the user we're fetching is a bot.
PHPBB3-10897
2012-11-09 12:47:50 +01:00