Laravel 10

.github/workflows/coverage.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/php-cs-fixer.yml

@@ -10,12 +10,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
+          php-version: 8.1
           extensions: dom, curl, libxml, mbstring, zip, pcntl, bcmath, intl, iconv
 
       - name: Cache dependencies

.github/workflows/phpunit.yml

@@ -13,20 +13,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 7.4, 8.0, 8.1 ]
-        laravel: [ ^8.12, ^9.0 ]
         dependency-version: [ stable, lowest ]
+        laravel: [ ^8.79, ^9.50.2, 10.* ]
+        php: [ 8.0, 8.1, 8.2 ]
+        include:
+          - laravel: ^8.79
+            testbench: ^6.24
+          - laravel: ^9.50.2
+            testbench: ^7.22
+          - laravel: 10.*
+            testbench: 8.*
         exclude:
-          - php: 7.4
-            laravel: ^9.0
-          - laravel: ^9.0
-            dependency-version: lowest
+          - php: 8.2
+            laravel: ^8.79
+          - php: 8.0
+            laravel: 10.*
 
+    timeout-minutes: 10
     name: "${{ matrix.php }} / ${{ matrix.laravel }} (${{ matrix.dependency-version }})"
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -37,10 +45,11 @@ jobs:
 
       - name: Register composer cache directory
         id: composer-cache-files-dir
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT  
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             vendor
@@ -49,18 +58,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: Set minimum stability
-        run: composer config minimum-stability ${{ matrix.minimum-stability }}
-
       - name: Install dependencies
-        env:
-          COMPOSER_DISCARD_CHANGES: true
-        run: composer require --no-suggest --no-progress --no-interaction --prefer-dist --update-with-all-dependencies "laravel/framework:${{ matrix.laravel }}"
-
+        run: composer require --no-interaction --prefer-dist --no-update "illuminate/support:${{ matrix.laravel }}" "illuminate/contracts:${{ matrix.laravel }}" "illuminate/http:${{ matrix.laravel }}" "illuminate/routing:${{ matrix.laravel }}" "illuminate/validation:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}"
+
       - name: Set dependency version
-        env:
-          COMPOSER_DISCARD_CHANGES: true
-        run: composer update --no-suggest --no-progress --no-interaction --no-suggest --prefer-dist --with-all-dependencies --prefer-${{ matrix.dependency-version }}
+        run: composer update --no-interaction --prefer-dist --with-all-dependencies --prefer-${{ matrix.dependency-version }}
 
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/phpunit -v

.github/workflows/update-changelog.yml

@@ -8,7 +8,7 @@ jobs:
   update-publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           repository: ${{ github.event.repository.full_name }}
           ref: 'main'

.php-cs-fixer.dist.php

@@ -10,6 +10,7 @@
 		'@PSR2' => true,
 		'function_declaration' => [
 			'closure_function_spacing' => 'none',
+			'closure_fn_spacing' => 'none',
 		],
 		'ordered_imports' => [
 			'sort_algorithm' => 'alpha',

CHANGELOG.md

@@ -5,6 +5,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Added
+
+- Added Laravel 10 support
+
 ## [3.1.0] - 2022-02-18
 
 ### Changed

composer.json

@@ -8,6 +8,7 @@
 		"validation",
 		"countries"
 	],
+	"type": "library",
 	"homepage": "https://github.com/glhd/laravel-addressing",
 	"authors": [
 		{
@@ -22,11 +23,11 @@
 	],
 	"require": {
 		"php": ">=7.4",
-		"illuminate/contracts": "^v7.0|^v8.0|^9.0|dev-master",
-		"illuminate/support": "^v7.0|^v8.0|^9.0|dev-master",
-		"illuminate/http": "^v7.0|^v8.0|^9.0|dev-master",
-		"illuminate/routing": "^v7.0|^v8.0|^9.0|dev-master",
-		"illuminate/validation": "^v7.0|^v8.0|^9.0|dev-master",
+		"illuminate/contracts": "^v7|^8|^9|^10|11.x-dev|dev-master",
+		"illuminate/support": "^v7|^8|^9|^10|11.x-dev|dev-master",
+		"illuminate/http": "^v7|^8|^9|^10|11.x-dev|dev-master",
+		"illuminate/routing": "^v7|^8|^9|^10|11.x-dev|dev-master",
+		"illuminate/validation": "^v7|^8|^9|^10|11.x-dev|dev-master",
 		"commerceguys/addressing": "^v1.2",
 		"symfony/intl": "^v4.2|^v5.0|^v6.0",
 		"commerceguys/intl": "^v1.1",
@@ -35,7 +36,7 @@
 	"require-dev": {
 		"ext-json": "*",
 		"phpunit/phpunit": "^9.5",
-		"orchestra/testbench": "^5.20|^6.24|^7.0",
+		"orchestra/testbench": "^5.20|^6.24|^7.10|^8|9.x-dev|10.x-dev|dev-master",
 		"friendsofphp/php-cs-fixer": "^3.0"
 	},
 	"autoload": {