Merge remote-tracking branch 'origin' into feat/add-automatic-release-update

Merge main

Author: aidan-casey

src/GitHub/GetStargazersCount.php

@@ -2,37 +2,28 @@
 
 namespace App\GitHub;
 
-use DateTimeImmutable;
-use Tempest\Cache\Cache;
 use Tempest\HttpClient\HttpClient;
 use Throwable;
 
 final class GetStargazersCount
 {
     public function __construct(
         private HttpClient $httpClient,
-        private Cache $cache,
     ) {
     }
 
     public function __invoke(): ?string
     {
-        return $this->cache->resolve(
-            key: 'tempest-stargazers',
-            cache: function () {
-                try {
-                    $body = $this->httpClient->get('https://api.github.com/repos/tempestphp/tempest-framework')->body;
-                    $stargazers = json_decode($body)->stargazers_count ?? null;
+        try {
+            $body = $this->httpClient->get('https://api.github.com/repos/tempestphp/tempest-framework')->body;
+            $stargazers = json_decode($body)->stargazers_count ?? null;
 
-                    return $stargazers > 999
-                        ? (round($stargazers / 1000, 1) . 'K')
-                        : $stargazers;
-                } catch (Throwable $e) {
-                    ll($e);
-                    return null;
-                }
-            },
-            expiresAt: new DateTimeImmutable('+12 hours'),
-        );
+            return $stargazers > 999
+                ? (round($stargazers / 1000, 1) . 'K')
+                : $stargazers;
+        } catch (Throwable $e) {
+            ll($e);
+            return null;
+        }
     }
 }

src/Migrations/FixDateTimeFieldsMigration.php

@@ -12,7 +12,7 @@ final class FixDateTimeFieldsMigration
     use HasConsole;
 
     #[ConsoleCommand(name: 'fix:projections')]
-    public function __invoke()
+    public function __invoke(): void
     {
         foreach (VisitsPerDay::all() as $visitsPerDay) {
             $visitsPerDay->save();

src/StoredEvents/EventsReplayCommand.php

@@ -7,7 +7,7 @@
 use Tempest\Console\HasConsole;
 use Tempest\Console\Middleware\ForceMiddleware;
 use Tempest\Container\Container;
-use Tempest\Database\Query;
+use Tempest\Database\Builder\QueryBuilders\QueryBuilder;
 
 use function Tempest\Support\arr;
 use function Tempest\Support\str;
@@ -46,7 +46,9 @@ public function __invoke(?string $replay = null): void
             return;
         }
 
-        $eventCount = new Query(sprintf('SELECT COUNT(*) as `count` FROM `%s`', StoredEvent::table()->tableName))->fetchFirst()['count'];
+        $eventCount = new QueryBuilder(StoredEvent::class)
+            ->select('COUNT(*) as `count`')
+            ->first()['count'];
 
         $confirm = $this->confirm(sprintf(
             'We\'re going to replay %d events on %d %s, this will take a while. Continue?',

src/Web/Analytics/PackageDownloadsPerDay/PackageDownloadsPerDayProjector.php

@@ -4,6 +4,7 @@
 
 use App\StoredEvents\Projector;
 use App\Web\Analytics\PackageDownloadsListed;
+use Tempest\Database\Builder\QueryBuilders\QueryBuilder;
 use Tempest\Database\Query;
 use Tempest\EventBus\EventHandler;
 
@@ -12,12 +13,9 @@
     #[\Override]
     public function clear(): void
     {
-        $query = new Query(sprintf(
-            'DELETE FROM %s',
-            PackageDownloadsPerDay::table(),
-        ));
-
-        $query->execute();
+        new QueryBuilder(PackageDownloadsPerDay::class)
+            ->delete()
+            ->execute();
     }
 
     #[\Override]

src/Web/Analytics/PackageDownloadsPerHour/PackageDownloadsPerHourProjector.php

@@ -4,6 +4,7 @@
 
 use App\StoredEvents\Projector;
 use App\Web\Analytics\PackageDownloadsListed;
+use Tempest\Database\Builder\QueryBuilders\QueryBuilder;
 use Tempest\Database\Query;
 use Tempest\EventBus\EventHandler;
 
@@ -12,12 +13,9 @@
     #[\Override]
     public function clear(): void
     {
-        $query = new Query(sprintf(
-            'DELETE FROM %s',
-            PackageDownloadsPerHour::table(),
-        ));
-
-        $query->execute();
+        new QueryBuilder(PackageDownloadsPerHour::class)
+            ->delete()
+            ->execute();
     }
 
     #[\Override]

src/Web/Analytics/VisitsPerDay/VisitsPerDayProjector.php

@@ -4,7 +4,7 @@
 
 use App\StoredEvents\Projector;
 use App\Web\Analytics\PageVisited;
-use Tempest\Database\Query;
+use Tempest\Database\Builder\QueryBuilders\QueryBuilder;
 use Tempest\EventBus\EventHandler;
 
 final readonly class VisitsPerDayProjector implements Projector
@@ -20,12 +20,9 @@ public function replay(object $event): void
     #[\Override]
     public function clear(): void
     {
-        $query = new Query(sprintf(
-            'DELETE FROM %s',
-            VisitsPerDay::table(),
-        ));
-
-        $query->execute();
+        new QueryBuilder(VisitsPerDay::class)
+            ->delete()
+            ->execute();
     }
 
     #[EventHandler]

src/Web/Analytics/VisitsPerHour/VisitsPerHourProjector.php

@@ -4,6 +4,7 @@
 
 use App\StoredEvents\Projector;
 use App\Web\Analytics\PageVisited;
+use Tempest\Database\Builder\QueryBuilders\QueryBuilder;
 use Tempest\Database\Query;
 use Tempest\EventBus\EventHandler;
 
@@ -20,12 +21,9 @@ public function replay(object $event): void
     #[\Override]
     public function clear(): void
     {
-        $query = new Query(sprintf(
-            'DELETE FROM %s',
-            VisitsPerHour::table(),
-        ));
-
-        $query->execute();
+        new QueryBuilder(VisitsPerHour::class)
+            ->delete()
+            ->execute();
     }
 
     #[EventHandler]

src/Web/Documentation/ChapterView.php

@@ -34,7 +34,7 @@ public function isCurrent(Chapter $other): bool
 
     public function getSubChapters(): array
     {
-        // TODO: clean up
+        // TODO(@innocenzi): clean up
         preg_match_all('/<h2.*>.*<a.*href="(?<uri>.*?)".*<\/span>(?<title>.*)<\/a><\/h2>/', $this->currentChapter->body, $h2Matches);
         preg_match_all('/<h3.*>.*<a.*href="(?<h3uri>.*?)".*<\/span>(?<h3title>.*)<\/a><\/h3>/', $this->currentChapter->body, $h3Matches);