1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-09 00:55:23 +02:00

11520 Commits

Author SHA1 Message Date
Oleg Pudeyev
ba5d84ba1d Merge PR branch 'bantu/ticket/11343' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11343:
  [ticket/11343] Remove spare parentheses.
  [ticket/11343] Remove spare space.
  [ticket/11343] Use === when checking stored user_actkey against user input.
2013-01-27 17:45:55 -05:00
Andreas Fischer
5a146df07f [ticket/11343] Remove spare parentheses.
PHPBB3-11343
2013-01-25 19:52:02 +01:00
Andreas Fischer
8421aa0b0e [ticket/11343] Remove spare space.
PHPBB3-11343
2013-01-25 19:51:17 +01:00
Andreas Fischer
305b2b8f48 [ticket/11343] Use === when checking stored user_actkey against user input.
Use strict comparison when checking whether stored user_actkey is equal to user
input.

PHPBB3-11343
2013-01-25 19:49:02 +01:00
Oleg Pudeyev
229d1092f8 Merge PR branch 'bantu/ticket/11337' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11337:
  [ticket/11337] Abort setup-webserver.sh script when an error occurs.
  [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
  [ticket/11337] Silence nginx config file writing.
  [ticket/11337] php-fpm.conf is no longer owned by root.
  [ticket/11337] Run functional tests on travis using nginx and php-fpm.
2013-01-24 01:10:06 -05:00
Andreas Fischer
4b9c163969 [ticket/11337] Abort setup-webserver.sh script when an error occurs.
PHPBB3-11337
2013-01-23 15:48:44 +01:00
Andreas Fischer
9860cf6b16 [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
There is no php-fpm for PHP 5.3.3. Make sure PHP version is at least 5.3.19,
which is what 5.3 is currently aliased to.

PHPBB3-11337
2013-01-23 15:48:44 +01:00
Andreas Fischer
ea1c8ee85a [ticket/11337] Silence nginx config file writing.
PHPBB3-11337
2013-01-23 15:48:44 +01:00
Andreas Fischer
d2f09a9e65 [ticket/11337] php-fpm.conf is no longer owned by root.
PHPBB3-11337
2013-01-23 15:48:44 +01:00
Andreas Fischer
dee1b38ebc [ticket/11337] Run functional tests on travis using nginx and php-fpm.
PHPBB3-11337
2013-01-23 15:48:44 +01:00
Andreas Fischer
9a0992f6a0 Merge remote-tracking branch 'p/ticket/11295' into develop-olympus
* p/ticket/11295:
  [ticket/11295] Drop tables rather than database for postgres in test suite.
2013-01-23 15:45:18 +01:00
Andreas Fischer
a83c766ebd Merge remote-tracking branch 'p/ticket/11323-olympus' into develop-olympus
* p/ticket/11323-olympus:
  [ticket/11323] Backport include_define test to olympus.
2013-01-22 20:32:07 +01:00
Nathan Guse
e9a3f09074 Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympus
# By Sajaki
# Via Sajaki
* remotes/Sajaki/ticket/10854:
  [ticket/10854] sql server drop default constraint when dropping column
2013-01-15 22:24:58 -06:00
Oleg Pudeyev
227f7f46df Merge PR branch 'marc1706/ticket/11323' into develop-olympus
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11323:
  [ticket/11323] Add tests for inclusion of defined variables
2013-01-13 20:11:31 -05:00
Marc Alexander
4c50a35b62 [ticket/11323] Add tests for inclusion of defined variables
This adds 2 tests for the template engine. The test using
include_define_variable.html will test if a defined variable, which was
defined with another template variable, can be used to include a file.
The second test will do the same inside a loop using a loop variable.

PHPBB3-11323
2013-01-14 01:14:29 +01:00
Oleg Pudeyev
90235754b3 [ticket/11323] Backport include_define test to olympus.
PHPBB3-11323
2013-01-13 18:28:51 -05:00
Oleg Pudeyev
0b0b5e15c3 Merge PR branch 'bantu/ticket/11324' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11324:
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
2013-01-13 18:14:39 -05:00
Andreas Fischer
4001410c8c [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
PHPBB3-11324
2013-01-13 23:41:40 +01:00
Oleg Pudeyev
8b4e661904 Merge PR branch 'bantu/ticket/11301' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11301:
  [ticket/11301] Guidelines: Add spaces in front and after the / operator.
  [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
2013-01-09 01:25:44 -05:00
Andreas Fischer
41a07eedeb [ticket/11301] Guidelines: Add spaces in front and after the / operator.
PHPBB3-11301
2013-01-08 23:20:30 +01:00
Andreas Fischer
24befac7b4 [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
PHPBB3-11301
2013-01-08 23:18:17 +01:00
Andreas Fischer
c8dd12e5f4 Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympus
* gn36/ticket/11292:
  [ticket/11292] Fix: Newlines removed in display of PM reports
2013-01-06 02:11:10 +01:00
Andreas Fischer
cbe91e5b50 Merge remote-tracking branch 'p/ticket/11293' into develop-olympus
* p/ticket/11293:
  [ticket/11293] Add a note that mysqli should be in front of mysql.
2012-12-31 00:53:50 +01:00
Oleg Pudeyev
51138d3f3a Merge PR branch 'bantu/ticket/11291' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11291:
  [ticket/11291] phing: Also add checkreturn="true" to composer execution.
  [ticket/11291] phing: Add checkreturn="true" to all new commands.
  [ticket/11291] phing: Exclude vendor folder from diffs.
  [ticket/11291] phing packaging: Export composer.phar and install dependencies.
  [ticket/11291] phing: Remove no longer needed create-package target.
  [ticket/11291] phing: The package target does not depend on composer.
  [ticket/11291] phing: Adjust directory format of composer exec.
  [ticket/11291] phing: Add description for composer target.
  [ticket/11291] phing: Add --dev to composer install.
  [ticket/11291] phing: Correct dependencies of composer target.
  [ticket/11291] phing: Make sure composer is available before calling it.
2012-12-29 07:47:10 -05:00
Andreas Fischer
6951356a87 [ticket/11291] phing: Also add checkreturn="true" to composer execution.
PHPBB3-11291
2012-12-29 13:38:40 +01:00
Andreas Fischer
b36050983d [ticket/11291] phing: Add checkreturn="true" to all new commands.
PHPBB3-11291
2012-12-29 13:30:25 +01:00
Andreas Fischer
1fc103e3f3 [ticket/11291] phing: Exclude vendor folder from diffs.
Otherwise we end up with very huge diffs and the build process is severely
slowed down.

PHPBB3-11291
2012-12-29 04:56:55 +01:00
Andreas Fischer
46a752ee62 [ticket/11291] phing packaging: Export composer.phar and install dependencies.
PHPBB3-11291
2012-12-29 04:44:45 +01:00
Andreas Fischer
370e3c31e8 [ticket/11291] phing: Remove no longer needed create-package target.
PHPBB3-11291
2012-12-29 03:59:55 +01:00
Andreas Fischer
316bfc20c0 [ticket/11291] phing: The package target does not depend on composer.
The packaging process does not require running composer in the phpBB tree.
It does however require running composer on the git exports, but this is not
what the composer target does.

PHPBB3-11291
2012-12-29 03:55:20 +01:00
Andreas Fischer
357feeac2e [ticket/11291] phing: Adjust directory format of composer exec.
Adjust the directory format to what all the other exec calls are using.

PHPBB3-11291
2012-12-29 03:51:41 +01:00
Andreas Fischer
e775e7fc91 [ticket/11291] phing: Add description for composer target.
PHPBB3-11291
2012-12-29 03:50:18 +01:00
Andreas Fischer
c9cc5a00dc [ticket/11291] phing: Add --dev to composer install.
The composer target runs composer in the phpBB tree in order to load
dependencies for testing. The testing framework may have additional
development dependencies (e.g. goutte). We also have to load those.

PHPBB3-11291
2012-12-29 03:43:04 +01:00
Andreas Fischer
f6315dafb7 [ticket/11291] phing: Correct dependencies of composer target.
This command runs composer in the phpBB tree and does not write to the build
folders. Thus, it does not have to depend on prepare and clean targets.

PHPBB3-11291
2012-12-29 03:41:01 +01:00
Andreas Fischer
cd890132bb Merge remote-tracking branch 'p/ticket/11294' into develop-olympus
* p/ticket/11294:
  [ticket/11294] Capitalize phpunit.
  [ticket/11294] Update required/optional extension list for olympus.
2012-12-26 16:45:01 +01:00
Oleg Pudeyev
bc797c7da2 [ticket/11294] Capitalize phpunit.
PHPBB3-11294
2012-12-26 10:41:13 -05:00
Oleg Pudeyev
02a1777fcb [ticket/11295] Drop tables rather than database for postgres in test suite.
Doing so allows:

1. User running the tests no longer needs create database privilege.
2. Test database may be located in a non-default tablespace and generally
have site-specific options applied to it.

PHPBB3-11295
2012-12-26 00:31:43 -05:00
Oleg Pudeyev
c0b3151f0d [ticket/11294] Update required/optional extension list for olympus.
PHPBB3-11294
2012-12-25 07:23:46 -05:00
Oleg Pudeyev
989c4c3e64 [ticket/11293] Add a note that mysqli should be in front of mysql.
php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if
both are available.

PHPBB3-11293
2012-12-25 00:11:34 -05:00
Martin Beckmann
5056f16235 [ticket/11292] Fix: Newlines removed in display of PM reports
Report text is run through make_clickable and bbcode_nl2br for PMs
just as it is for posts.

PHPBB3-11292
2012-12-24 04:16:08 +01:00
Andreas Fischer
c701de695f [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.
This is so generated packages are not confused with the already-released
3.0.11 version.
2012-12-23 22:14:18 +01:00
Andreas Fischer
68710bb55a [ticket/11291] phing: Make sure composer is available before calling it.
Older versions of the tree didn't use it.

PHPBB3-11291
2012-12-23 19:57:30 +01:00
Oleg Pudeyev
86f0c0a6d5 Merge PR branch 'nickvergessen/ticket/11278' into develop-olympus
* nickvergessen/ticket/11278:
  [ticket/11278] Comment out the code for dropping the Q&A tables
  [ticket/11278] Fix not running queries from db tools in database update
2012-12-22 18:01:53 -05:00
Joas Schilling
68ffb106fb [ticket/11278] Comment out the code for dropping the Q&A tables
Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on
firebird. It was possible for board administrators to adjust the code to
work. If code was manually adjusted by board administrators, index names
would not be the same as what 3.0.9 and newer expect. This code fragment
drops captcha tables, destroying all entered Q&A captcha configuration,
such that when Q&A is configured next the respective tables will be
created with corrent index names.

If you wish to preserve your Q&A captcha configuration, you can manually
rename indexes to the currently expected name:
 phpbb_captcha_questions_lang_iso  => phpbb_captcha_question_lang
 phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid

Again, this needs to be done only if a board was manually modified to fix
broken captcha code.

PHPBB3-11278
2012-12-21 16:05:05 +01:00
Andreas Fischer
e53f4e5eac Merge remote-tracking branch 'p/ticket/11285' into develop-olympus
* p/ticket/11285:
  [ticket/11285] Use more granularity in dependency checks in compress test
2012-12-20 21:51:18 +01:00
Oleg Pudeyev
00d8f944da [ticket/11285] Use more granularity in dependency checks in compress test
Some of the tests can be run without zlib or bz2 extensions present.

PHPBB3-11285
2012-12-20 13:20:05 -05:00
Andreas Fischer
dabe88bb3a Merge remote-tracking branch 'p/ticket/10880' into develop-olympus
* p/ticket/10880:
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
2012-12-20 14:26:46 +01:00
Andreas Fischer
917a2fa9a6 [ticket/10880] The m_approve permisson no longer implies f_noapprove.
PHPBB3-10880
2012-12-19 22:02:39 -05:00
Joas Schilling
f0c780a453 [ticket/11278] Fix not running queries from db tools in database update
The db_tools class is running in return mode, which means that the queries
are not run, but just returned. Therefor the broken tables were not
removed from the database.

PHPBB3-11278
2012-12-19 13:38:16 +01:00
Oleg Pudeyev
a288c4b66b Merge PR branch 'EXreaction/ticket/8610' into develop-olympus
* EXreaction/ticket/8610:
  [ticket/8610] Update comment
  [ticket/8610] Do not use requests to submit posts except in posting_test.php
  [ticket/8610] Move posting helpers to separate file
  [ticket/8610] Create helper functions to create topic/post in functional tests
  [ticket/8610] Use phpbb_update_rows_avoiding_duplicates
  [ticket/8610] Revert some funky merging I did from rebase
  [ticket/8610] Add some comments
  [ticket/8610] Update Bookmarks and Subscriptions when splitting topics
  [ticket/8610] Update Bookmarks when merging posts into another topic
  [ticket/8610] Update Bookmarks when forking topics
  [ticket/8610] Update Bookmarks when merging topics
2012-12-16 16:24:48 -05:00