Skip to content
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

Jump to bottom

Improve composer package version comparison #337

Merged
merged 1 commit into from
May 8, 2018
Merged

Improve composer package version comparison #337

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
6 changes: 4 additions & 2 deletions src/Hal/Metric/System/Packages/Composer/Packagist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ public function get($package)
// get latest version
$latest = '0.0.0';
foreach ((array)$json->package->versions as $version => $datas) {
$version = preg_replace('([^\.\d])', '', $version);
if (!preg_match('!\d+\.\d+\.\d+!', $version)) {
if ($version[0] === 'v') {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only non numeric character that should be accepted is the leading "v" character that is used by convention.
Some packages have changed from a non-leading "v" to a leading "v" format. This is why we need to remove it before running the version_compare function.

$version = substr($version, 1);
}
if (!preg_match('#^[\.\d]+$#', $version)) {
continue;
}
if ($compare = version_compare($version, $latest) == 1) {
Expand Down
2 changes: 1 addition & 1 deletion src/Hal/Report/Html/template/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
return strcmp($a->name, $b->name);
});
foreach ($packages as $package) { ?>
<tr<?php if (null !== $package->installed && $package->installed !== $package->latest) { echo ' style="color:orangered"'; }?>>
<tr<?php if (null !== $package->installed && version_compare($package->installed, $package->latest) === -1) { echo ' style="color:orangered"'; }?>>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you use a package in beta, alpha, RC (i.e non stable) version of a package and there is no stable version above the one you installed, PhpMetrics should not warn you.

<td><?php echo $package->name; ?></td>
<td><?php echo $package->required; ?></td>
<?php if (0 !== count($packagesInstalled)) {?><td><?php echo $package->installed; ?></td><?php } ?>
Expand Down