Merge branch 'main' into feat/decorators

Author: innocenzi

.github/workflows/coding-conventions.yml

@@ -25,8 +25,8 @@ jobs:
 
       - name: Run Mago
         run: |
-          ./vendor/bin/mago fmt --dry-run
-          ./vendor/bin/mago lint --reporting-format=github
+          composer fmt -- --check
+          composer lint -- --reporting-format=github
 
       - name: Setup Bun
         uses: oven-sh/setup-bun@v2

CHANGELOG.md

@@ -0,0 +1,3 @@
+## 2.0
+
+Read the 2.0 upgrade guide here: [https://tempestphp.com/blog/tempest-2](https://tempestphp.com/blog/tempest-2).

UPGRADING.md

@@ -186,6 +186,7 @@ function updateBranchProtection(bool $enabled): void
     );
 
     if (! $response->status->isSuccessful()) {
+        lw($response->body);
         throw new Exception('Failed to update branch ruleset.');
     }
 }
@@ -208,7 +209,7 @@ function triggerSubsplit(): void
     );
 
     if (! $response->status->isSuccessful()) {
-        throw new Exception('Failed to update branch ruleset.');
+        throw new Exception('Failed to trigger subsplit.');
     }
 }
 
@@ -391,7 +392,10 @@ try {
     );
 
     // Disable protection
-    updateBranchProtection(enabled: false);
+    $console->task(
+        label: 'Disabling branch protection',
+        handler: fn () => updateBranchProtection(enabled: false),
+    );
 
     // Push tags
     $console->task(
@@ -415,8 +419,16 @@ try {
         },
     );
 
-    updateBranchProtection(enabled: true);
-    triggerSubsplit();
+    // Enable branch protection
+    $console->task(
+        label: 'Enabling branch protection',
+        handler: fn () => updateBranchProtection(enabled: true),
+    );
+
+    $console->task(
+            label: 'Trigger subsplit',
+            handler: fn () => triggerSubsplit(),
+    );
 
     $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.',

bin/release

@@ -49,18 +49,13 @@ skip_tags = "(0\\.0\\.\\d)|1\\.0\\.0-alpha\\.1"
 commit_parsers = [
 	{ field = "breaking", pattern = "true", group = "<!-- -1 -->🚨 Breaking changes" },
 	{ message = "^feat", group = "<!-- 0 -->🚀 Features" },
-	{ message = "^fix", group = "<!-- 1 -->🐛 Bug fixes" },
-	{ message = "^doc", group = "<!-- 3 -->📚 Documentation" },
-	{ message = "^perf", group = "<!-- 4 -->⚡ Performance" },
-	{ message = "^refactor", group = "<!-- 2 -->🚜 Refactor" },
+	{ message = "^perf", group = "<!-- 1 -->⚡ Performance" },
+	{ message = "^fix", group = "<!-- 2 -->🐛 Bug fixes" },
+	{ body = ".*security", group = "<!-- 3 -->🛡️ Security" },
+	{ message = "^revert", group = "<!-- 4 -->⏪ Revert" },
+	{ message = "^docs", group = "<!-- 5 -->📚 Documentation", skip = true },
+	{ message = "^refactor", group = "<!-- 6 -->🚜 Refactor", skip = true },
+	{ message = "^test", group = "<!-- 7 -->🧪 Tests", skip = true },
 	{ message = "^style", skip = true },
-	{ message = "^test", group = "<!-- 6 -->🧪 Tests" },
-	{ message = "^chore\\(release\\): prepare for", skip = true },
-	{ message = "^chore\\(deps.*\\)", skip = true },
-	{ message = "^chore\\(pr\\)", skip = true },
-	{ message = "^chore\\(pull\\)", skip = true },
-	{ message = "^chore: update changelog", skip = true },
 	{ message = "^chore|^ci", skip = true },
-	{ body = ".*security", group = "<!-- 8 -->🛡️ Security" },
-	{ message = "^revert", group = "<!-- 9 -->⏪ Revert" },
 ]

cliff.toml

@@ -20,6 +20,7 @@
         "league/commonmark": "^2.7",
         "league/flysystem": "^3.29.1",
         "league/mime-type-detection": "^1.16",
+        "league/oauth2-client": "^2.8",
         "monolog/monolog": "^3.7.0",
         "nette/php-generator": "^4.1.6",
         "nikic/php-parser": "^5.3",
@@ -32,6 +33,7 @@
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.0|^2.0",
         "psr/log": "^3.0.0",
+        "rector/rector": "^2.1",
         "symfony/cache": "^7.3",
         "symfony/mailer": "^7.2.6",
         "symfony/process": "^7.3",
@@ -44,9 +46,11 @@
         "voku/portable-ascii": "^2.0.3"
     },
     "require-dev": {
+        "adam-paterson/oauth2-slack": "^1.1",
         "aws/aws-sdk-php": "^3.338.0",
         "azure-oss/storage-blob-flysystem": "^1.2",
-        "carthage-software/mago": "0.26.1",
+        "carthage-software/mago": "1.0.0-beta.24",
+        "depotwarehouse/oauth2-twitch": "^1.3",
         "guzzlehttp/psr7": "^2.6.1",
         "league/flysystem-aws-s3-v3": "^3.25.1",
         "league/flysystem-ftp": "^3.25.1",
@@ -56,24 +60,34 @@
         "league/flysystem-read-only": "^3.25.1",
         "league/flysystem-sftp-v3": "^3.25.1",
         "league/flysystem-ziparchive": "^3.25.1",
+        "league/oauth2-facebook": "^2.0",
+        "league/oauth2-github": "^3.1",
+        "league/oauth2-google": "^4.0",
+        "league/oauth2-instagram": "^3.0",
+        "league/oauth2-linkedin": "^5.1",
         "masterminds/html5": "^2.9",
         "microsoft/azure-storage-blob": "^1.5",
         "mikey179/vfsstream": "^2.0@dev",
         "nesbot/carbon": "^3.8",
         "nyholm/psr7": "^1.8",
+        "patrickbussmann/oauth2-apple": "^0.3",
         "phpat/phpat": "^0.11.0",
         "phpbench/phpbench": "84.x-dev",
         "phpstan/phpstan": "^2.0",
         "phpunit/phpunit": "^12.2.3",
         "predis/predis": "^3.0.0",
-        "rector/rector": "^2.0-rc2",
+        "riskio/oauth2-auth0": "^2.4",
+        "smolblog/oauth2-twitter": "^1.0",
         "spatie/phpunit-snapshot-assertions": "^5.1.8",
         "spaze/phpstan-disallowed-calls": "^4.0",
+        "stevenmaguire/oauth2-microsoft": "^2.2",
         "symfony/amazon-mailer": "^7.2.0",
         "symfony/postmark-mailer": "^7.2.6",
         "symplify/monorepo-builder": "^11.2",
         "tempest/blade": "dev-main",
-        "twig/twig": "^3.16"
+        "thenetworg/oauth2-azure": "^2.2",
+        "twig/twig": "^3.16",
+        "wohali/oauth2-discord-new": "^1.2"
     },
     "replace": {
         "tempest/auth": "self.version",
@@ -103,6 +117,7 @@
         "tempest/router": "self.version",
         "tempest/storage": "self.version",
         "tempest/support": "self.version",
+        "tempest/upgrade": "self.version",
         "tempest/validation": "self.version",
         "tempest/view": "self.version",
         "tempest/vite": "self.version"
@@ -143,6 +158,7 @@
             "Tempest\\Router\\": "packages/router/src",
             "Tempest\\Storage\\": "packages/storage/src",
             "Tempest\\Support\\": "packages/support/src",
+            "Tempest\\Upgrade\\": "packages/upgrade/src",
             "Tempest\\Validation\\": "packages/validation/src",
             "Tempest\\View\\": "packages/view/src",
             "Tempest\\Vite\\": "packages/vite/src"
@@ -177,13 +193,15 @@
             "packages/support/src/Regex/functions.php",
             "packages/support/src/Str/constants.php",
             "packages/support/src/Str/functions.php",
+            "packages/support/src/Uri/functions.php",
             "packages/support/src/functions.php",
             "packages/view/src/functions.php",
             "packages/vite/src/functions.php"
         ]
     },
     "autoload-dev": {
         "psr-4": {
+            "Tempest\\Auth\\Tests\\": "packages/auth/tests",
             "Tempest\\Cache\\Tests\\": "packages/cache/tests",
             "Tempest\\Clock\\Tests\\": "packages/clock/tests",
             "Tempest\\CommandBus\\Tests\\": "packages/command-bus/tests",
@@ -208,6 +226,7 @@
             "Tempest\\Router\\Tests\\": "packages/router/tests",
             "Tempest\\Storage\\Tests\\": "packages/storage/tests",
             "Tempest\\Support\\Tests\\": "packages/support/tests",
+            "Tempest\\Upgrade\\Tests\\": "packages/upgrade/tests",
             "Tempest\\Validation\\Tests\\": "packages/validation/tests",
             "Tempest\\View\\Tests\\": "packages/view/tests",
             "Tempest\\Vite\\Tests\\": "packages/vite/tests",
@@ -225,8 +244,9 @@
     "scripts": {
         "phpunit": "@php -d memory_limit=2G vendor/bin/phpunit --display-warnings --display-skipped --display-deprecations --display-errors --display-notices",
         "coverage": "vendor/bin/phpunit --coverage-html build/reports/html --coverage-clover build/reports/clover.xml",
-        "mago:fmt": "vendor/bin/mago fmt && vendor/bin/mago lint --fix --potentially-unsafe --fmt",
-        "mago:lint": "vendor/bin/mago lint --minimum-level=note",
+        "fmt": "vendor/bin/mago fmt",
+        "lint:fix": "vendor/bin/mago lint --fix --format-after-fix",
+        "lint": "vendor/bin/mago lint --potentially-unsafe --minimum-fail-level=note",
         "phpstan": "vendor/bin/phpstan analyse src tests --memory-limit=1G",
         "rector": "vendor/bin/rector process --no-ansi",
         "merge": "php -d\"error_reporting = E_ALL & ~E_DEPRECATED\" vendor/bin/monorepo-builder merge",
@@ -236,13 +256,14 @@
             "./bin/release"
         ],
         "qa": [
-            "composer mago:fmt",
+            "composer fmt",
+            "composer lint:fix",
+            "composer lint",
             "composer merge",
+            "composer rector",
             "./bin/validate-packages",
             "./tempest discovery:clear --no-interaction",
-            "composer rector",
             "composer phpunit",
-            "composer mago:lint",
             "composer phpstan"
         ]
     }

composer.json

@@ -26,15 +26,13 @@ The benefit of starting from scratch like Tempest did is having a clean slate. T
 Just to name a couple of examples, Tempest uses property hooks:
 
 ```php
-interface DatabaseMigration
+interface MigratesUp
 {
     public string $name {
         get;
     }
 
-    public function up(): ?QueryStatement;
-
-    public function down(): ?QueryStatement;
+    public function up(): QueryStatement;
 }
 ```
 

docs/0-getting-started/01-introduction.md

@@ -162,10 +162,10 @@ public function docsRedirect(string $path): Redirect
 
 ## Generating URIs
 
-Tempest provides a `\Tempest\uri` function that can be used to generate an URI to a controller method. This function accepts the FQCN of the controller or a callable to a method as its first argument, and named parameters as [the rest of its arguments](https://www.php.net/manual/en/functions.arguments.php#functions.variable-arg-list).
+Tempest provides a `\Tempest\uri` function that can be used to generate a URI to a controller method. This function accepts the FQCN of the controller or a callable to a method as its first argument, and named parameters as [the rest of its arguments](https://www.php.net/manual/en/functions.arguments.php#functions.variable-arg-list).
 
 ```php
-use function Tempest\uri;
+use function Tempest\Router\uri;
 
 // Invokable classes can be referenced directly:
 uri(HomeController::class);
@@ -181,15 +181,62 @@ uri([AircraftController::class, 'show'], id: $aircraft->id);
 ```
 
 :::info
-Note that Tempest does not have named routes, and currently doesn't plan on adding them. However, if you have an argument for them, feel free to hop on our [Discord server](/discord){:ssg-ignore="true"} to discuss it.
+URI-related methods are also available by injecting the {b`Tempest\Router\UriGenerator`} class into your controller.
 :::
 
-## Matching the current URI
+### Signed URIs
 
-To determine whether the current request matches a specific controller action, Tempest provides the `\Tempest\is_current_uri` function. This function accepts the same arguments as `uri`, and returns a boolean.
+A signed URI may be used to ensure that the URI was not modified after it was created. This is useful for implementing login links, or other endpoints that need protection against tampering.
+
+To create a signed URI, you may use the `signed_uri` function. This function accepts the same arguments as `uri`, and returns the URI with a `signature` parameter:
+
+```php
+use function Tempest\Router\signed_uri;
+
+signed_uri(
+    action: [MailingListController::class, 'unsubscribe'],
+    email: $email
+);
+```
+
+Alternatively, you may use `temporary_signed_uri` to provide a duration after which the signed URI will expire, providing an extra layer of security.
+
+```php
+use function Tempest\Router\temporary_signed_uri;
+
+temporary_signed_uri(
+    action: PasswordlessAuthenticationController::class,
+    duration: Duration::minutes(10),
+    userId: $userId
+);
+```
+
+To ensure the validity of a signed URL, you should call the `hasValidSignature` method on the {`Tempest\Router\UriGenerator`} class.
+
+```php
+final class PasswordlessAuthenticationController
+{
+    public function __construct(
+        private readonly UriGenerator $uri,
+    ) {}
+
+    public function __invoke(Request $request): Response
+    {
+        if (! $this->uri->hasValidSignature($request)) {
+            return new Invalid();
+        }
+
+        // ...
+    }
+}
+```
+
+### Matching the current URI
+
+To determine whether the current request matches a specific controller action, Tempest provides the `is_current_uri` function. This function accepts the same arguments as `uri`, and returns a boolean.
 
 ```php
-use function Tempest\is_current_uri;
+use function Tempest\Router\is_current_uri;
 
 // Current URI is: /aircraft/1
 
@@ -243,7 +290,7 @@ Once you have created a request class, you may simply inject it into a controlle
 use Tempest\Router\Post;
 use Tempest\Http\Responses\Redirect;
 use function Tempest\map;
-use function Tempest\uri;
+use function Tempest\Router\uri;
 
 final readonly class AirportController
 {

docs/1-essentials/01-routing.md

@@ -243,7 +243,7 @@ To create a view component, create a `.view.php` file that starts with `x-`. The
 
 ### Using view components
 
-All views may include a views components. In order to do so, you may simply use a component's name as a tag, including the `x-` prefix:
+All views may include a view component. In order to do so, you may simply use a component's name as a tag, including the `x-` prefix:
 
 ```html app/home.view.php
 <x-base :title="$this->post->title">
@@ -253,7 +253,7 @@ All views may include a views components. In order to do so, you may simply use
 </x-base>
 ```
 
-The example above demonstrates how to pass data to a component using an [expression attribute](#expression-attributes), as well as how pass elements as children if that component where the `<x-slot />` tag is used.
+The example above demonstrates how to pass data to a component using an [expression attribute](#expression-attributes), as well as how to pass elements as children if that component where the `<x-slot />` tag is used.
 
 ### Attributes in components
 
@@ -301,7 +301,7 @@ Similarly, the `id` attribute will always replace an existing `id` attribute on
 
 An `$attributes` variable is accessible within view components. This variable is an array that contains all attributes passed to the component, except expression attributes.
 
-Note that attributes names use `{txt}kebab-case`.
+Note that attribute names use `{txt}kebab-case`.
 
 ```html x-badge.view.php
 <span class="px-2 py-1 rounded-md text-sm bg-gray-100 text-gray-900">
@@ -348,7 +348,7 @@ A view component's slot can define a default value, which will be used when a vi
 
 ### Named slots
 
-When a single slot is not enough, names can be attached to them. When using a component with named slot, you may use the `<x-slot>` tag with a `name` attribute to render content in a named outlet:
+When a single slot is not enough, names can be attached to them. When using a component with a named slot, you may use the `<x-slot>` tag with a `name` attribute to render content in a named outlet:
 
 ```html x-base.view.php
 <html lang="en">
@@ -544,7 +544,7 @@ Iconify has a large collection of icon sets, which you may browse using the [Ic
 
 Tempest has built-in support for [Vite](https://vite.dev/), the most popular front-end development server and build tool. You may read more about [asset bundling](../2-features/05-asset-bundling.md) in the dedicated documentation.
 
-This component simply inject registered entrypoints where it is called.
+This component simply injects registered entrypoints where it is called.
 
 ```html x-base.view.php
 <html lang="en">