* Fyorl/ticket/10992:
[ticket/10992] Changed octetstream to octet-stream
[ticket/10992] test_empty_file() now tries to upload the correct file
[ticket/10992] Modified upload tests to work with new version
* develop-olympus:
[ticket/10981] Added check for PHP version before running composer
[ticket/10981] Modified travis to use composer with --dev
[ticket/10981] Removed setupBeforeClass
[ticket/10981] Modified functional framework to account for goutte changes
[ticket/10981] Added goutte via composer
Conflicts:
.travis.yml
composer.phar
phpBB/composer.json
phpBB/composer.lock
tests/bootstrap.php
* Fyorl/ticket/10981:
[ticket/10981] Added check for PHP version before running composer
[ticket/10981] Modified travis to use composer with --dev
[ticket/10981] Removed setupBeforeClass
[ticket/10981] Modified functional framework to account for goutte changes
[ticket/10981] Added goutte via composer
* develop-olympus:
[ticket/10678] Typo and formatting
[ticket/10678] Add port handling for MSSQL tests
[ticket/10678] Move config changes to new location
[ticket/10678] Rename helper class file
[ticket/10678] Lowercase class name, adjust comment width
[ticket/10678] More formatting and docblocks
[ticket/10678] More formatting requests
[ticket/10678] Fix formatting
[ticket/10678] Add better support for Firebird, Oracle, and MSSQL
* github-noxwizard/ticket/10678:
[ticket/10678] Typo and formatting
[ticket/10678] Add port handling for MSSQL tests
[ticket/10678] Move config changes to new location
[ticket/10678] Rename helper class file
[ticket/10678] Lowercase class name, adjust comment width
[ticket/10678] More formatting and docblocks
[ticket/10678] More formatting requests
[ticket/10678] Fix formatting
[ticket/10678] Add better support for Firebird, Oracle, and MSSQL
Conflicts:
tests/RUNNING_TESTS.txt
* nickvergessen/ticket/10942:
[ticket/10942] Avoid possible conflicts with magic words in unit tests
[ticket/10942] Add access modifiers
[ticket/10942] Use ANSI SQL standard || in dbal.php
[ticket/10942] Fix up unit tests for sql_case()
[ticket/10942] Require same data type and do not cast expressions automatically
[ticket/10942] Make unit tests for sql_case simpler
[ticket/10942] Add a comment why we cast to sql_case()
[ticket/10942] Rename method sql_conditional() to sql_case()
[ticket/10942] Change term string to expression to avoid confusion
[ticket/10942] Fix sql_conditional for mssql, postgre and oracle
[ticket/10942] Fix function name on order_lower_test.php
[ticket/10942] Add unit tests for sql_concatenate
[ticket/10942] Add sql_concatenate to dbal
[ticket/10942] Add unit tests for sql_conditional
[ticket/10942] Add sql_conditional to dbal
Since the is_image change, the filespec class no longer trusts the
browser's reported mimetype and instead checks the file itself. Thus
pretending a text file had the mimetype of an image will no longer
fail, the file will simply not be treated as an image.
PHPBB3-10941
Had to remove one of the tests due to a small limitation with the
functional testing framework. May mark the test as incomplete again
pending further comments.
PHPBB3-10941
Uses phpbb_mock_lang to return the key used when setting errors to
allow that key to be checked for during tests rather than just checking
if any error was set.
PHPBB3-10941
NOTE: test_form_upload() is broken. Uploading files via Symfony fails to
retain $_FILES['fileupload']['type'] even if it set explicitely. This appears
to be a bug in Symfony. Since the current version of filespec::is_image()
relies on the mimetype, these tests will __fail__. filespec::is_image() has
been fixed in https://github.com/phpbb/phpbb3/pull/833 however.
PHPBB3-10941
* github-bantu/ticket/10973:
[ticket/10973] Drop all require_once for mocks. Use autoloading.
[ticket/10973] Add autoloader for autoloading phpbb_mock_ in tests.
Conflicts:
tests/bbcode/url_bbcode_test.php
tests/text_processing/censor_text_test.php
