Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
declare(strict_types=1);

use Migrations\BaseMigration;

class AddLatestStableReleaseDateToPackages extends BaseMigration
{
/**
* @return void
*/
public function change(): void
{
$this->table('packages')
->addColumn('latest_stable_release_date', 'date', [
'default' => null,
'null' => true,
])
->update();
}
}
Binary file modified config/Migrations/schema-dump-default.lock
Binary file not shown.
25 changes: 23 additions & 2 deletions src/Command/SyncPackagesCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
use Cake\Console\Arguments;
use Cake\Console\CommandFactoryInterface;
use Cake\Console\ConsoleIo;
use Cake\I18n\Date;
use Cake\Log\Log;
use Composer\Semver\Intervals;
use Composer\Semver\VersionParser;
use Packagist\Api\Client;
use Packagist\Api\Result\Package\Version;
use UnexpectedValueException;

/**
Expand Down Expand Up @@ -139,7 +141,7 @@ public function execute(Arguments $args, ConsoleIo $io)

/**
* @param string $packageName
* @return array{package: string, description: string, repo_url: string, downloads: int, stars: int, tag_list: array, latest_stable_version: ?string, is_abandoned: bool}
* @return array{package: string, description: string, repo_url: string, downloads: int, stars: int, tag_list: array, latest_stable_version: ?string, latest_stable_release_date: ?\Cake\I18n\Date, is_abandoned: bool}
*/
private function getDataForPackage(string $packageName): array
{
Expand All @@ -155,6 +157,7 @@ private function getDataForPackage(string $packageName): array
'stars' => $metaDetails->getGithubStars(),
'tag_list' => [],
'latest_stable_version' => null,
'latest_stable_release_date' => null,
'is_abandoned' => true,
];
}
Expand Down Expand Up @@ -183,10 +186,14 @@ private function getDataForPackage(string $packageName): array
}
}

$stableVersions = array_filter($versions, fn($v) => preg_match('/^v?\d+\.\d+(\.\d+)?$/', $v->getVersion()));
$stableVersions = array_filter(
$versions,
fn(Version $version) => preg_match('/^v?\d+\.\d+(\.\d+)?$/', $version->getVersion()),
);
usort($stableVersions, function ($a, $b) {
return version_compare($a->getVersion(), $b->getVersion());
});
/** @var \Packagist\Api\Result\Package\Version|false $latestStable */
$latestStable = end($stableVersions);

return [
Expand All @@ -197,10 +204,24 @@ private function getDataForPackage(string $packageName): array
'stars' => $metaDetails->getGithubStars(),
'tag_list' => $meta,
'latest_stable_version' => $latestStable ? $latestStable->getVersion() : null,
'latest_stable_release_date' => $this->extractReleaseDate($latestStable ?: null),
'is_abandoned' => $metaDetails->isAbandoned(),
];
}

/**
* @param \Packagist\Api\Result\Package\Version|null $version
* @return \Cake\I18n\Date|null
*/
private function extractReleaseDate(?Version $version): ?Date
{
if (!$version || $version->getTime() === '') {
return null;
}

return new Date($version->getTime());
}

/**
* @param list<string> $tags
* @return bool
Expand Down
2 changes: 1 addition & 1 deletion src/Controller/PackagesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function index()
if (empty($queryParams['sort'])) {
$this->request = $this->request->withQueryParams(array_merge(
$queryParams,
['sort' => 'downloads', 'direction' => 'desc'],
['sort' => 'latest_stable_release_date', 'direction' => 'desc'],
));
}

Expand Down
1 change: 1 addition & 0 deletions src/Model/Entity/Package.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* @property int $downloads
* @property int $stars
* @property string|null $latest_stable_version
* @property \Cake\I18n\Date|null $latest_stable_release_date
*
* @property \Tags\Model\Entity\Tag[] $tags
*
Expand Down
5 changes: 5 additions & 0 deletions src/Model/Table/PackagesTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ public function validationDefault(Validator $validator): Validator
->requirePresence('latest_stable_version', 'create')
->allowEmptyString('latest_stable_version');

$validator
->date('latest_stable_release_date')
->requirePresence('latest_stable_release_date', 'create')
->allowEmptyDate('latest_stable_release_date');

return $validator;
}
}
1 change: 1 addition & 0 deletions templates/Packages/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ class="packages index content"
?>
<?= $this->Paginator->sort('downloads', 'Downloads') ?>
<?= $this->Paginator->sort('stars', 'Stars') ?>
<?= $this->Paginator->sort('latest_stable_release_date', 'Latest Release') ?>
</div>
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions templates/element/Packages/package-tile.php
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ class="btn btn-xs <?= $isActive ? $compatibilityGroup['activeClass'] : $compatib
<div class="stat-value text-base">
<?= h($package->latest_stable_version ?: __('Unknown')) ?>
</div>
<div class="stat-desc text-xs">
<?= __('Released {0}', $package->latest_stable_release_date?->i18nFormat('MMM d, yyyy') ?? __('Unknown')) ?>
</div>
</div>
<div class="stat px-4 py-3">
<div class="stat-title text-xs flex items-center gap-2 [&_svg]:size-4">
Expand Down
2 changes: 2 additions & 0 deletions tests/Fixture/PackagesFixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public function init(): void
'downloads' => 5000,
'stars' => 450,
'latest_stable_version' => '5.0.0',
'latest_stable_release_date' => '2025-01-15',
],
];

Expand All @@ -39,6 +40,7 @@ public function init(): void
'downloads' => 1000 - $i,
'stars' => 100 - $i,
'latest_stable_version' => sprintf('1.%d.0', $i - 2),
'latest_stable_release_date' => sprintf('2025-02-%02d', $i),
];
}

Expand Down
20 changes: 20 additions & 0 deletions tests/TestCase/Command/SyncPackagesCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@

use App\Command\SyncPackagesCommand;
use Cake\Console\TestSuite\ConsoleIntegrationTestTrait;
use Cake\I18n\Date;
use Cake\TestSuite\TestCase;
use Packagist\Api\Result\Package\Version;
use ReflectionMethod;

/**
Expand All @@ -30,6 +32,24 @@ public function testHasExplicitCakePhpDependency(): void
$this->assertFalse($method->invoke($command, ['PHP: 8.2']));
}

/**
* @return void
*/
public function testExtractReleaseDate(): void
{
$command = new SyncPackagesCommand();
$method = new ReflectionMethod($command, 'extractReleaseDate');
$method->setAccessible(true);

$version = new Version();
$version->fromArray([
'time' => '2026-04-05T11:22:33+00:00',
]);

$this->assertEquals(new Date('2026-04-05'), $method->invoke($command, $version));
$this->assertNull($method->invoke($command, null));
}

/**
* Test defaultName method
*
Expand Down
1 change: 1 addition & 0 deletions tests/TestCase/Controller/PackagesControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public function testIndexShowsFeaturedSliderOnFirstPageWithoutFilters(): void
$this->assertResponseOk();
$this->assertResponseContains('Featured');
$this->assertResponseContains('data-featured-packages-slider');
$this->assertResponseContains('Latest Release');
}

/**
Expand Down
Loading