* develop-ascraeus:
[ticket/12716] Use a string as session_id
[ticket/12716] Add regression test
[ticket/12716] Add the missing parameters in the call of clearToken
[ticket/12716] Add the missing parameters in the call of clearToken
* Nicofuma/ticket/12716:
[ticket/12716] Use a string as session_id
[ticket/12716] Add regression test
[ticket/12716] Add the missing parameters in the call of clearToken
* develop-ascraeus:
[ticket/12099] Fix correction in path_helper test
[ticket/12099] Prepend ./ to path to fix assets
[ticket/12099] Deduplicate path generation
[ticket/12099] Fix clean_path() ".." stripping when previous directory was "."
[ticket/12099] Break clean_path tests with a simple test
[ticket/12099] Clean paths in tests
[ticket/12099] Correctly fix go back to root before prepending the root path
[ticket/12099] Clean some paths before using them
[ticket/12099] Fix several issues in path_helper test
* nickvergessen/ticket/12099:
[ticket/12099] Fix correction in path_helper test
[ticket/12099] Prepend ./ to path to fix assets
[ticket/12099] Deduplicate path generation
[ticket/12099] Fix clean_path() ".." stripping when previous directory was "."
[ticket/12099] Break clean_path tests with a simple test
[ticket/12099] Clean paths in tests
[ticket/12099] Correctly fix go back to root before prepending the root path
[ticket/12099] Clean some paths before using them
[ticket/12099] Fix several issues in path_helper test
* develop-ascraeus:
[ticket/12763] Remove invalid comment from oracle and postgres *_schema.sql
[ticket/12763] Remove empty schema files
[ticket/12763] Do not regenerate the *_schema.sql files
The mimetype guesser will be used to get the mimetype of uploaded files.
Until now, this was only used for files uploaded with plupload. If a file
doesn't have a mimetype supplied, we will now try to get the correct mimetype.
PHPBB3-11148
* develop-ascraeus:
[ticket/11528] Change click_submit() to accept id as param
[ticket/11528] Handle case when config file cant be written by installer
[ticket/11528] Change NULL to null
[ticket/11528] Fix spaces and slashes as per guidelines
[ticket/11528] Add asserts in installation steps
[ticket/11528] Use 'use' keyword to import classes to current scope
[ticket/11528] Move parent::tearDown() to end of tearDown()
[ticket/11528] Call parent::tearDown in overrided tearDown method
[ticket/11528] Instantiate $client, $driver from functional test case
[ticket/11528] Refactor install_board() code into a new class
[ticket/11528] Add behat/mink and mink-goutte-driver as dependency
[ticket/11528] Refactor install_board( ) into a new mink class
* dhruvgoel92/ticket/11528:
[ticket/11528] Change click_submit() to accept id as param
[ticket/11528] Handle case when config file cant be written by installer
[ticket/11528] Change NULL to null
[ticket/11528] Fix spaces and slashes as per guidelines
[ticket/11528] Add asserts in installation steps
[ticket/11528] Use 'use' keyword to import classes to current scope
[ticket/11528] Move parent::tearDown() to end of tearDown()
[ticket/11528] Call parent::tearDown in overrided tearDown method
[ticket/11528] Instantiate $client, $driver from functional test case
[ticket/11528] Refactor install_board() code into a new class
[ticket/11528] Add behat/mink and mink-goutte-driver as dependency
[ticket/12747] Drop support for Firebird
* nickvergessen/ticket/12747:
[ticket/12747] Remove some methods which are not used anymore
[ticket/12747] Drop support for Firebird
Conflicts:
phpBB/phpbb/db/driver/firebird.php
