Merge branch 'main' into feat/process

Author: innocenzi

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [1.0.1](https://github.com/tempestphp/tempest-framework/compare/v1.0.0..1.0.1)  —  2025-06-27
+## [1.0.1](https://github.com/tempestphp/tempest-framework/compare/v1.0.0..v1.0.1)  —  2025-06-27
 
 ### 🚀 Features
 

bin/release

@@ -18,6 +18,9 @@ use Composer\Semver\VersionParser;
 use Tempest\Console\Console;
 use Tempest\Console\ConsoleApplication;
 use Tempest\Console\Exceptions\InterruptException;
+use Tempest\Http\Status;
+use Tempest\HttpClient\HttpClient;
+use Tempest\Support\Json;
 
 use function Tempest\get;
 use function Tempest\Support\arr;
@@ -156,11 +159,37 @@ function performPreReleaseChecks(string $remote, string $branch): void
         throw new Exception("You must be on the {$remote}/{$branch} branch to release.");
     }
 
+    if (null === Tempest\env('RELEASE_GITHUB_TOKEN')) {
+        throw new Exception('`RELEASE_GITHUB_TOKEN` environment variable must be set to release.');
+    }
+
     if ($behindCount = trim(shell_exec("git rev-list HEAD..{$remote}/{$branch} --count") ?? '0') !== '0') {
         throw new Exception("Local branch is behind {$remote}/{$branch} by {$behindCount} commits. Please pull first.");
     }
 }
 
+/** 
+ * Disables the protection ruleset, so the release branch can be pushed to without a pull request.
+ */
+function updateBranchProtection(bool $enabled): void
+{
+    // https://github.com/tempestphp/tempest-framework/settings/rules/1879240
+    $ruleset = '1879240';
+    $token = Tempest\env('RELEASE_GITHUB_TOKEN');
+    $url = "https://api.github.com/repos/tempestphp/tempest-framework/rulesets/{$ruleset}";
+
+    $httpClient = Tempest\get(HttpClient::class);
+    $response = $httpClient->put(
+        uri: $url, 
+        headers: ['Authorization' => "Bearer {$token}"],
+        body: Json\encode(['enforcement' => $enabled ? 'active' : 'disabled'])
+    );
+
+    if ($response->status !== Status::OK) {
+        throw new Exception('Failed to update branch ruleset.');
+    }
+}
+
 /**
  * Gets the current version.
  */
@@ -338,6 +367,9 @@ try {
         handler: fn () => updateChangelog($version),
     );
 
+    // Disable protection
+    updateBranchProtection(enabled: false);
+
     // Push tags
     $console->task(
         label: 'Releasing',
@@ -360,6 +392,9 @@ try {
         ],
     );
 
+    // Re-enable protection
+    updateBranchProtection(enabled: true);
+
     $console->success(sprintf(
         'Released <em>%1$s</em>. The <href="https://github.com/tempestphp/tempest-framework/releases/tag/%1$s">GitHub release</href> will be created automatically in a few seconds.',
         $tag,

packages/command-bus/src/AsyncCommandRepositories/FileCommandRepository.php

@@ -6,6 +6,7 @@
 
 use Tempest\CommandBus\CommandRepository;
 use Tempest\CommandBus\Exceptions\PendingCommandCouldNotBeResolved;
+use Tempest\Support\Filesystem;
 
 use function Tempest\Support\arr;
 
@@ -15,32 +16,30 @@ public function store(string $uuid, object $command): void
     {
         $payload = serialize($command);
 
-        file_put_contents(__DIR__ . "/../stored-commands/{$uuid}.pending.txt", $payload);
+        Filesystem\write_file(__DIR__ . "/../stored-commands/{$uuid}.pending.txt", $payload);
     }
 
     public function findPendingCommand(string $uuid): object
     {
         $path = __DIR__ . "/../stored-commands/{$uuid}.pending.txt";
 
-        if (! file_exists($path)) {
+        if (! Filesystem\is_file($path)) {
             throw new PendingCommandCouldNotBeResolved($uuid);
         }
 
-        $payload = file_get_contents($path);
+        $payload = Filesystem\read_file($path);
 
         return unserialize($payload);
     }
 
     public function markAsDone(string $uuid): void
     {
-        $path = __DIR__ . "/../stored-commands/{$uuid}.pending.txt";
-
-        unlink($path);
+        Filesystem\delete_file(__DIR__ . "/../stored-commands/{$uuid}.pending.txt");
     }
 
     public function markAsFailed(string $uuid): void
     {
-        if (! is_file(__DIR__ . "/../stored-commands/{$uuid}.pending.txt")) {
+        if (! Filesystem\is_file(__DIR__ . "/../stored-commands/{$uuid}.pending.txt")) {
             return;
         }
 
@@ -55,7 +54,7 @@ public function getPendingCommands(): array
         return arr(glob(__DIR__ . '/../stored-commands/*.pending.txt'))
             ->mapWithKeys(function (string $path) {
                 $uuid = str_replace('.pending.txt', '', pathinfo($path, PATHINFO_BASENAME));
-                $payload = file_get_contents($path);
+                $payload = Filesystem\read_file($path);
 
                 yield $uuid => unserialize($payload);
             })

packages/console/src/Components/Concerns/OpensInEditor.php

@@ -7,6 +7,7 @@
 use Tempest\Console\CanOpenInEditor;
 use Tempest\Console\Components\ComponentState;
 use Tempest\Console\InteractiveConsoleComponent;
+use Tempest\Support\Filesystem;
 
 use function Tempest\env;
 
@@ -39,14 +40,14 @@ public function openInEditor(?string $text): string
         $editor = $this->getEditorCommand();
         $tempFile = tempnam(sys_get_temp_dir(), '.TEMPEST_INPUT');
 
-        file_put_contents($tempFile, $text ?? '');
+        Filesystem\write_file($tempFile, $text ?? '');
 
         if (passthru(escapeshellcmd("{$editor} " . escapeshellarg($tempFile))) === false) {
             // TODO: failed. handle that
             return $text;
         }
 
-        $updatedText = file_get_contents($tempFile);
+        $updatedText = Filesystem\read_file($tempFile);
         unlink($tempFile);
 
         $this->setState($previousState);

packages/console/src/Exceptions/ConsoleExceptionHandler.php

@@ -6,6 +6,7 @@
 
 use Tempest\Console\Console;
 use Tempest\Console\ExitCode;
+use Tempest\Console\GlobalFlags;
 use Tempest\Console\HasExitCode;
 use Tempest\Console\Input\ConsoleArgumentBag;
 use Tempest\Container\Container;
@@ -16,6 +17,7 @@
 use Tempest\Core\Kernel;
 use Tempest\Highlight\Escape;
 use Tempest\Highlight\Highlighter;
+use Tempest\Support\Filesystem;
 use Throwable;
 
 use function Tempest\Support\str;
@@ -50,7 +52,7 @@ public function handle(Throwable $throwable): void
                 ->writeln($this->getSnippet($throwable->getFile(), $throwable->getLine()))
                 ->writeln();
 
-            if ($this->argumentBag->get('-v') !== null) {
+            if ($this->argumentBag->get(GlobalFlags::VERBOSE_SHORTHAND->value) || $this->argumentBag->get(GlobalFlags::VERBOSE->value)) {
                 foreach ($throwable->getTrace() as $i => $trace) {
                     $this->console->writeln("<style='bold fg-blue'>#{$i}</style> " . $this->formatTrace($trace));
                 }
@@ -76,7 +78,7 @@ public function handle(Throwable $throwable): void
     private function getSnippet(string $file, int $lineNumber): string
     {
         $highlighter = $this->highlighter->withGutter();
-        $code = Escape::terminal($highlighter->parse(file_get_contents($file), language: 'php'));
+        $code = Escape::terminal($highlighter->parse(Filesystem\read_file($file), language: 'php'));
         $lines = explode(PHP_EOL, $code);
 
         $lines[$lineNumber - 1] = str($lines[$lineNumber - 1])

packages/console/src/GlobalFlags.php

@@ -10,6 +10,8 @@ enum GlobalFlags: string
 
     case FORCE = 'force';
     case FORCE_SHORTHAND = '-f';
+    case VERBOSE = 'verbose';
+    case VERBOSE_SHORTHAND = '-v';
     case HELP = 'help';
     case HELP_SHORTHAND = '-h';
     case INTERACTION = 'interaction';

packages/console/src/Output/LogOutputBuffer.php

@@ -5,6 +5,7 @@
 namespace Tempest\Console\Output;
 
 use Tempest\Console\OutputBuffer;
+use Tempest\Support\Filesystem;
 
 final readonly class LogOutputBuffer implements OutputBuffer
 {
@@ -14,14 +15,14 @@ public function __construct(
 
     public function clear(): self
     {
-        file_put_contents($this->path, '');
+        Filesystem\write_file($this->path, '');
 
         return $this;
     }
 
     public function read(): string
     {
-        return file_get_contents($this->path);
+        return Filesystem\read_file($this->path);
     }
 
     public function write(string $contents): void

packages/console/src/Scheduler/GenericScheduler.php

@@ -8,6 +8,7 @@
 use Tempest\Console\Input\ConsoleArgumentBag;
 use Tempest\Console\Scheduler;
 use Tempest\Process\ProcessExecutor;
+use Tempest\Support\Filesystem;
 
 use function Tempest\event;
 use function Tempest\internal_storage_path;
@@ -84,11 +85,11 @@ private function getInvocationsToRun(DateTime $date): array
      */
     private function getPreviousRuns(): array
     {
-        if (! file_exists(self::getCachePath())) {
+        if (! Filesystem\is_file(self::getCachePath())) {
             return [];
         }
 
-        return unserialize(file_get_contents(self::getCachePath()), ['allowed_classes' => false]);
+        return unserialize(Filesystem\read_file(self::getCachePath()), ['allowed_classes' => false]);
     }
 
     /** @param ScheduledInvocation[] $ranInvocations */
@@ -106,6 +107,6 @@ private function markInvocationsAsRun(array $ranInvocations, DateTime $ranAt): v
             mkdir(directory: $directory, recursive: true);
         }
 
-        file_put_contents(self::getCachePath(), serialize($lastRuns));
+        Filesystem\write_file(self::getCachePath(), serialize($lastRuns));
     }
 }

packages/core/src/Commands/DiscoveryGenerateCommand.php

@@ -43,11 +43,9 @@ public function __invoke(): void
         $this->clearDiscoveryCache();
 
         $this->console->task(
-            label: "Generating discovery cache using the {$strategy->value} strategy",
+            label: "Generating discovery cache using the `{$strategy->value}` strategy",
             handler: fn (Closure $log) => $this->generateDiscoveryCache($strategy, $log),
         );
-
-        $this->discoveryCache->storeStrategy($strategy);
     }
 
     public function clearDiscoveryCache(): void
@@ -68,16 +66,12 @@ public function generateDiscoveryCache(DiscoveryCacheStrategy $strategy, Closure
 
         $discoveries = $loadDiscoveryClasses->build();
 
-        foreach ($discoveries as $discovery) {
-            $log($discovery::class);
-            $discoveryItems = $discovery->getItems();
-
-            if ($strategy === DiscoveryCacheStrategy::PARTIAL) {
-                $discoveryItems = $discoveryItems->onlyVendor();
-            }
-
-            $this->discoveryCache->store($discovery, $discoveryItems);
+        foreach ($this->kernel->discoveryLocations as $location) {
+            $this->discoveryCache->store($location, $discoveries);
+            $log($location->path);
         }
+
+        $this->discoveryCache->storeStrategy($strategy);
     }
 
     public function resolveKernel(): Kernel

packages/core/src/Composer.php

@@ -6,6 +6,7 @@
 
 use Tempest\Process\ProcessExecutor;
 use Tempest\Support\Arr;
+use Tempest\Support\Filesystem;
 use Tempest\Support\Namespace\Psr4Namespace;
 use Tempest\Support\Path;
 use Tempest\Support\Str;
@@ -94,7 +95,7 @@ public function addNamespace(string $namespace, string $path): self
 
     public function save(): self
     {
-        file_put_contents($this->composerPath, json_encode($this->composer, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        Filesystem\write_json($this->composerPath, $this->composer, pretty: true);
 
         return $this;
     }
@@ -108,10 +109,10 @@ public function executeUpdate(): self
 
     private function loadComposerFile(string $path): array
     {
-        if (! file_exists($path)) {
+        if (! Filesystem\is_file($path)) {
             throw new ComposerJsonCouldNotBeLocated('Could not locate composer.json.');
         }
 
-        return json_decode(file_get_contents($path), associative: true);
+        return Filesystem\read_json($path);
     }
 }