From e0180991bfb2d1b3fe6c01065f1741ff77948aa2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 2 May 2015 10:18:19 +0200 Subject: [ticket/13807] Allow filtering events by phpBB version PHPBB3-13807 --- phpBB/develop/export_events_for_wiki.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'phpBB/develop/export_events_for_wiki.php') diff --git a/phpBB/develop/export_events_for_wiki.php b/phpBB/develop/export_events_for_wiki.php index 2096e9c858..721f4f18e3 100644 --- a/phpBB/develop/export_events_for_wiki.php +++ b/phpBB/develop/export_events_for_wiki.php @@ -18,6 +18,7 @@ if (php_sapi_name() != 'cli') $phpEx = substr(strrchr(__FILE__, '.'), 1); $phpbb_root_path = __DIR__ . '/../'; +define('IN_PHPBB', true); function usage() { @@ -54,9 +55,11 @@ function validate_argument_count($arguments, $count) validate_argument_count($argc, 1); $action = $argv[1]; -$extension = isset($argv[2]) ? $argv[2] : null; +$extension = isset($argv[2]) && $argv[2] !== 'null' ? $argv[2] : null; +$min_version = isset($argv[3]) ? $argv[3] : null; require __DIR__ . '/../phpbb/event/php_exporter.' . $phpEx; require __DIR__ . '/../phpbb/event/md_exporter.' . $phpEx; +require __DIR__ . '/../includes/functions.' . $phpEx; require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx; require __DIR__ . '/../phpbb/recursive_dot_prefix_filter_iterator.' . $phpEx; @@ -66,7 +69,7 @@ switch ($action) echo '__FORCETOC__' . "\n"; case 'php': - $exporter = new \phpbb\event\php_exporter($phpbb_root_path, $extension); + $exporter = new \phpbb\event\php_exporter($phpbb_root_path, $extension, $min_version); $exporter->crawl_phpbb_directory_php(); echo $exporter->export_events_for_wiki(); -- cgit v1.2.1 From 96d97ae2d2afc3574d7ba28a40c40c1e772398fb Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 2 May 2015 14:33:31 +0200 Subject: [ticket/13807] Add an option to generate a diff for the release highlights PHPBB3-13807 --- phpBB/develop/export_events_for_wiki.php | 47 ++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 9 deletions(-) (limited to 'phpBB/develop/export_events_for_wiki.php') diff --git a/phpBB/develop/export_events_for_wiki.php b/phpBB/develop/export_events_for_wiki.php index 721f4f18e3..029affcbe9 100644 --- a/phpBB/develop/export_events_for_wiki.php +++ b/phpBB/develop/export_events_for_wiki.php @@ -28,6 +28,9 @@ function usage() echo " all:\n"; echo " Generate the complete wikipage for https://wiki.phpbb.com/Event_List\n"; echo "\n"; + echo " diff:\n"; + echo " Generate the Event Diff for the release highlights\n"; + echo "\n"; echo " php:\n"; echo " Generate the PHP event section of Event_List\n"; echo "\n"; @@ -37,6 +40,9 @@ function usage() echo " styles:\n"; echo " Generate the Styles Template event section of Event_List\n"; echo "\n"; + echo "VERSION (diff only):\n"; + echo " Filter events (minimum version)\n"; + echo "\n"; echo "EXTENSION (Optional):\n"; echo " If not given, only core events will be exported.\n"; echo " Otherwise only events from the extension will be exported.\n"; @@ -55,8 +61,8 @@ function validate_argument_count($arguments, $count) validate_argument_count($argc, 1); $action = $argv[1]; -$extension = isset($argv[2]) && $argv[2] !== 'null' ? $argv[2] : null; -$min_version = isset($argv[3]) ? $argv[3] : null; +$extension = isset($argv[2]) ? $argv[2] : null; +$min_version = null; require __DIR__ . '/../phpbb/event/php_exporter.' . $phpEx; require __DIR__ . '/../phpbb/event/md_exporter.' . $phpEx; require __DIR__ . '/../includes/functions.' . $phpEx; @@ -68,10 +74,19 @@ switch ($action) case 'all': echo '__FORCETOC__' . "\n"; + case 'diff': + if ($action === 'diff') + { + echo '== Event changes ==' . "\n"; + } + $min_version = $extension; + $extension = isset($argv[3]) ? $argv[3] : null; + + case 'php': $exporter = new \phpbb\event\php_exporter($phpbb_root_path, $extension, $min_version); $exporter->crawl_phpbb_directory_php(); - echo $exporter->export_events_for_wiki(); + echo $exporter->export_events_for_wiki($action); if ($action === 'php') { @@ -81,9 +96,16 @@ switch ($action) // no break; case 'styles': - $exporter = new \phpbb\event\md_exporter($phpbb_root_path, $extension); - $exporter->crawl_phpbb_directory_styles('docs/events.md'); - echo $exporter->export_events_for_wiki(); + $exporter = new \phpbb\event\md_exporter($phpbb_root_path, $extension, $min_version); + if ($min_version && $action === 'diff') + { + $exporter->crawl_eventsmd('docs/events.md', 'styles'); + } + else + { + $exporter->crawl_phpbb_directory_styles('docs/events.md'); + } + echo $exporter->export_events_for_wiki($action); if ($action === 'styles') { @@ -93,9 +115,16 @@ switch ($action) // no break; case 'adm': - $exporter = new \phpbb\event\md_exporter($phpbb_root_path, $extension); - $exporter->crawl_phpbb_directory_adm('docs/events.md'); - echo $exporter->export_events_for_wiki(); + $exporter = new \phpbb\event\md_exporter($phpbb_root_path, $extension, $min_version); + if ($min_version && $action === 'diff') + { + $exporter->crawl_eventsmd('docs/events.md', 'adm'); + } + else + { + $exporter->crawl_phpbb_directory_adm('docs/events.md'); + } + echo $exporter->export_events_for_wiki($action); if ($action === 'all') { -- cgit v1.2.1 From 45baaf602289f3d148739999d5972852b45dd882 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 2 May 2015 17:29:55 +0200 Subject: [ticket/13807] Only output the header for diff PHPBB3-13807 --- phpBB/develop/export_events_for_wiki.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'phpBB/develop/export_events_for_wiki.php') diff --git a/phpBB/develop/export_events_for_wiki.php b/phpBB/develop/export_events_for_wiki.php index 029affcbe9..004a200f1d 100644 --- a/phpBB/develop/export_events_for_wiki.php +++ b/phpBB/develop/export_events_for_wiki.php @@ -71,17 +71,18 @@ require __DIR__ . '/../phpbb/recursive_dot_prefix_filter_iterator.' . $phpEx; switch ($action) { - case 'all': - echo '__FORCETOC__' . "\n"; case 'diff': - if ($action === 'diff') - { - echo '== Event changes ==' . "\n"; - } + echo '== Event changes ==' . "\n"; $min_version = $extension; $extension = isset($argv[3]) ? $argv[3] : null; + case 'all': + if ($action === 'all') + { + echo '__FORCETOC__' . "\n"; + } + case 'php': $exporter = new \phpbb\event\php_exporter($phpbb_root_path, $extension, $min_version); -- cgit v1.2.1 From 740be0507e209afda5eb954ab674e557c2d8f8f6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 5 May 2015 18:35:57 +0200 Subject: [ticket/13807] Add version to the usage output PHPBB3-13807 --- phpBB/develop/export_events_for_wiki.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/develop/export_events_for_wiki.php') diff --git a/phpBB/develop/export_events_for_wiki.php b/phpBB/develop/export_events_for_wiki.php index 004a200f1d..be16e5e7cd 100644 --- a/phpBB/develop/export_events_for_wiki.php +++ b/phpBB/develop/export_events_for_wiki.php @@ -22,7 +22,7 @@ define('IN_PHPBB', true); function usage() { - echo "Usage: export_events_for_wiki.php COMMAND [EXTENSION]\n"; + echo "Usage: export_events_for_wiki.php COMMAND [VERSION] [EXTENSION]\n"; echo "\n"; echo "COMMAND:\n"; echo " all:\n"; -- cgit v1.2.1