Merge branch 'develop-ascraeus' into develop

phpBB/phpbb/event/php_exporter.php

@@ -253,7 +253,7 @@ class php_exporter
 	public function get_event_name($event_line, $is_dispatch)
 	{
 		$event_text_line = $this->file_lines[$event_line];
-		$event_text_line = ltrim($event_text_line, "\t");
+		$event_text_line = ltrim($event_text_line, "\t ");
 
 		if ($is_dispatch)
 		{
@@ -389,7 +389,7 @@ class php_exporter
 		$found_comment_end = false;
 		while (ltrim($this->file_lines[$this->current_event_line - $current_doc_line], "\t") !== '/**')
 		{
-			if (ltrim($this->file_lines[$this->current_event_line - $current_doc_line], "\t") === '*/')
+			if (ltrim($this->file_lines[$this->current_event_line - $current_doc_line], "\t ") === '*/')
 			{
 				$found_comment_end = true;
 			}
@@ -471,7 +471,7 @@ class php_exporter
 	{
 		$find_tag_line = 0;
 		$found_comment_end = false;
-		while (strpos(ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t"), '* @' . $find_tag . ' ') !== 0)
+		while (strpos(ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t "), '* @' . $find_tag . ' ') !== 0)
 		{
 			if ($found_comment_end && ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t") === '/**')
 			{
@@ -482,7 +482,7 @@ class php_exporter
 
 			foreach ($disallowed_tags as $disallowed_tag)
 			{
-				if ($found_comment_end && strpos(ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t"), '* @' . $disallowed_tag) === 0)
+				if ($found_comment_end && strpos(ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t "), '* @' . $disallowed_tag) === 0)
 				{
 					// Found @var after the @since
 					throw new \LogicException("Found '@{$disallowed_tag}' information after '@{$find_tag}' for event "
@@ -490,7 +490,7 @@ class php_exporter
 				}
 			}
 
-			if (ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t") === '*/')
+			if (ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t ") === '*/')
 			{
 				$found_comment_end = true;
 			}
@@ -550,7 +550,7 @@ class php_exporter
 	public function validate_since($line)
 	{
 		$match = array();
-		preg_match('#^\* @since (\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+)?)$#', ltrim($line, "\t"), $match);
+		preg_match('#^\* @since (\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+)?)$#', ltrim($line, "\t "), $match);
 		if (!isset($match[1]))
 		{
 			throw new \LogicException("Invalid '@since' information for event "
@@ -570,7 +570,7 @@ class php_exporter
 	*/
 	public function validate_event($event_name, $line)
 	{
-		$event = substr(ltrim($line, "\t"), strlen('* @event '));
+		$event = substr(ltrim($line, "\t "), strlen('* @event '));
 
 		if ($event !== trim($event))
 		{

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)));

tests/event/php_exporter_test.php

@@ -61,6 +61,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(
@@ -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),
 		);