diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-25 14:06:39 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-25 14:06:39 +0200 |
| commit | d083f292445503a13fa9e9a0f1e86eee05358c18 (patch) | |
| tree | 46f67bc7be4c76f072354819eede3929d55f38ec | |
| parent | 3e9d62b9b08691f38f53eb79cdac3698a108a46b (diff) | |
| parent | 1b0b4cd5e2c54ace7c7b7955c3d1b1b4fd386140 (diff) | |
| download | forums-d083f292445503a13fa9e9a0f1e86eee05358c18.tar forums-d083f292445503a13fa9e9a0f1e86eee05358c18.tar.gz forums-d083f292445503a13fa9e9a0f1e86eee05358c18.tar.bz2 forums-d083f292445503a13fa9e9a0f1e86eee05358c18.tar.xz forums-d083f292445503a13fa9e9a0f1e86eee05358c18.zip | |
Merge pull request #2650 from PayBas/ticket/12766
[ticket/12766] Event exporter does not like RCx as version
* PayBas/ticket/12766:
[ticket/12766] Event exporter does not like RCx as version
| -rw-r--r-- | phpBB/phpbb/event/md_exporter.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/event/php_exporter.php | 2 | ||||
| -rw-r--r-- | tests/event/php_exporter_test.php | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php index a11c2a457f..f7021875f3 100644 --- a/phpBB/phpbb/event/md_exporter.php +++ b/phpBB/phpbb/event/md_exporter.php @@ -227,7 +227,7 @@ class md_exporter */ public function validate_since($since) { - if (!preg_match('#^\d+\.\d+\.\d+(?:-(?:a|b|rc|pl)\d+)?$#', $since)) + if (!preg_match('#^\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+)?$#', $since)) { throw new \LogicException("Invalid since information found for event '{$this->current_event}'"); } diff --git a/phpBB/phpbb/event/php_exporter.php b/phpBB/phpbb/event/php_exporter.php index 3d2819a3a1..badbbb48fd 100644 --- a/phpBB/phpbb/event/php_exporter.php +++ b/phpBB/phpbb/event/php_exporter.php @@ -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 " diff --git a/tests/event/php_exporter_test.php b/tests/event/php_exporter_test.php index 823d90b63f..b52d68e305 100644 --- a/tests/event/php_exporter_test.php +++ b/tests/event/php_exporter_test.php @@ -118,6 +118,7 @@ class phpbb_event_php_exporter_test extends phpbb_test_case array('* @since 3.1.0-a1', '3.1.0-a1'), 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'), ); } @@ -137,6 +138,7 @@ class phpbb_event_php_exporter_test extends phpbb_test_case array('* @since 3.1.0-a1 bertie is cool'), array('bertie* @since 3.1.0-a1'), array('* @since 3.1-A2'), + array('* @since 3.1.0-rc1'), ); } |