Skip to content

Commit

Permalink
Merge branch '10.x' into main
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/tests-php8.yml
#	README.md
#	composer.json
  • Loading branch information
toni-suarez committed Mar 16, 2024
2 parents ad7e4d3 + 3d30d73 commit 666fa44
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests-php8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ jobs:

strategy:
matrix:
laravel: ['9.*']
php: [8.0, 8.1]
laravel: ['10.*']
php: [8.1, 8.2]
fail-fast: false

name: Laravel ${{ matrix.laravel }}, PHP ${{ matrix.php }}
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,10 @@ $ composer require suarez/laravel-utm-parameter

### Middleware

#### Laravel 8

Open the `app/Http/Kernel.php` file and add a new item to the `web` middleware group:

```php
# Laravel 9
# Laravel 10
protected $middlewareGroups = [
'web' => [
/* ... keep the existing middleware here */
Expand All @@ -65,8 +63,8 @@ protected $middlewareGroups = [
To enable UTM-Parameters only for certain requests to your site, add a new mapping to the `routeMiddleware` Array.

```php
# Laravel 9
protected $routeMiddleware = [
# Laravel 10
protected $middlewareAliases = [
/* ... keep the existing mappings here */
'utm-parameters' => \Suarez\UtmParameter\Middleware\UtmParameters::class,
];
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
}
],
"require": {
"php": "^8.0.2",
"illuminate/support": "^9.0",
"illuminate/contracts": "^9.0"
"php": "^8.1",
"illuminate/support": "^10.0",
"illuminate/contracts": "^10.0"
},
"require-dev": {
"nunomaduro/collision": "^6.0",
"orchestra/testbench": "^7.0",
"phpunit/phpunit": "^9.5",
"nunomaduro/collision": "^7.0",
"orchestra/testbench": "^8.0",
"phpunit/phpunit": "^9.5|^10.0",
"friendsofphp/php-cs-fixer": "^3.0"
},
"autoload": {
Expand Down

0 comments on commit 666fa44

Please sign in to comment.