Merge branch 'main' into refactor/json-fs-consistency

brendt · web-flow · commit ec5362dfa97e · 2025-06-30T09:49:18.000+02:00
diff --git a/CHANGELOG.md b/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
 
diff --git a/bin/release b/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,
diff --git a/packages/core/src/Kernel.php b/packages/core/src/Kernel.php
@@ -8,7 +8,7 @@
 
 interface Kernel
 {
-    public const string VERSION = '1.0.1';
+    public const string VERSION = '1.0.3';
 
     public string $root {
         get;
diff --git a/packages/core/src/Kernel/LoadDiscoveryClasses.php b/packages/core/src/Kernel/LoadDiscoveryClasses.php
@@ -4,10 +4,6 @@
 
 namespace Tempest\Core\Kernel;
 
-use FilesystemIterator;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
-use SplFileInfo;
 use Tempest\Container\Container;
 use Tempest\Core\DiscoveryCache;
 use Tempest\Core\DiscoveryCacheStrategy;
@@ -92,69 +88,85 @@ private function buildDiscovery(string $discoveryClass): Discovery
         }
 
         foreach ($this->kernel->discoveryLocations as $location) {
-            if ($this->shouldSkipLocation($location)) {
-                continue;
-            }
+            $this->discoverPath($discovery, $location, $location->path);
+        }
 
-            $directories = new RecursiveDirectoryIterator($location->path, FilesystemIterator::UNIX_PATHS | FilesystemIterator::SKIP_DOTS);
-            $files = new RecursiveIteratorIterator($directories);
+        return $discovery;
+    }
 
-            /** @var SplFileInfo $file */
-            foreach ($files as $file) {
-                $fileName = $file->getFilename();
+    private function discoverPath(Discovery $discovery, DiscoveryLocation $location, string $path): void
+    {
+        if ($this->shouldSkipLocation($location)) {
+            return;
+        }
 
-                if ($fileName === '') {
-                    continue;
-                }
+        $input = realpath($path);
 
-                if ($fileName === '.') {
-                    continue;
-                }
+        if ($input === false) {
+            return;
+        }
 
-                if ($fileName === '..') {
-                    continue;
-                }
+        // Make sure the path is not marked for skipping
+        if ($this->shouldSkipBasedOnConfig($input)) {
+            return;
+        }
 
-                $input = $file->getRealPath();
+        // Directories are scanned recursively
+        if (is_dir($input)) {
+            if ($this->shouldSkipDirectory($input)) {
+                return;
+            }
 
-                if ($this->shouldSkipBasedOnConfig($input)) {
+            foreach (scandir($input) as $subPath) {
+                if ($subPath === '.' || $subPath === '..') {
                     continue;
                 }
 
-                // We assume that any PHP file that starts with an uppercase letter will be a class
-                if ($file->getExtension() === 'php' && ucfirst($fileName) === $fileName) {
-                    $className = $location->toClassName($file->getPathname());
-
-                    // Discovery errors (syntax errors, missing imports, etc.)
-                    // are ignored when they happen in vendor files,
-                    // but they are allowed to be thrown in project code
-                    if ($location->isVendor()) {
-                        try {
-                            $input = new ClassReflector($className);
-                        } catch (Throwable) { // @mago-expect best-practices/no-empty-catch-clause
-                        }
-                    } elseif (class_exists($className)) {
-                        $input = new ClassReflector($className);
-                    }
-                }
+                $this->discoverPath($discovery, $location, "{$input}/{$subPath}");
+            }
 
-                if ($this->shouldSkipBasedOnConfig($input)) {
-                    continue;
-                }
+            return;
+        }
 
-                if ($input instanceof ClassReflector) {
-                    // If the input is a class, we'll call `discover`
-                    if (! $this->shouldSkipDiscoveryForClass($discovery, $input)) {
-                        $discovery->discover($location, $input);
-                    }
-                } elseif ($discovery instanceof DiscoversPath) {
-                    // If the input is NOT a class, AND the discovery class can discover paths, we'll call `discoverPath`
-                    $discovery->discoverPath($location, $input);
+        $pathInfo = pathinfo($input);
+        $extension = $pathInfo['extension'] ?? null;
+        $fileName = $pathInfo['filename'] ?: null;
+
+        // We assume that any PHP file that starts with an uppercase letter will be a class
+        if ($extension === 'php' && ucfirst($fileName) === $fileName) {
+            $className = $location->toClassName($input);
+
+            // Discovery errors (syntax errors, missing imports, etc.)
+            // are ignored when they happen in vendor files,
+            // but they are allowed to be thrown in project code
+            if ($location->isVendor()) {
+                try {
+                    $input = new ClassReflector($className);
+                } catch (Throwable $e) { // @mago-expect best-practices/no-empty-catch-clause
                 }
+            } elseif (class_exists($className)) {
+                $input = new ClassReflector($className);
             }
         }
 
-        return $discovery;
+        // If the input is a class, we'll try to discover it
+        if ($input instanceof ClassReflector) {
+            // Check whether the class should be skipped
+            if ($this->shouldSkipBasedOnConfig($input)) {
+                return;
+            }
+
+            // Check whether this class is marked with `#[SkipDiscovery]`
+            if ($this->shouldSkipDiscoveryForClass($discovery, $input)) {
+                return;
+            }
+
+            $discovery->discover($location, $input);
+        } elseif ($discovery instanceof DiscoversPath) {
+            // If the input is NOT a class, AND the discovery class can discover paths, we'll call `discoverPath`
+            // Note that we've already checked whether the path was marked for skipping earlier in this method
+            $discovery->discoverPath($location, $input);
+        }
     }
 
     /**
@@ -212,4 +224,14 @@ private function shouldSkipLocation(DiscoveryLocation $location): bool
             DiscoveryCacheStrategy::PARTIAL => $location->isVendor(),
         };
     }
+
+    /**
+     * Check whether a given directory should be skipped
+     */
+    private function shouldSkipDirectory(string $path): bool
+    {
+        $directory = pathinfo($path, PATHINFO_BASENAME);
+
+        return $directory === 'node_modules';
+    }
 }
diff --git a/packages/discovery/src/DiscoveryLocation.php b/packages/discovery/src/DiscoveryLocation.php
@@ -6,10 +6,16 @@
 
 final readonly class DiscoveryLocation
 {
+    public string $namespace;
+    public string $path;
+
     public function __construct(
-        public string $namespace,
-        public string $path,
-    ) {}
+        string $namespace,
+        string $path,
+    ) {
+        $this->namespace = $namespace;
+        $this->path = realpath(rtrim($path, '\\/'));
+    }
 
     public function isVendor(): bool
     {
@@ -18,12 +24,10 @@ public function isVendor(): bool
 
     public function toClassName(string $path): string
     {
-        $pathWithoutSlashes = rtrim($this->path, '\\/');
-
         // Try to create a PSR-compliant class name from the path
         return str_replace(
             [
-                $pathWithoutSlashes,
+                $this->path,
                 '/',
                 '\\\\',
                 '.php',
diff --git a/packages/mapper/src/Mappers/JsonToArrayMapper.php b/packages/mapper/src/Mappers/JsonToArrayMapper.php
@@ -11,7 +11,7 @@
 {
     public function canMap(mixed $from, mixed $to): bool
     {
-        return is_string($from) && Json\is_valid($from);
+        return false;
     }
 
     public function map(mixed $from, mixed $to): array
diff --git a/packages/vite-plugin-tempest/package.json b/packages/vite-plugin-tempest/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vite-plugin-tempest",
 	"type": "module",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"author": "Enzo Innocenzi",
 	"license": "MIT",
 	"sideEffects": false,
diff --git a/tests/Integration/Mapper/MapperTest.php b/tests/Integration/Mapper/MapperTest.php
@@ -8,6 +8,8 @@
 use Tempest\DateTime\DateTime;
 use Tempest\DateTime\DateTimeInterface;
 use Tempest\Mapper\Exceptions\MappingValuesWereMissing;
+use Tempest\Mapper\Mappers\ArrayToObjectMapper;
+use Tempest\Mapper\Mappers\JsonToObjectMapper;
 use Tempest\Mapper\Mappers\ObjectToArrayMapper;
 use Tests\Tempest\Fixtures\Modules\Books\Models\Author;
 use Tests\Tempest\Fixtures\Modules\Books\Models\AuthorType;

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`interface Kernel`
`10`	`10`	`{`
`11`		`- public const string VERSION = '1.0.1';`
	`11`	`+ public const string VERSION = '1.0.3';`
`12`	`12`
`13`	`13`	`public string $root {`
`14`	`14`	`get;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`{`
`12`	`12`	`public function canMap(mixed $from, mixed $to): bool`
`13`	`13`	`{`
`14`		`- return is_string($from) && Json\is_valid($from);`
	`14`	`+ return false;`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public function map(mixed $from, mixed $to): array`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vite-plugin-tempest",`
`3`	`3`	`"type": "module",`
`4`		`- "version": "1.0.1",`
	`4`	`+ "version": "1.0.3",`
`5`	`5`	`"author": "Enzo Innocenzi",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"sideEffects": false,`