Merge branch 'main' into try-rector-dev-main

Author: brendt

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

@@ -0,0 +1,114 @@
+name: Integration Tests (Windows)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 8 * * *'
+env:
+  POSTGRES_USER: runner
+  POSTGRES_PASSWORD: ""
+  POSTGRES_DB: postgres
+
+jobs:
+  vitest:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        php:
+          - 8.4
+        os:
+          - windows-latest
+    env:
+      POSTGRES_USER: ${{ matrix.os == 'windows-latest' && 'postgres' || 'runner' }}
+
+    name: "Run tests: ${{ matrix.os }}"
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, pdo_pgsql, intl, ftp, zip
+          coverage: pcov
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install dependencies
+        run: bun install --frozen-lockfile
+
+      - name: Run build
+        run: bun run build
+
+      - name: Run tests
+        run: bun run test
+
+  phpunit:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - windows-latest
+        php:
+          - 8.4
+        database:
+          - sqlite
+          - mysql
+          - postgres
+        stability:
+          - prefer-stable
+    env:
+      POSTGRES_USER: ${{ matrix.os == 'windows-latest' && 'postgres' || 'runner' }}
+
+    name: "Run tests: PHP ${{ matrix.php }} - ${{ matrix.database }} - ${{ matrix.stability }} - ${{ matrix.os }}"
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, pdo_pgsql, intl, ftp, zip
+          coverage: pcov
+
+      - name: Setup problem matchers
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Install dependencies
+        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction
+
+      - name: "Setup Redis"
+        if: ${{ matrix.os != 'windows-latest' }}
+        uses: supercharge/[email protected]
+
+      - name: "Setup MySQL"
+        if: ${{ matrix.database == 'mysql' }}
+        uses: ankane/setup-mysql@v1
+        with:
+          mysql-version: 8.0
+          database: "app"
+
+      - name: "Setup PostgreSQL"
+        if: ${{ matrix.database == 'postgres' }}
+        uses: ankane/setup-postgres@v1
+
+      - name: Set database config - ${{ matrix.database }}
+        run: php -r "copy('tests/Fixtures/Config/database.${{ matrix.database }}.php', 'tests/Fixtures/Config/database.config.php');"
+
+      - name: Tempest about
+        run: php ./tempest about -v
+
+      - name: List discovered locations
+        run: php ./tempest discovery:status
+
+      - name: Execute tests
+        run: php -d"error_reporting = E_ALL & ~E_DEPRECATED" -dmemory_limit=1G vendor/bin/phpunit

.github/workflows/integration-tests.yml

@@ -23,7 +23,7 @@ jobs:
           - 8.4
         os:
           - ubuntu-latest
-          - windows-latest
+#          - windows-latest
 
     name: "Run tests: ${{ matrix.os }}"
 
@@ -35,7 +35,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, pdo_pgsql intl, ftp, zip
+          extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, pdo_pgsql, intl, ftp, zip
           coverage: pcov
 
       - name: Setup Bun
@@ -57,7 +57,7 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - windows-latest
+#          - windows-latest
         php:
           - 8.4
         database:
@@ -67,9 +67,9 @@ jobs:
         stability:
           - prefer-stable
           - prefer-lowest
-        exclude:
-          - os: windows-latest
-            database: postgres
+#        exclude:
+#          - os: windows-latest
+#            database: postgres
 
     name: "Run tests: PHP ${{ matrix.php }} - ${{ matrix.database }} - ${{ matrix.stability }} - ${{ matrix.os }}"
 
@@ -81,7 +81,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, intl, ftp, zip
+          extensions: dom, curl, libxml, mbstring, pcntl, fileinfo, pdo, sqlite, pdo_sqlite, pdo_mysql, pdo_pgsql, intl, ftp, zip
           coverage: pcov
 
       - name: Setup problem matchers

docs/1-essentials/02-views.md

@@ -177,7 +177,7 @@ Apart from HTMLs boolean attributes, the same syntax can be used with any expres
 
 ### Control flow directives
 
-#### `:if`, `:elseif` and `:else`
+#### `:if`, `:elseif`, and `:else`
 
 The `:if` directive can conditionally render the element it is attached to, depending on the result of its expression. Similarly, the `:elseif` and `:else` directives can be used on direct siblings for additional control.
 
@@ -186,6 +186,21 @@ The `:if` directive can conditionally render the element it is attached to, depe
 <span :else>Import {{ $this->pendingUploads->count() }} file(s)</span>
 ```
 
+#### `:isset`
+
+The `:isset` directive can be used to conditionally render the element it is attached to, depending on the existence of a variable.
+
+```html
+<h1 :isset="$title">{{ $title }}</h1>
+```
+
+Since `:isset` is a shorthand for `:if="isset()"`, it can be combined with `:elseif` and `:else`:
+
+```html
+<h1 :isset="$title">{{ $title }}</h1>
+<h1 :else>Title</h1>
+```
+
 #### `:foreach` and `:{:hl-keyword:forelse:}`
 
 The `:foreach` directive may be used to render the associated element multiple times based on the result of its expression. Combined with `:{:hl-keyword:forelse:}`, an empty state can be displayed when the data is empty.
@@ -230,7 +245,7 @@ To create a view component, create a `.view.php` file that starts with `x-`. The
 ```html app/x-base.view.php
 <html lang="en">
 	<head>
-		<title :if="$title">{{ $title }} — AirAcme</title>
+		<title :if="$title ?? null">{{ $title }} — AirAcme</title>
 		<title :else>AirAcme</title>
 	</head>
 	<body>
@@ -265,7 +280,7 @@ Attributes and [expression attributes](#expression-attributes) may be passed int
 
 ```html x-base.view.php
 // ...
-<title :if="$title">{{ $title }}</title>
+<title :if="$title ?? null">{{ $title }}</title>
 ```
 
 Note that the casing of attributes will affect the associated variable name:

docs/4-internals/03-view-spec.md

@@ -27,7 +27,7 @@ Some frontend frameworks also provide a `{html}:{:hl-property:attribute:}` synta
 
 ### Control structures
 
-Control structures like conditionals and loops are modelled with expression attributes. These control structure attributes are available: `{html}:{:hl-property:if:}`, `{html}:{:hl-property:elseif:}`, `{html}:{:hl-property:else:}`, `{html}:{:hl-property:foreach:}`, `{html}:{:hl-property:forelse:}`. Code within these control structures is compiled to valid PHP expressions.
+Control structures like conditionals and loops are modelled with expression attributes. These control structure attributes are available: `{html}:{:hl-property:if:}`, `{html}:{:hl-property:elseif:}`, `{html}:{:hl-property:else:}`, {:hl-property:isset:}`, `{html}:{:hl-property:foreach:}`, `{html}:{:hl-property:forelse:}`. Code within these control structures is compiled to valid PHP expressions.
 
 The following conditional:
 

docs/5-extra-topics/02-standalone-components.md

@@ -138,7 +138,7 @@ $eventBus->dispatch(new MyEvent());
 
 ## `tempest/command-bus`
 
-Tempest's event bus can be used as a standalone package, in order for event handlers to be discovered, you'll have to boot Tempest's kernel and resolve the event bus from the container:
+Tempest's command bus can be used as a standalone package, in order for command handlers to be discovered, you'll have to boot Tempest's kernel and resolve the command bus from the container:
 
 ```
 composer require tempest/command-bus

packages/console/src/Highlight/TempestConsoleLanguage/Injections/FileInjection.php

@@ -8,6 +8,7 @@
 use Tempest\Highlight\Injection;
 use Tempest\Highlight\ParsedInjection;
 use Tempest\Highlight\Themes\TerminalStyle;
+use Tempest\Support\Filesystem;
 
 use function Tempest\root_path;
 use function Tempest\Support\str;
@@ -21,9 +22,9 @@ public function parse(string $content, Highlighter $highlighter): ParsedInjectio
             pattern: '/(?<match>\<file=(?<quote>[\"\'])(?<file>.+)\k<quote>\s*\/?>)/',
             callback: function (array $matches) {
                 $href = $matches['file'];
-                $exists = realpath($href) !== false;
+                $exists = Filesystem\normalize_path($href) !== null;
                 $file = $exists
-                    ? str(realpath($href))->replace('\\', '/')->stripStart(root_path())->stripStart('/')
+                    ? str(Filesystem\normalize_path($href))->replace('\\', '/')->stripStart(root_path())->stripStart('/')
                     : $href;
 
                 return TerminalStyle::UNDERLINE((string) $file);

packages/core/src/Commands/DiscoveryStatusCommand.php

@@ -10,6 +10,7 @@
 use Tempest\Core\DiscoveryCache;
 use Tempest\Core\DiscoveryCacheStrategy;
 use Tempest\Core\Kernel;
+use Tempest\Support\Filesystem;
 
 use function Tempest\root_path;
 use function Tempest\Support\str;
@@ -62,7 +63,7 @@ public function __invoke(
                 $this->console->writeln();
 
                 foreach ($this->kernel->discoveryLocations as $discoveryLocation) {
-                    $path = str(realpath($discoveryLocation->path))
+                    $path = str(Filesystem\normalize_path($discoveryLocation->path))
                         ->replaceStart(root_path(), '.')
                         ->toString();
 

packages/core/src/DiscoveryConfig.php

@@ -2,6 +2,8 @@
 
 namespace Tempest\Core;
 
+use Tempest\Support\Filesystem;
+
 final class DiscoveryConfig
 {
     private array $skipDiscovery = [];
@@ -25,9 +27,9 @@ public function skipPaths(string ...$paths): self
         foreach ($paths as $path) {
             $path = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $path);
 
-            $realpath = realpath($path);
+            $realpath = Filesystem\normalize_path($path);
 
-            if ($realpath === false) {
+            if ($realpath === null) {
                 continue;
             }
 

packages/core/src/FrameworkKernel.php

@@ -18,6 +18,7 @@
 use Tempest\EventBus\EventBus;
 use Tempest\Process\GenericProcessExecutor;
 use Tempest\Router\Exceptions\HttpExceptionHandler;
+use Tempest\Support\Filesystem;
 
 final class FrameworkKernel implements Kernel
 {
@@ -34,14 +35,20 @@ public function __construct(
         /** @var \Tempest\Discovery\DiscoveryLocation[] $discoveryLocations */
         public array $discoveryLocations = [],
         ?Container $container = null,
+        ?string $internalStorage = null,
     ) {
         $this->container = $container ?? $this->createContainer();
+
+        if ($internalStorage !== null) {
+            $this->internalStorage = $internalStorage;
+        }
     }
 
     public static function boot(
         string $root,
         array $discoveryLocations = [],
         ?Container $container = null,
+        ?string $internalStorage = null,
     ): self {
         if (! defined('TEMPEST_START')) {
             define('TEMPEST_START', value: hrtime(true));
@@ -51,6 +58,7 @@ public static function boot(
             root: $root,
             discoveryLocations: $discoveryLocations,
             container: $container,
+            internalStorage: $internalStorage,
         )
             ->validateRoot()
             ->loadEnv()
@@ -68,7 +76,7 @@ public static function boot(
 
     public function validateRoot(): self
     {
-        $root = realpath($this->root);
+        $root = Filesystem\normalize_path($this->root);
 
         if (! is_dir($root)) {
             throw new RuntimeException('The specified root directory is not valid.');
@@ -175,7 +183,7 @@ public function loadConfig(): self
 
     public function registerInternalStorage(): self
     {
-        $path = $this->root . '/.tempest';
+        $path = isset($this->internalStorage) ? $this->internalStorage : $this->root . '/.tempest';
 
         if (! is_dir($path)) {
             if (file_exists($path)) {
@@ -189,7 +197,7 @@ public function registerInternalStorage(): self
             throw CouldNotRegisterInternalStorage::noPermission($path);
         }
 
-        $this->internalStorage = realpath($path);
+        $this->internalStorage = Filesystem\normalize_path($path);
 
         return $this;
     }

packages/core/src/Kernel/LoadConfig.php

@@ -8,6 +8,7 @@
 use Tempest\Core\ConfigCache;
 use Tempest\Core\Kernel;
 use Tempest\Support\Arr\MutableArray;
+use Tempest\Support\Filesystem;
 use Tempest\Support\Str;
 
 /** @internal */
@@ -85,10 +86,10 @@ public function find(): array
      */
     private function scan(string $path, MutableArray $configPaths): void
     {
-        $input = realpath($path);
+        $input = Filesystem\normalize_path($path);
 
         // Make sure the path is valid
-        if ($input === false) {
+        if ($input === null) {
             return;
         }