Andreas Fischer b7b8fefdd0 Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/10205] Reduce nesting in mysql drivers. [ticket/10205] Rewrite _sql_error implementations to have a single return. [ticket/10205] Cosmetic changes. [ticket/10205] Add some columns to the empty fixture file for mssqlnative. [ticket/10205] Delete stray return. [ticket/10205] Test failed connection attempts. [ticket/10205] Check for function existence in mssql connect method. [ticket/10205] Convert mssqlnative driver to the same logic. [ticket/10205] Fix a parse error in oracle driver. [ticket/10205] Fix remaining db drivers. [ticket/10205] Avoid calling mysqli functions when mysqli is missing. [ticket/10205] Account for potentially missing extensions in dbal. Conflicts: tests/fixtures/empty.xml		2012-12-08 03:08:21 +01:00
..
bbcode	Merge branch 'develop-olympus' into develop	2012-07-08 23:10:42 +02:00
cache	Merge remote-tracking branch 'p/ticket/9983' into develop	2012-12-04 14:06:15 +01:00
class_loader	[ticket/10973] Drop all require_once for mocks. Use autoloading.	2012-07-08 22:57:23 +02:00
compress	[ticket/11109] Re-add file conflict checks to compress class	2012-09-14 01:26:33 +02:00
config	[ticket/10973] Drop all require_once for mocks. Use autoloading.	2012-07-08 22:57:23 +02:00
controller	[feature/controller] Reword comment for clarification	2012-11-16 17:05:57 -05:00
cron	[feature/compiled-dic] Remove old test	2012-11-10 12:02:55 +01:00
datetime	[feature/new-tz-handling] Fix unit test	2012-07-18 17:16:34 +02:00
dbal	Merge branch 'develop-olympus' into develop	2012-12-08 03:08:21 +01:00
di	[ticket/11152] Basic tests for the container functions	2012-11-11 17:56:09 +01:00
download	[ticket/10973] Drop all require_once for mocks. Use autoloading.	2012-07-08 22:57:23 +02:00
event	[feature/compiled-dic] Compile the DI Container into a cached class	2012-11-10 11:40:09 +01:00
extension	[ticket/10933] Dependency inject template context.	2012-11-02 18:51:35 -04:00
fixtures	[ticket/10205] Add some columns to the empty fixture file for mssqlnative.	2012-12-04 19:00:42 -05:00
functional	Merge remote-tracking branch 'p/ticket/11202' into develop	2012-11-29 20:01:44 +01:00
functions	[ticket/11192] Merge dataProvider arrays because the test is the same now.	2012-11-16 16:20:55 +01:00
functions_acp	[feature/php-events] Add mock for unit tests and create it were needed	2012-08-11 15:25:14 +02:00
group_positions	[ticket/10733] Removing static from data providers	2012-04-01 19:14:53 +03:00
lock	[ticket/10103] Assert with messages.	2012-12-04 13:50:35 -05:00
mock	Merge PR #974 branch 'bantu/ticket/10875' into develop	2012-11-30 20:44:51 -05:00
network	[ticket/9916] Updating license in non-distributed files	2012-01-02 19:10:36 +01:00
privmsgs	[ticket/11159] static public is the currently approved order.	2012-11-06 10:41:06 -05:00
profile	[ticket/9916] Updating License in the header	2012-01-02 16:18:32 +00:00
random	[ticket/9916] Updating License in the header	2012-01-02 16:18:32 +00:00
regex	[ticket/10162] Add test cases for top level domain names longer than 6 chars.	2012-05-30 21:11:17 +02:00
request	Merge remote-tracking branch 'Fyorl/ticket/10939' into develop	2012-11-10 23:49:29 +01:00
search	[ticket/11174] Global $cache is a cache service instance.	2012-11-27 10:24:31 -05:00
security	[ticket/11159] static public is the currently approved order.	2012-11-06 10:41:06 -05:00
session	[ticket/11248] Line endings to LF.	2012-12-05 20:11:00 -05:00
template	Merge remote-tracking branch 'p/ticket/10933' into develop	2012-11-17 19:49:03 +01:00
test_framework	Merge PR #1101 branch 'develop-olympus' into develop	2012-12-06 01:18:31 -05:00
text_processing	[ticket/11159] static public is the currently approved order.	2012-11-06 10:41:06 -05:00
tmp	[ticket/10309] Update .gitignore and move .gitkeep.	2011-08-20 14:34:02 -04:00
upload	[ticket/10939] Modified fileupload tests to deal with new behaviour	2012-08-15 15:56:43 +01:00
user	[feature/class-prefix] Rename user and session to phpbb_*	2012-03-31 18:14:07 +02:00
utf	[ticket/11159] static public is the currently approved order.	2012-11-06 10:41:06 -05:00
wrapper	[ticket/10931] Also test get_bytes() and get_string() with false.	2012-06-11 15:46:03 +02:00
bootstrap.php	[feature/add_events] Re-fix broken test	2012-08-21 11:18:53 -04:00
error_collector_test.php	[ticket/9916] Updating License in the header	2012-01-02 16:18:32 +00:00
lint_test.php	[ticket/10716] Collect standard error from executed php process.	2012-12-04 18:52:27 -05:00
RUNNING_TESTS.txt	[ticket/9983] Add phpbb prefix to global variables.	2012-12-02 23:57:37 -05:00