Merge branch 'develop-ascraeus' into develop

This commit is contained in:
Joas Schilling 2014-10-15 18:31:55 +02:00
commit 7de0e17711
3 changed files with 36 additions and 9 deletions

View file

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

View file

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