Commit graph

3719 commits

Author SHA1 Message Date
Marc Alexander
48b64b0a61 [ticket/13577] Skip filespec test requiring mimetype check on windows
PHPBB3-13577
2015-02-05 13:37:34 +01:00
Andreas Fischer
e4064ca839 Merge pull request #3207 from Nicofuma/ticket/13407
[ticket/13407] Update Symfony to 2.7.*@dev

* Nicofuma/ticket/13407:
  [ticket/13407] Update composer.lock file
  [ticket/13407] Bump minimal version to php 5.3.9
  [ticket/13407] Introduce a request_stack service
  [ticket/13407] Remove the last occurence of pattern in routing files
  [ticket/13407] Update Symfony to 2.7.*@dev
2015-02-04 21:14:01 +01:00
Nicofuma
216fb13c2a [ticket/13407] Remove the last occurence of pattern in routing files
PHPBB3-13407
2015-02-04 17:40:11 +01:00
Marc Alexander
c1d644769f [ticket/13577] Skip functional tests requiring fileinfo if not enabled
PHPBB3-13577
2015-02-04 15:24:25 +01:00
Gaëtan Muller
f6e06da4c6 [ticket/13455] Update calls to request_var()
PHPBB3-13455
2015-02-03 20:50:40 +01:00
Andreas Fischer
284aa8c496 Merge pull request #3281 from MGaetan89/ticket/13496
[ticket/13496] Change set_config_count() calls with $config->increment()

* MGaetan89/ticket/13496:
  [ticket/13496] Update calls to `set_config_count()`
2015-02-03 18:13:20 +01:00
Andreas Fischer
3fb6d5b838 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13538] Add tests for double nested pagination loop
  [ticket/13538] Fix tests for pagination in nested loop
  [ticket/13538] Add test for pagination in nested loop
2015-02-03 17:53:47 +01:00
Andreas Fischer
5347eac69c Merge pull request #3328 from marc1706/ticket/13538
[ticket/13538] Add tests for pagination in nested loops

* marc1706/ticket/13538:
  [ticket/13538] Add tests for double nested pagination loop
  [ticket/13538] Fix tests for pagination in nested loop
  [ticket/13538] Add test for pagination in nested loop
2015-02-03 17:53:46 +01:00
Marc Alexander
a3be531020 [ticket/13568] Use correct data provider on windows
PHPBB3-13568
2015-02-03 16:34:41 +01:00
Nicofuma
f4b42c961f [ticket/13139] Fix tests
PHPBB3-13139
2015-02-03 13:37:52 +01:00
Gaëtan Muller
a633f3484c [ticket/13496] Update calls to set_config_count()
PHPBB3-13496
2015-02-02 21:52:59 +01:00
Marc Alexander
ffe0e46e82 [ticket/13568] Add imagick tests for windows
PHPBB3-13568
2015-02-02 20:39:58 +01:00
Gaëtan Muller
79d4ff5538 [ticket/13494] Update calls to set_config()
PHPBB3-13494
2015-02-02 19:28:23 +01:00
Marc Alexander
b53fd867be [ticket/13568] Add more test cases for imagick path
PHPBB3-13568
2015-02-02 18:33:53 +01:00
Marc Alexander
99574cf5e5 [ticket/13568] Add functional test for imagick path setting
PHPBB3-13568
2015-02-02 16:11:00 +01:00
Matt Friedman
2671306304 [ticket/10388] Update tests
PHPBB3-10388
2015-01-29 01:41:52 -08:00
Andreas Fischer
6f5524de26 Merge branch 'prep-release-3.0.13' into develop-olympus
* prep-release-3.0.13:
  [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
2015-01-29 00:08:23 +01:00
Andreas Fischer
d7741cea60 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12933] Add test cases for * wildcard searches
  [ticket/12933] Handle case when * is last character of word
2015-01-29 00:02:42 +01:00
Marc Alexander
7495055907 [ticket/13549] Do not exit when ORIG_PATH_INFO just contains SCRIPT_NAME.
The ORIG_PATH_INFO on IIS also contains the script name. Only use that
for killing the script after removing the script name from ORIG_PATH_INFO.

PHPBB3-13549
2015-01-28 22:07:16 +01:00
Dhruv
35edd7a043 [ticket/12933] Add test cases for * wildcard searches
PHPBB3-12933
2015-01-28 21:46:38 +05:30
Tristan Darricau
0bdb4c1ed6 Merge pull request #3263 from MGaetan89/ticket/13468
[ticket/13468] Change add_log() calls with $phpbb_log->add()

* MGaetan89/ticket/13468:
  [ticket/13468] Update calls to `add_log()`
2015-01-28 09:27:16 +01:00
Gaëtan Muller
7fc586080b [ticket/13468] Update calls to add_log()
PHPBB3-13468
2015-01-27 18:34:33 +01:00
Andreas Fischer
7081b3e382 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12089] Add assert message on HTTP status code check
2015-01-26 02:47:39 +01:00
Andreas Fischer
ffbe8cdc96 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12089] Add assert message on HTTP status code check
2015-01-26 02:47:38 +01:00
Joas Schilling
ed2d080551 [ticket/12089] Add assert message on HTTP status code check
PHPBB3-12089
2015-01-25 23:06:56 +01:00
Marc Alexander
2e32fbd090 Merge branch 'develop-ascraeus' into develop 2015-01-24 21:53:20 +01:00
Joas Schilling
b2674cf1f6 [ticket/13543] Fix broken slow test
PHPBB3-13543
2015-01-24 21:10:53 +01:00
Marc Alexander
a5c65449de [ticket/13538] Add tests for double nested pagination loop
PHPBB3-13538
2015-01-24 14:35:49 +01:00
Marc Alexander
ee03b4f1ef [ticket/13538] Fix tests for pagination in nested loop
PHPBB3-13538
2015-01-24 14:27:04 +01:00
Joas Schilling
fc91616fad Merge branch 'develop-ascraeus' into develop 2015-01-23 17:32:57 +01:00
Joas Schilling
9cdbb69f9e Merge pull request #3321 from marc1706/ticket/13282
[ticket/13282] Use 0 as default for integer type columns in postgresql
2015-01-23 17:32:28 +01:00
Marc Alexander
7014d824f0 [ticket/13538] Add test for pagination in nested loop
PHPBB3-13538
2015-01-23 11:48:05 +01:00
Marc Alexander
eb4594d8ee [ticket/13282] Add unit test for adding integer column with default null
PHPBB3-13282
2015-01-22 23:17:59 +01:00
Nils Adermann
f9f43141a9 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13361] Rename exception to runtime_exception
  [ticket/13361] Fix the JsonResponse in the exception listener
  [ticket/13361] Add tests
  [ticket/13361] Support ajax request (send a json response)
  [ticket/13361] Improve the exception listener
2015-01-22 16:17:26 +01:00
Nils Adermann
40ab75478e Merge pull request #3173 from Nicofuma/ticket/13361
[ticket/13361] Improve the exception listener
2015-01-22 16:16:21 +01:00
Marc Alexander
47f04d7620 [ticket/13282] Add functional tests for adding profilefields
PHPBB3-13282
2015-01-22 10:30:24 +01:00
Andreas Fischer
3bbddbb963 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13534] Set imagick path to empty string to prevent failing path check
2015-01-21 16:59:26 +01:00
Marc Alexander
7d6fdcfaa5 [ticket/13534] Set imagick path to empty string to prevent failing path check
The imagick path defaults to /usr/bin. If it doesn't exist for some reason,
for example on travis, the form won't be submitted and the settings won't be
changed.

PHPBB3-13534
2015-01-21 15:18:25 +01:00
Tristan Darricau
7fef91afd2 [ticket/13361] Rename exception to runtime_exception
PHPBB3-13361
2015-01-21 08:41:02 +01:00
Marc Alexander
4b9434bf1b [ticket/13531] Explicitly disallow trailing paths (e.g. PATH_INFO).
PHPBB3-13531
2015-01-21 01:02:08 +01:00
Tristan Darricau
fd25d00fac Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13530] Fix undefined variables
2015-01-20 23:44:17 +01:00
Joas Schilling
ed6b8f84ad [ticket/13530] Fix undefined variables
PHPBB3-13530
2015-01-20 23:36:45 +01:00
Joas Schilling
b566686b51 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
	phpBB/phpbb/db/migration/profilefield_base_migration.php
	phpBB/phpbb/db/migrator.php
2015-01-20 23:32:36 +01:00
Joas Schilling
a5fae1b1f0 Merge pull request #3293 from Nicofuma/ticket/13489
[ticket/13489] Disable the event dispatcher in the migrator
2015-01-20 23:27:54 +01:00
Tristan Darricau
dab0728357 [ticket/13489] Fix service configuration
PHPBB3-13489
2015-01-20 14:19:55 +01:00
Tristan Darricau
a537bf9619 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13192] Add test for app.php in external subfolder
  [ticket/13192] Use ltrim() instead of preg_replace()
  [ticket/13192] Order test cases consistently
  [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
  [ticket/13192] Pass correct parameters and rename method to get_valid_page
  [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
  [ticket/13192] Use get_valid_user_page method in build_url function
  [ticket/13192] Add method for generating valid user page links
2015-01-19 17:52:37 +01:00
Tristan Darricau
add3d3e760 Merge pull request #3055 from marc1706/ticket/13192
[ticket/13192] Add method for generating valid user page links based on mod_rewrite

* marc1706/ticket/13192:
  [ticket/13192] Add test for app.php in external subfolder
  [ticket/13192] Use ltrim() instead of preg_replace()
  [ticket/13192] Order test cases consistently
  [ticket/13192] Remove app.php on mod rewrite even if app.php is outside root
  [ticket/13192] Pass correct parameters and rename method to get_valid_page
  [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals
  [ticket/13192] Use get_valid_user_page method in build_url function
  [ticket/13192] Add method for generating valid user page links
2015-01-19 16:45:43 +01:00
Marc Alexander
da189a105b [ticket/13192] Add test for app.php in external subfolder
PHPBB3-13192
2015-01-19 16:10:32 +01:00
Tristan Darricau
6842831d6b [ticket/13513] Use paths relative to the phpBB root in the router
PHPBB3-13513
2015-01-17 11:40:10 +01:00
Gaëtan Muller
17daaaf441 [ticket/13499] Move get_remote_file() to functions_compatibility.php
PHPBB3-13499
2015-01-15 18:55:51 +01:00