Merge branch '3.x' into fix/cache-lock

Author: brendt

.github/workflows/coding-conventions.yml

@@ -4,7 +4,6 @@ on:
   pull_request:
   workflow_dispatch:
 
-# CSFixer and Rector are temporarily disabled until they have proper PHP 8.4 support
 jobs:
   check-style:
     name: Run style check
@@ -15,12 +14,12 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.4
+          php-version: 8.5
           coverage: none
 
       - name: Install dependencies
         run: |
-          composer update --prefer-dist --no-interaction
+          composer update --prefer-dist --no-interaction  --ignore-platform-reqs
           composer mago:install-binary
 
       - name: Run Mago
@@ -46,7 +45,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.4
+          php-version: 8.5
           coverage: none
 
       - name: Install composer dependencies
@@ -65,7 +64,7 @@ jobs:
 #      - name: Setup PHP
 #        uses: shivammathur/setup-php@v2
 #        with:
-#          php-version: 8.4
+#          php-version: 8.5
 #          coverage: none
 #
 #      - name: Install composer dependencies

.github/workflows/integration-tests-windows.yml

@@ -16,7 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - 8.4
+          - 8.5
         os:
           - windows-latest
     env:
@@ -55,7 +55,7 @@ jobs:
         os:
           - windows-latest
         php:
-          - 8.4
+          - 8.5
         database:
           - sqlite
           - mysql
@@ -84,7 +84,7 @@ jobs:
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Install dependencies
-        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --ignore-platform-reqs
 
       - name: "Setup Redis"
         if: ${{ matrix.os != 'windows-latest' }}

.github/workflows/integration-tests.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         php:
-          - 8.4
+          - 8.5
         os:
           - ubuntu-latest
 #          - windows-latest
@@ -59,7 +59,7 @@ jobs:
           - ubuntu-latest
 #          - windows-latest
         php:
-          - 8.4
+          - 8.5
         database:
           - sqlite
           - mysql
@@ -90,7 +90,7 @@ jobs:
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
       - name: Install dependencies
-        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction  --ignore-platform-reqs
 
       - name: "Setup Redis"
         if: ${{ matrix.os != 'windows-latest' }}

.github/workflows/isolated-tests.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.4
+          php-version: 8.5
           coverage: none
 
       - uses: actions/checkout@v4
@@ -43,7 +43,7 @@ jobs:
           - ubuntu-latest
         package: ${{ fromJson(needs.get_packages.outputs.matrix) }}
         php:
-          - 8.4
+          - 8.5
         stability:
           - prefer-stable
           - prefer-lowest
@@ -77,7 +77,7 @@ jobs:
         run: |
           ./bin/build-changed-packages
           cd "packages/${{ matrix.package.basename }}"
-          composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+          composer update --${{ matrix.stability }} --prefer-dist --no-interaction  --ignore-platform-reqs
 
       - name: Execute tests
         run: phpunit -c "packages/${{ matrix.package.basename }}/phpunit.xml"

.github/workflows/subsplit-packages.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set Up PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.4
+          php-version: 8.5
           coverage: none
 
       - uses: actions/checkout@v4

.github/workflows/validate-packages.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.4
+          php-version: 8.5
           extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, intl
           coverage: none
 

composer.json

@@ -24,7 +24,7 @@
         "monolog/monolog": "^3.7.0",
         "nette/php-generator": "^4.1.6",
         "nikic/php-parser": "^5.3",
-        "php": "^8.4",
+        "php": "^8.5",
         "psr-discovery/http-client-implementations": "^1.4",
         "psr-discovery/http-factory-implementations": "^1.2",
         "psr/cache": "^3.0",

docs/1-essentials/01-routing.md

@@ -368,7 +368,7 @@ Once you have created a request class, you may simply inject it into a controlle
 ```php app/AirportController.php
 use Tempest\Router\Post;
 use Tempest\Http\Responses\Redirect;
-use function Tempest\map;
+use function Tempest\Mapper\map;
 use function Tempest\Router\uri;
 
 final readonly class AirportController

docs/1-essentials/02-views.md

@@ -8,7 +8,7 @@ keywords: "Experimental"
 
 Views in Tempest are parsed by Tempest View, our own templating engine. Tempest View uses a syntax that can be thought of as a superset of HTML. If you prefer using a templating engine with more widespread support, [you may also use Blade, Twig, or any other](#using-other-engines) — as long as you provide a way to initialize it.
 
-If you'd like to Tempest View as a standalone component in your project, you can read the documentation on how to do so [here](../5-extra-topics/02-standalone-components.md#tempest-view). 
+If you'd like to Tempest View as a standalone component in your project, you can read the documentation on how to do so [here](../5-extra-topics/02-standalone-components.md#tempest-view).
 
 ### Syntax overview
 
@@ -447,7 +447,7 @@ $title = 'foo';
 <!-- $title will need to be passed in explicitly, 
      otherwise `x-post` wouldn't know about it: -->
 
-<x-post :title="$title"></x-post> 
+<x-post :title="$title"></x-post>
 ```
 
 ```php
@@ -463,7 +463,6 @@ final class HomeController
 ```
 
 ```html x-base.view.php
-
 <h1>{{ $siteTitle }}</h1>
 ```
 
@@ -680,7 +679,7 @@ use Tempest\View\Renderers\TempestViewRenderer;
 use Tempest\View\ViewCache;
 
 $renderer = TempestViewRenderer::make(
-    cache: ViewCache::enabled(),
+    cache: ViewCache::create(),
 );
 ```
 
@@ -690,8 +689,7 @@ It's recommended to turn view caching on in production environments. To clear th
 use Tempest\View\Renderers\TempestViewRenderer;
 use Tempest\View\ViewCache;
 
-$viewCache = ViewCache::enabled();
-
+$viewCache = ViewCache::create();
 $viewCache->clear();
 
 $renderer = TempestViewRenderer::make(

docs/1-essentials/03-database.md

@@ -147,7 +147,7 @@ final class Book
 Because model objects aren't tied to the database specifically, Tempest's [mapper](../2-features/01-mapper.md) can map data from many different sources to them. For instance, you can persist your models as JSON instead of a database, if you want to:
 
 ```php
-use function Tempest\map;
+use function Tempest\Mapper\map;
 
 $books = map($json)->collection()->to(Book::class); // from JSON source to Book collection
 $json = map($books)->toJson(); // from Book collection to JSON
@@ -308,34 +308,41 @@ final class User
 
 The encryption key is taken from the `SIGNING_KEY` environment variable.
 
-### DTO properties
+### Data transfer object properties
 
-Sometimes, you might want to store data objects as-is in a table, without there needing to be a relation to another table. To do so, it's enough to add a serializer and caster to the data object's class, and Tempest will know that these objects aren't meant to be treated as database models. Next, you can store the object's data as a json field on the table (see [migrations](#migrations) for more info).
+You can store arbitrary objects directly in a `json` column when they don’t need to be part of the relational schema.
+
+To do this, annotate the class with `⁠#[Tempest\Mapper\SerializeAs]` and provide a unique identifier for the object’s serialized form. The identifier must map to a single, distinct class.
 
 ```php
-use Tempest\Database\IsDatabaseModel;
-use Tempest\Mapper\CastWith;
-use Tempest\Mapper\SerializeWith;
-use Tempest\Mapper\Casters\DtoCaster;
-use Tempest\Mapper\Serializers\DtoSerializer;
+use Tempest\Mapper\SerializeAs;
 
-final class DebugItem
+final class User implements Authenticatable
 {
-    use IsDatabaseModel;
-    
-    /* … */
-    
-    public Backtrace $backtrace,
+    public PrimaryKey $id;
+
+    public function __construct(
+        public string $email,
+        #[Hashed, SensitiveParameter]
+        public ?string $password,
+        public Settings $settings,
+    ) {}
 }
 
-#[CastWith(DtoCaster::class)]
-#[SerializeWith(DtoSerializer::class)]
-final class Backtrace
+#[SerializeAs('user_settings')]
+final class Settings
 {
-    // This object won't be considered a relation,
-    // but rather serialized and stored in a JSON column.
+    public function __construct(
+        public readonly Theme $theme,
+        public readonly bool $hide_sidebar_by_default,
+    ) {}
+}
 
-    public array $frames = [];
+enum Theme: string
+{
+    case DARK = 'dark';
+    case LIGHT = 'light';
+    case AUTO = 'auto';
 }
 ```