* 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
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.
PHPBB3-10968
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.
Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.
PHPBB3-10968
* 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
* github-bantu/ticket/10969:
[ticket/10969] Also remove COMMENTS key from data array in get_available_dbms()
[ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).
* 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
When performing an action on users in the ACP Inactive Users, such as activating, deleting, or reminding, trigger_error is now called to give a notification that the action was performed
PHPBB3-7598
* Fyorl/ticket/10941: (30 commits)
[ticket/10941] Removed superfluous array
[ticket/10941] File 'txt' now too big so changed tests to reflect that
[ticket/10941] Added a comment to ensure tags stay uppercase
[ticket/10941] Modified tearDown to use DirectoryIterator instead of glob
[ticket/10941] Added tests/upload/fixture/copies to tracking
[ticket/10941] Fixed form test test_too_large
[ticket/10941] Replaced use of English with language system
[ticket/10941] Renamed classes and filenames so that tests run
[ticket/10941] Moved comment into markTestIncomplete parameter
[ticket/10941] Removed manual includes of mock classes
[ticket/10941] Added subdirectory for file operations
[ticket/10941] Added some comments for clarification
[ticket/10941] Fixed a failing test
[ticket/10941] Rearranged tests into their own classes or methods
[ticket/10941] Removed the incomplete mark as is_image is fixed
[ticket/10941] Refactored tearDown to stop iterating over the directory.
[ticket/10941] Refactored init_filespec to return new object.
[ticket/10941] Minor typo fixes
[ticket/10941] Changed assertTrue to assertEquals
[ticket/10941] Now actually checks for the value of errors.
...
