* 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
using keyword_search method instead of get_name to distinguish between the
search backend classes present in includes/search and other helper classes.
PHPBB3-10946
Break the classes in functions-sphinx.php into different files
with proper class names according to phpbb class auto loader conventions.
PHPBB3-10946
Conflicts:
phpBB/includes/search/sphinx/config.php
Uses sql_build_query for JOIN query. Remove casting to int and space for
phpbb conventions to be followed
PHPBB3-10946
Conflicts:
phpBB/includes/search/fulltext_sphinx.php
* 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.
...
