Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PHP 8.4 support added #63

Merged
merged 3 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .laminas-ci.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"ignore_php_platform_requirements": {
"8.3": false
"8.3": false,
"8.4": true
}
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions docs/book/routing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Atul-glo35265 marked this conversation as resolved.
Show resolved Hide resolved
- `:subdomain.domain.tld`

In the above, the second route would return a "subdomain" key as part of the
route match.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down