Skip to content

Handle unparseable tags gracefully #5894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schlessera merged 1 commit into from
Feb 5, 2024
+22 −5
Merged

Handle unparseable tags gracefully #5894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Handle unparseable tags gracefully
  • Loading branch information
@schlessera
schlessera committed Feb 5, 2024
commit a5d2e2c861f1dae4d25f6be0d9e1641cc8daba63
14 changes: 9 additions & 5 deletions php/utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,12 +962,16 @@ function get_named_sem_ver( $new_version, $original_version ) {
$patch = $bits[2];
}

if ( isset( $minor ) && Semver::satisfies( $new_version, "{$major}.{$minor}.x" ) ) {
return 'patch';
}
try {
if ( isset( $minor ) && Semver::satisfies( $new_version, "{$major}.{$minor}.x" ) ) {
return 'patch';
}

if ( Semver::satisfies( $new_version, "{$major}.x.x" ) ) {
return 'minor';
if ( Semver::satisfies( $new_version, "{$major}.x.x" ) ) {
return 'minor';
}
} catch ( \UnexpectedValueException $e ) {
return '';
}

return 'major';
Expand Down
13 changes: 13 additions & 0 deletions tests/test-utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ public function testGetSemVer() {
$original_version = '0.19.1';
$this->assertEmpty( Utils\get_named_sem_ver( '0.18.0', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( '0.19.1', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( 'nonsense', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( '0.18.1-beta3', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( '0.19.1-dev1', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( '0.19.1-beta3', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( '0.19.2-dev1', $original_version ) ); // -dev suffix not accepted by SemVer.
$this->assertEquals( 'patch', Utils\get_named_sem_ver( '0.19.2-beta3', $original_version ) );
$this->assertEquals( 'patch', Utils\get_named_sem_ver( '0.19.2', $original_version ) );
$this->assertEquals( 'minor', Utils\get_named_sem_ver( '0.20.0', $original_version ) );
$this->assertEquals( 'minor', Utils\get_named_sem_ver( '0.20.3', $original_version ) );
Expand All @@ -54,7 +60,14 @@ public function testGetSemVerWP() {
$original_version = '3.0';
$this->assertEmpty( Utils\get_named_sem_ver( '2.8', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( '2.9.1', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( 'nonsense', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( '2.0-beta3', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( '3.0-dev1', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( '3.0-beta3', $original_version ) );
$this->assertEmpty( Utils\get_named_sem_ver( '3.0.1-dev1', $original_version ) ); // -dev suffix not accepted by SemVer.
$this->assertEquals( 'patch', Utils\get_named_sem_ver( '3.0.1-beta3', $original_version ) );
$this->assertEquals( 'patch', Utils\get_named_sem_ver( '3.0.1', $original_version ) );
$this->assertEquals( 'minor', Utils\get_named_sem_ver( '3.1-beta3', $original_version ) );
$this->assertEquals( 'minor', Utils\get_named_sem_ver( '3.1', $original_version ) );
$this->assertEquals( 'minor', Utils\get_named_sem_ver( '3.1.1', $original_version ) );
$this->assertEquals( 'major', Utils\get_named_sem_ver( '4.0', $original_version ) );
Expand Down