Commit graph

3551 commits

Author SHA1 Message Date
Tristan Darricau
0d1f0c07fe [ticket/12963] Fix the migration's finder for the tests (path, new instance)
PHPBB3-12963
2014-09-18 02:04:47 +02:00
Tristan Darricau
92d69255e4 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12963] Correctly load migration files from migration/ in tests as well
2014-09-18 01:32:55 +02:00
Joas Schilling
180f9bf4fa [ticket/12963] Correctly load migration files from migration/ in tests as well
PHPBB3-12963
2014-09-17 23:33:26 +02:00
Joas Schilling
45a4cf7ac5 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
2014-09-17 21:25:20 +02:00
Joas Schilling
7729ae4ad0 [ticket/13064] Revert "[ticket/13064] Validate the migrations provided to ..."
This reverts commit 46a9fe93d7.

PHPBB3-13064
2014-09-17 21:24:33 +02:00
Joas Schilling
bf6ecccd25 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13064] Validate the migrations provided to migrator::set_migrations()
2014-09-17 19:59:47 +02:00
Joas Schilling
86ea314598 Merge pull request #2951 from Nicofuma/ticket/13064
[ticket/13064] Validate the migrations provided to migrator::set_migrations()

* Nicofuma/ticket/13064:
  [ticket/13064] Validate the migrations provided to migrator::set_migrations()
2014-09-17 19:59:39 +02:00
Marc Alexander
f6ccb30781 Merge branch 'develop-ascraeus' into develop 2014-09-17 00:57:34 +02:00
Marc Alexander
20903c0a9b Merge pull request #2922 from Nicofuma/ticket/13036
[ticket/13036] Make the reference type configurable when generating a route
2014-09-17 00:57:04 +02:00
Marc Alexander
5fa2d19756 Merge branch 'develop-ascraeus' into develop 2014-09-17 00:37:07 +02:00
Marc Alexander
4a06511d85 Merge pull request #2932 from Nicofuma/ticket/12963
[ticket/12963] Load extensions migrations from /migration
2014-09-17 00:36:38 +02:00
Tristan Darricau
a48b740b94 [ticket/13036] Complete tests
PHPBB3-13036
2014-09-16 21:56:45 +02:00
Tristan Darricau
bb5d6a2551 [ticket/13036] Add unit tests
PHPBB3-13036
2014-09-16 19:44:58 +02:00
Marc Alexander
cf71bfbdf2 Merge branch 'develop-ascraeus' into develop 2014-09-16 19:24:45 +02:00
Marc Alexander
b3576d77da Merge pull request #2921 from Nicofuma/ticket/13034
[ticket/13034] Fix the route generated for the frontend not in the phpbb root path
2014-09-16 19:24:07 +02:00
Tristan Darricau
f4260e261f [ticket/13034] Fix tests
PHPBB3-13034
2014-09-16 01:25:36 +02:00
Tristan Darricau
46a9fe93d7 [ticket/13064] Validate the migrations provided to migrator::set_migrations()
PHPBB3-13064
2014-09-14 00:56:41 +02:00
Tristan Darricau
04e0d305d0 [ticket/12963] Add unit tests
PHPBB3-12963
2014-09-10 19:22:00 +02:00
Marc Alexander
c00e0c55c5 Merge branch 'develop-ascraeus' into develop 2014-09-07 11:58:57 +02:00
Marc Alexander
a0ee6ccdf3 Merge pull request #2925 from nickvergessen/ticket/12983
Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
2014-09-07 11:41:44 +02:00
Joas Schilling
d5801333f7 [ticket/12983] Do not test invalid values until Symfony 2.4
PHPBB3-12983
2014-09-07 10:40:18 +02:00
Tristan Darricau
af10ca630d Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
2014-09-06 15:47:47 +02:00
Tristan Darricau
297ab5c526 Merge pull request #2919 from Senky/ticket/12852
[ticket/12852] Make get_url_parts handle get variable with no value

* Senky/ticket/12852:
  [ticket/12852] Add unit tests
  [ticket/12852] Add space after if
  [ticket/12852] Remove whitespace
  [ticket/12852] Make get_url_parts handle get variable with no value
2014-09-06 15:47:30 +02:00
Joas Schilling
647a75249c [ticket/12983] Add functional test for ucp pref module
PHPBB3-12983
2014-09-06 15:16:51 +02:00
Tristan Darricau
e0711b417f Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
  [ticket/13031] Guess with all mimetype guessers and pick best guess
  [ticket/13031] Only use mimetype guesser guess if it helps us
2014-09-06 13:54:16 +02:00
Marc Alexander
21029e9fd2 [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests
The mime type 'application/octet-stream' will still always be overwritten by
proper guesses. However, guesses with guessers that have a higher priority
will now overwrite previous guesses even if the mime types of these guesses
had a slash in them.

PHPBB3-13031
2014-09-05 21:55:49 +02:00
Tristan Darricau
4f44e73b21 [ticket/13034] Fix unit tests
PHPBB3-13034
2014-09-04 23:21:56 +02:00
Tristan Darricau
cb3eb84665 [ticket/13034] Fix the route generated for the frontend not in the phpbb root
PHPBB3-13034
2014-09-04 23:21:55 +02:00
Jakub Senko
7b796532df [ticket/12852] Add unit tests
PHPBB3-12852
2014-09-04 17:56:48 +02:00
Marc Alexander
7de15bc54c [ticket/13031] Only use mimetype guesser guess if it helps us
If we already have a mimetype and the guesser's guess is the default fallback,
we should keep the already existing mimetype the browser supplied. Otherwise,
platforms that might not support mimetype guessers will cause us to always
have the mimetype set to application/octet-stream on images. This will prevent
users from uploading images.

PHPBB3-13031
2014-09-03 23:09:17 +02:00
Tristan Darricau
55a3c96fb0 [ticket/12661] Fix unit tests
PHPBB3-12661
2014-09-02 22:12:11 +02:00
Marc Alexander
cf5ae5abbc Merge branch 'develop-ascraeus' into develop 2014-09-02 20:55:25 +02:00
Marc Alexander
6777d462ff Merge pull request #2908 from Pico/t/12661
[ticket/12661] Load extensions templates from "all" folder by render()
2014-09-02 20:54:51 +02:00
Pico
9d44c5d940 [ticket/12661] Add new line at the end of files
PHPBB3-12661
2014-08-25 22:35:55 +02:00
Andreas Fischer
dde16e4b2a Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13008] Add functionnal test
  [ticket/13008] Use an absolute path with the FileLocator for the routing files
2014-08-24 22:32:55 +02:00
Andreas Fischer
9fc5073540 Merge pull request #2905 from Nicofuma/ticket/13008
[ticket/13008] Use an absolute path with the FileLocator for the routing files

* Nicofuma/ticket/13008:
  [ticket/13008] Add functionnal test
  [ticket/13008] Use an absolute path with the FileLocator for the routing files
2014-08-24 22:32:54 +02:00
Tristan Darricau
0386b1788a [ticket/13008] Add functionnal test
PHPBB3-13008
2014-08-24 15:17:50 +02:00
Pico88
273fc5b5b6 [ticket/12661] Add template test
PHPBB3-12661
2014-08-24 10:16:39 +02:00
Andreas Fischer
05616b6ceb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12658] Rebased and fixed unit tests
  [ticket/12658] Fix wrong eol character
  [ticket/12658] Refactoring code
  [ticket/12658] Fix typo and coding style mistakes
  [ticket/12658] Add test for command config:delete
  [ticket/12658] Add test for command config:increment
  [ticket/12658] Add test for command config:get
  [ticket/12658] Add test for command config:set-atomic
  [ticket/12658] Add test for base case of command config:set
2014-08-23 13:21:51 +02:00
Tristan Darricau
91804b53fb [ticket/12658] Rebased and fixed unit tests
PHPBB3-12658
2014-08-23 12:45:25 +02:00
LEZY Thomas
5a4de4aa1f [ticket/12658] Fix wrong eol character
PHPBB3-12658
2014-08-23 12:41:44 +02:00
LEZY Thomas
059f21a3ac [ticket/12658] Refactoring code
PHPBB3-12658
2014-08-23 12:41:42 +02:00
LEZY Thomas
ab6c9775d3 [ticket/12658] Fix typo and coding style mistakes
PHPBB3-12658
2014-08-23 12:41:41 +02:00
LEZY Thomas
f9803b7360 [ticket/12658] Add test for command config:delete
PHPBB3-12658
2014-08-23 12:41:39 +02:00
LEZY Thomas
3fbab9504b [ticket/12658] Add test for command config:increment
PHPBB3-12658
2014-08-23 12:41:37 +02:00
LEZY Thomas
9affb8c171 [ticket/12658] Add test for command config:get
PHPBB3-12658
2014-08-23 12:41:36 +02:00
LEZY Thomas
ede73b207b [ticket/12658] Add test for command config:set-atomic
PHPBB3-12658
2014-08-23 12:41:35 +02:00
LEZY Thomas
1662ee64e0 [ticket/12658] Add test for base case of command config:set
PHPBB3-12658
2014-08-23 12:41:32 +02:00
Marc Alexander
b2701f00e9 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:44:27 +02:00
Marc Alexander
31aac66f5a Merge pull request #2885 from Nicofuma/ticket/12990
[ticket/12990] Use the full services name for the notification's types
2014-08-21 00:44:05 +02:00