6 files changed, 67 insertions, 32 deletions
diff --git a/tests/event/fixtures/trigger_wspace.test b/tests/event/fixtures/trigger_wspace.test
new file mode 100644
index 0000000000..0334a9c80b
--- /dev/null
+++ b/tests/event/fixtures/trigger_wspace.test
@@ -0,0 +1,15 @@
+<?php
+
+	/**
+	 * Event after the post data has been assigned to the template
+	 *
+	 * @event core.trigger
+	 * @var	int		start				Start item of this page
+	 * @var	int		current_row_number	Number of the post on this page
+	 * @var	int		end					Number of posts on this page
+	 * @var	array	row					Array with original post and user data
+	 * @var	array	cp_row				Custom profile field data of the poster
+	 * @since 3.1.0-a3
+	 */
+	$vars = array('start', 'current_row_number', 'end', 'row', 'cp_row');
+	extract($phpbb_dispatcher->trigger_event('core.trigger', compact($vars)));
diff --git a/tests/event/php_exporter_test.php b/tests/event/php_exporter_test.php
index b52d68e305..692a57f93c 100644
--- a/tests/event/php_exporter_test.php
+++ b/tests/event/php_exporter_test.php
@@ -62,6 +62,18 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
 				),
 			),
 			array(
+				'trigger_wspace.test',
+				array(
+					'core.trigger'	=> array(
+						'event'			=> 'core.trigger',
+						'file'			=> 'trigger_wspace.test',
+						'arguments'		=> array('cp_row', 'current_row_number', 'end', 'row', 'start'),
+						'since'			=> '3.1.0-a3',
+						'description'	=> 'Event after the post data has been assigned to the template',
+					),
+				),
+			),
+			array(
 				'trigger_many_vars.test',
 				array(
 					'core.posting_modify_template_vars'	=> array(
@@ -119,6 +131,7 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
 			array('* @since 3.1.0-b3', '3.1.0-b3'),
 			array('	* @since 3.1.0-b3', '3.1.0-b3'),
 			array('* @since 3.1.0-RC2', '3.1.0-RC2'),
+			array(' * @since 3.1.0-a1', '3.1.0-a1'),
 		);
 	}
 
@@ -133,7 +146,6 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
 	static public function validate_since_throws_data()
 	{
 		return array(
-			array(' * @since 3.1.0-a1'),
 			array('* @since 3.1.0-a1 '),
 			array('* @since 3.1.0-a1 bertie is cool'),
 			array('bertie* @since 3.1.0-a1'),
@@ -156,6 +168,7 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
 		return array(
 			array('test.event', '* @event test.event', 'test.event'),
 			array('test.event2', '	* @event test.event2', 'test.event2'),
+			array('test.event', ' * @event test.event', 'test.event'),
 		);
 	}
 
@@ -170,7 +183,6 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
 	static public function validate_event_throws_data()
 	{
 		return array(
-			array('test.event', ' * @event test.event', 1),
 			array('test.event', '* @event test.event bertie is cool', 2),
 			array('test.event', 'bertie* @event test.event', 2),
 		);
diff --git a/tests/functional/notification_test.php b/tests/functional/notification_test.php
index 667d268b1e..ec03f7a6a4 100644
--- a/tests/functional/notification_test.php
+++ b/tests/functional/notification_test.php
@@ -82,8 +82,6 @@ class phpbb_functional_notification_test extends phpbb_functional_test_case
 		// Get form token
 		$link = $crawler->selectLink($this->lang('NOTIFICATIONS_MARK_ALL_READ'))->link()->getUri();
 		$crawler = self::request('GET', substr($link, strpos($link, 'ucp.')));
-		$form = $crawler->selectButton($this->lang('YES'))->form();
-		$crawler = self::submit($form);
 		$this->assertEquals(0, $crawler->filter('#notification_list_button strong')->text());
 	}
 }
diff --git a/tests/session/session_key_test.php b/tests/session/session_key_test.php
index 31a470615c..bf3dfcaa3c 100644
--- a/tests/session/session_key_test.php
+++ b/tests/session/session_key_test.php
@@ -11,6 +11,7 @@
 *
 */
 
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 require_once dirname(__FILE__) . '/../test_framework/phpbb_session_test_case.php';
 
 class phpbb_session_login_keys_test extends phpbb_session_test_case
@@ -28,13 +29,14 @@ class phpbb_session_login_keys_test extends phpbb_session_test_case
 		// With AutoLogin setup
 		$this->session_factory->merge_config_data(array('allow_autologin' => true));
 		$session = $this->session_factory->get_session($this->db);
+
 		// Using a user_id and key that is already in the database
 		$session->cookie_data['u'] = $this->user_id;
 		$session->cookie_data['k'] = $this->key_id;
-		// Try to access session
-		$session->session_create($this->user_id, false, $this->user_id);
 
-		$this->assertEquals($this->user_id, $session->data['user_id'], "session should automatically login");
+		// Try to access session with the session key
+		$session->session_create(false, false, false);
+		$this->assertEquals($this->user_id, $session->data['user_id'], 'User should be logged in by the session key');
 	}
 
 	public function test_reset_keys()
@@ -42,14 +44,19 @@ class phpbb_session_login_keys_test extends phpbb_session_test_case
 		// With AutoLogin setup
 		$this->session_factory->merge_config_data(array('allow_autologin' => true));
 		$session = $this->session_factory->get_session($this->db);
+
 		// Reset of the keys for this user
 		$session->reset_login_keys($this->user_id);
+
 		// Using a user_id and key that was in the database (before reset)
 		$session->cookie_data['u'] = $this->user_id;
 		$session->cookie_data['k'] = $this->key_id;
-		// Try to access session
-		$session->session_create($this->user_id, false, $this->user_id);
 
-		$this->assertNotEquals($this->user_id, $session->data['user_id'], "session should be cleared");
+		// Try to access session with the session key
+		$session->session_create(false, false, $this->user_id);
+		$this->assertNotEquals($this->user_id, $session->data['user_id'], 'User is not logged in because the session key is invalid');
+
+		$session->session_create($this->user_id, false, false);
+		$this->assertEquals($this->user_id, $session->data['user_id'], 'User should be logged in because we create a new session');
 	}
 }
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index 26989fa345..fc1a3632f4 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -54,37 +54,31 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 	static public function setUpBeforeClass()
 	{
+		global $phpbb_root_path, $phpEx;
+
 		$setup_extensions = static::setup_extensions();
 
-		$schema_md5 = md5(serialize($setup_extensions));
-		self::$schema_file = __DIR__ . '/../tmp/' . $schema_md5 . '.json';
+		$finder = new \phpbb\finder(new \phpbb\filesystem(), $phpbb_root_path, null, $phpEx);
+		$finder->core_path('phpbb/db/migration/data/');
+		if (!empty($setup_extensions))
+		{
+			$finder->set_extensions($setup_extensions)
+				->extension_directory('/migrations');
+		}
+		$classes = $finder->get_classes();
+
+		$schema_sha1 = sha1(serialize($classes));
+		self::$schema_file = __DIR__ . '/../tmp/' . $schema_sha1 . '.json';
 		self::$install_schema_file = __DIR__ . '/../../phpBB/install/schemas/schema.json';
 
 		if (!file_exists(self::$schema_file))
 		{
-			global $phpbb_root_path, $phpEx, $table_prefix;
-			$finder = new \phpbb\finder(new \phpbb\filesystem(), $phpbb_root_path, null, $phpEx);
-
-			if (!empty($setup_extensions))
-			{
-				$classes = $finder->core_path('phpbb/db/migration/data/')
-					->set_extensions($setup_extensions)
-					->extension_directory('/migrations')
-					->get_classes();
-
-			}
-			else
-			{
 
-				$classes = $finder->core_path('phpbb/db/migration/data/')
-					->get_classes();
-			}
+			global $table_prefix;
 
 			$db = new \phpbb\db\driver\sqlite();
 			$schema_generator = new \phpbb\db\migration\schema_generator($classes, new \phpbb\config\config(array()), $db, new \phpbb\db\tools($db, true), $phpbb_root_path, $phpEx, $table_prefix);
-			$schema_data = $schema_generator->get_schema();
-
-			file_put_contents(self::$schema_file, json_encode($schema_data));
+			file_put_contents(self::$schema_file, json_encode($schema_generator->get_schema()));
 		}
 
 		copy(self::$schema_file, self::$install_schema_file);
@@ -94,7 +88,11 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 	static public function tearDownAfterClass()
 	{
-		unlink(self::$install_schema_file);
+		if (file_exists(self::$install_schema_file))
+		{
+			unlink(self::$install_schema_file);
+		}
+
 		parent::tearDownAfterClass();
 	}
 
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()