diff --git a/.laminas-ci.json b/.laminas-ci.json index 5e85b2f9..09de09d4 100644 --- a/.laminas-ci.json +++ b/.laminas-ci.json @@ -1,5 +1,6 @@ { "ignore_php_platform_requirements": { - "8.3": false + "8.3": false, + "8.4": true } } diff --git a/composer.json b/composer.json index c964e685..080ed967 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ } }, "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "laminas/laminas-http": "^2.15", "laminas/laminas-servicemanager": "^3.14.0", "laminas/laminas-stdlib": "^3.10.1" diff --git a/composer.lock b/composer.lock index c848cf29..60745d14 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "cc2f5906f03bbea926e5f8cad6d368f5", + "content-hash": "38b4e7c912fa65e922f57a82ed6fcedb", "packages": [ { "name": "laminas/laminas-escaper", @@ -4590,7 +4590,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" }, "platform-dev": [], "platform-overrides": { diff --git a/docs/book/routing.md b/docs/book/routing.md index 5cbf985a..18cb8fa3 100644 --- a/docs/book/routing.md +++ b/docs/book/routing.md @@ -159,8 +159,8 @@ The `Hostname` route attempts to match the hostname registered in the request against specific criteria. Typically, this will be in one of the following forms: -* `subdomain.domain.tld` -* `:subdomain.domain.tld` +- `subdomain.domain.tld` +- `:subdomain.domain.tld` In the above, the second route would return a "subdomain" key as part of the route match. @@ -356,7 +356,7 @@ You may use any route type as a child route of a `Part` route. - **Since 3.2.0** -A `Placeholder` route is provided for use by reusable modules. The idea is that a +A `Placeholder` route is provided for use by reusable modules. The idea is that a module can provide a set of routes anchored by a placeholder route type. The end consumer can replace this placeholder route with a different route type of their choosing to customise how the module's routes act within the application as a @@ -408,7 +408,7 @@ auth module sit at the route of their domain. If they wish to change the resource location, they can provide an alternative route type to replace the `Placeholder` route as part of their own router configuration. As an example: -```php +```php return [ 'auth' => [ 'type' => \Laminas\Mvc\Router\Http\Literal::class,