diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-20 22:19:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-20 22:19:25 +0200 |
| commit | 75b6545bc271f4e488cf8dc7708a871e4c7dc446 (patch) | |
| tree | aca90d9f76ba75db4daf1cec04e755757dae53e6 /tests/test_framework/phpbb_session_test_case.php | |
| parent | 973dfbf868f2c75c02ae7cdff0056ecf9c665d70 (diff) | |
| parent | dec6c7ea8cd147e41a9095a77c1af41480dff654 (diff) | |
| download | forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar.gz forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar.bz2 forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.tar.xz forums-75b6545bc271f4e488cf8dc7708a871e4c7dc446.zip | |
Merge pull request #3040 from nickvergessen/ticket/13138-asc
[3.1] Ticket/13138 Only use cookie data when we do not force a user_id
Conflicts:
phpBB/phpbb/session.php
Diffstat (limited to 'tests/test_framework/phpbb_session_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_session_test_case.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index d4fc174a12..efad4d5166 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -16,8 +16,13 @@ require_once dirname(__FILE__) . '/../session/testable_facade.php'; abstract class phpbb_session_test_case extends phpbb_database_test_case { + /** @var phpbb_session_testable_factory */ protected $session_factory; + + /** @var phpbb_session_testable_facade */ protected $session_facade; + + /** @var \phpbb\db\driver\driver_interface */ protected $db; function setUp() |