* 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
[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
* 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
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
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
[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
* 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
$delta was always an int - so, this test would sometimes fail if you
happened to call time() /very/ close to a 1s boundary.
Found by HHVM's continuous testing.
PHPBB3-12996
* develop-ascraeus:
[ticket/12822] Fix test runs of avatar manager_test
[ticket/12822] Add method for deleting avatars and use confirm_box
[ticket/12822] Remove "None" option from avatar select boxes
Conflicts:
phpBB/styles/subsilver2/template/ucp_groups_manage.html
phpBB/styles/subsilver2/template/ucp_profile_avatar.html
* github-marc1706/ticket/12822:
[ticket/12822] Fix test runs of avatar manager_test
[ticket/12822] Add method for deleting avatars and use confirm_box
[ticket/12822] Remove "None" option from avatar select boxes
