* develop:
[ticket/11012] Fix php_ext change in mock_extension_manager
[ticket/11012] Normalize $phpEx member vars to $php_ext
[ticket/11002] Use translating option to rename the Etc/GMT options
Conflicts:
phpBB/includes/extension/manager.php
PHPBB3-11015
This allows us to just create the object without having to include the
driver first. However, it also means that users must specify the full
class name in config.php
* develop-olympus:
[ticket/10950] Fix grammar in comments
[ticket/10950] Delete PMs for users that have not yet read the pm
[ticket/10950] Fix unit tests to fit the new pm deleting behaviour
[ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
[ticket/10950] Remove deleted entries in tests instead of commenting them out
[ticket/10950] Use database count() and group by instead of doing that in php
[ticket/10950] Check $delete_ids to be not empty
[ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
[ticket/10950] Fix unit tests to reflect desired behaviour
[ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
[ticket/10950] Correct comment for the second query.
[ticket/10950] Add empty line to make unset() call more visible.
[ticket/10950] Select the correct columns in SQL queries.
[ticket/10950] Use a variable for the private message id.
[ticket/10950] Move array initialisation to the front.
[ticket/10950] Remove redundant if statement.
[ticket/10950] Fix SQL coding style (indentation) in second SQL query.
[ticket/10950] Use proper ' in order to fix comment.
* prep-release-3.0.11:
[ticket/10950] Fix grammar in comments
[ticket/10950] Delete PMs for users that have not yet read the pm
[ticket/10950] Fix unit tests to fit the new pm deleting behaviour
[ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
[ticket/10950] Remove deleted entries in tests instead of commenting them out
[ticket/10950] Use database count() and group by instead of doing that in php
[ticket/10950] Check $delete_ids to be not empty
[ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
[ticket/10950] Fix unit tests to reflect desired behaviour
[ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
[ticket/10950] Correct comment for the second query.
[ticket/10950] Add empty line to make unset() call more visible.
[ticket/10950] Select the correct columns in SQL queries.
[ticket/10950] Use a variable for the private message id.
[ticket/10950] Move array initialisation to the front.
[ticket/10950] Remove redundant if statement.
[ticket/10950] Fix SQL coding style (indentation) in second SQL query.
[ticket/10950] Use proper ' in order to fix comment.
* develop: (441 commits)
[feature/new-tz-handling] Don't use global user but make it a parameter
[feature/new-tz-handling] Fix size of suggestion button in chrome
[feature/new-tz-handling] Fall back to UTC, if the timezone is invalid
[feature/new-tz-handling] Add previous selected value to validation if valid
[feature/new-tz-handling] Display suggestion when a different value is selected
[ticket/10998] Add border-radius to forum rules block - prosilver
[feature/new-tz-handling] Remove additional marking of selected items
[feature/new-tz-handling] Move update helper function to new class
[feature/new-tz-handling] Fix unit test
[feature/new-tz-handling] Delete old variable which is not used anymore
[feature/new-tz-handling] Rename $user->tz back to $user->timezone
[feature/pagination-as-list] New parameter for name of start var
[feature/pagination-as-list] Updates for nils comments
[feature/pagination-as-list] Rename and deprecate functions
[feature/pagination-as-list] Various fixes and improvements
[ticket/10968] Render pagination within the template
[feature/new-tz-handling] Remove "timezone might be numeric"
[feature/new-tz-handling] Add function to update the timezone
[feature/new-tz-handling] Correctly update user and board timezones on update
[ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
...
Conflicts:
phpBB/common.php
phpBB/composer.json
phpBB/composer.lock
tests/cron/task_provider_test.php
* github-nickvergessen/ticket/10950:
[ticket/10950] Fix grammar in comments
[ticket/10950] Delete PMs for users that have not yet read the pm
[ticket/10950] Fix unit tests to fit the new pm deleting behaviour
[ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
[ticket/10950] Remove deleted entries in tests instead of commenting them out
[ticket/10950] Use database count() and group by instead of doing that in php
[ticket/10950] Check $delete_ids to be not empty
[ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
[ticket/10950] Fix unit tests to reflect desired behaviour
[ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
[ticket/10950] Correct comment for the second query.
[ticket/10950] Add empty line to make unset() call more visible.
[ticket/10950] Select the correct columns in SQL queries.
[ticket/10950] Use a variable for the private message id.
[ticket/10950] Move array initialisation to the front.
[ticket/10950] Remove redundant if statement.
[ticket/10950] Fix SQL coding style (indentation) in second SQL query.
[ticket/10950] Use proper ' in order to fix comment.
* 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
