1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 11:44:08 +02:00

[ticket/12273] Do not allow 3.1-A1 version

PHPBB3-12273
This commit is contained in:
Joas Schilling
2014-04-25 12:31:57 +02:00
parent b32895308d
commit 48278f122c
3 changed files with 12 additions and 23 deletions

View File

@@ -544,23 +544,15 @@ class php_exporter
*/
public function validate_since($line)
{
$since = substr(ltrim($line, "\t"), strlen('* @since '));
if ($since !== trim($since))
$match = array();
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 "
. "'{$this->current_event}' in file '{$this->current_file}:{$this->current_event_line}'", 1);
. "'{$this->current_event}' in file '{$this->current_file}:{$this->current_event_line}'");
}
$since = ($since === '3.1-A1') ? '3.1.0-a1' : $since;
if (!preg_match('#^\d+\.\d+\.\d+(?:-(?:a|b|rc|pl)\d+)?$#', $since))
{
throw new \LogicException("Invalid '@since' information for event "
. "'{$this->current_event}' in file '{$this->current_file}:{$this->current_event_line}'", 2);
}
return $since;
return $match[1];
}
/**