diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml index f14fc0b..8f76de5 100644 --- a/.github/workflows/phpunit.yml +++ b/.github/workflows/phpunit.yml @@ -4,7 +4,7 @@ on: push: pull_request: schedule: - - cron: '0 14 * * 3' # Run Wednesdays at 2pm EST + - cron: '0 14 * * 3' jobs: php-tests: @@ -13,9 +13,9 @@ jobs: strategy: fail-fast: false matrix: - dependency-version: [ stable, lowest ] - laravel: [ ^8.79, ^9.50.2, 10.*, 11.* ] - php: [ 8.0, 8.1, 8.2, 8.3 ] + dependency-version: [stable, lowest] + laravel: ['10.*', '11.*', '12.0', ^8.79, ^9.50.2] + php: [8.0, 8.1, 8.2, 8.3] include: - laravel: ^8.79 testbench: ^6.24 @@ -25,6 +25,8 @@ jobs: testbench: 8.* - laravel: 11.* testbench: 9.* + - laravel: '12.0' + testbench: ^10.0 exclude: - php: 8.3 laravel: ^9.50.2 @@ -38,9 +40,14 @@ jobs: laravel: 11.* - php: 8.0 laravel: 10.* + - laravel: 12.* + php: 8.0 + - laravel: 12.* + php: 8.1 timeout-minutes: 10 - name: "${{ matrix.php }} / ${{ matrix.laravel }} (${{ matrix.dependency-version }})" + + name: ${{ matrix.php }} / ${{ matrix.laravel }} (${{ matrix.dependency-version }}) steps: - name: Checkout code @@ -70,7 +77,7 @@ jobs: - name: Install dependencies 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 run: composer update --no-interaction --prefer-dist --with-all-dependencies --prefer-${{ matrix.dependency-version }} diff --git a/composer.json b/composer.json index f3a4ce6..f5d5abe 100755 --- a/composer.json +++ b/composer.json @@ -1,72 +1,72 @@ { - "name": "galahad/laravel-addressing", - "description": "Laravel package providing addressing functionality", - "keywords": [ - "laravel", - "address", - "addressing", - "validation", - "countries" - ], - "type": "library", - "homepage": "https://github.com/glhd/laravel-addressing", - "authors": [ - { - "name": "Chris Morrell", - "homepage": "http://github.com/inxilpro" - }, - { - "name": "Junior Grossi", - "email": "juniorgro@gmail.com", - "homepage": "http://github.com/jgrossi" - } - ], - "require": { - "php": ">=7.4", - "illuminate/contracts": "^v7|^8|^9|^10|^11|12.x-dev|dev-master", - "illuminate/support": "^v7|^8|^9|^10|^11|12.x-dev|dev-master", - "illuminate/http": "^v7|^8|^9|^10|^11|12.x-dev|dev-master", - "illuminate/routing": "^v7|^8|^9|^10|^11|12.x-dev|dev-master", - "illuminate/validation": "^v7|^8|^9|^10|^11|12.x-dev|dev-master", - "commerceguys/addressing": "^v1.2", - "symfony/intl": "^v4.2|^v5.0|^v6.0|^7.0", - "commerceguys/intl": "^v1.1", - "doctrine/collections": "^1.6.2" - }, - "require-dev": { - "ext-json": "*", - "phpunit/phpunit": "^9.5|^10", - "orchestra/testbench": "^5.20|^6.24|^7.10|^8|9.x-dev|10.x-dev|dev-master", - "friendsofphp/php-cs-fixer": "^3.0" - }, - "autoload": { - "psr-4": { - "Galahad\\LaravelAddressing\\": "src/" - } - }, - "autoload-dev": { - "classmap": [ - "tests/TestCase.php" - ], - "psr-4": { - "Galahad\\LaravelAddressing\\Tests\\": "tests/" - } - }, - "scripts": { - "fix-style": "vendor/bin/php-cs-fixer fix", - "check-style": "vendor/bin/php-cs-fixer fix --diff --dry-run" - }, - "license": "MIT", - "extra": { - "laravel": { - "providers": [ - "Galahad\\LaravelAddressing\\Support\\AddressingServiceProvider" - ], - "aliases": { - "Addressing": "Galahad\\LaravelAddressing\\Support\\Facades\\Addressing" - } - } - }, - "minimum-stability": "dev", - "prefer-stable": true + "name": "galahad/laravel-addressing", + "description": "Laravel package providing addressing functionality", + "keywords": [ + "laravel", + "address", + "addressing", + "validation", + "countries" + ], + "type": "library", + "homepage": "https://github.com/glhd/laravel-addressing", + "authors": [ + { + "name": "Chris Morrell", + "homepage": "http://github.com/inxilpro" + }, + { + "name": "Junior Grossi", + "email": "juniorgro@gmail.com", + "homepage": "http://github.com/jgrossi" + } + ], + "require": { + "php": ">=7.4", + "illuminate/contracts": "^v7|^8|^9|^10|^11|12.x-dev|dev-master", + "illuminate/support": "^v7|^8|^9|^10|^11|12.x-dev|dev-master", + "illuminate/http": "^v7|^8|^9|^10|^11|12.x-dev|dev-master", + "illuminate/routing": "^v7|^8|^9|^10|^11|12.x-dev|dev-master", + "illuminate/validation": "^v7|^8|^9|^10|^11|12.x-dev|dev-master", + "commerceguys/addressing": "^v1.2|^2.2", + "symfony/intl": "^v4.2|^v5.0|^v6.0|^7.0", + "commerceguys/intl": "^v1.1|^2.0", + "doctrine/collections": "^1.6.2|^2.2" + }, + "require-dev": { + "ext-json": "*", + "phpunit/phpunit": "^9.5|^10|^11.5.3", + "orchestra/testbench": "^5.20|^6.24|^7.10|^8|9.x-dev|10.x-dev|dev-master", + "friendsofphp/php-cs-fixer": "^3.0" + }, + "autoload": { + "psr-4": { + "Galahad\\LaravelAddressing\\": "src/" + } + }, + "autoload-dev": { + "classmap": [ + "tests/TestCase.php" + ], + "psr-4": { + "Galahad\\LaravelAddressing\\Tests\\": "tests/" + } + }, + "scripts": { + "fix-style": "vendor/bin/php-cs-fixer fix", + "check-style": "vendor/bin/php-cs-fixer fix --diff --dry-run" + }, + "license": "MIT", + "extra": { + "laravel": { + "providers": [ + "Galahad\\LaravelAddressing\\Support\\AddressingServiceProvider" + ], + "aliases": { + "Addressing": "Galahad\\LaravelAddressing\\Support\\Facades\\Addressing" + } + } + }, + "minimum-stability": "dev", + "prefer-stable": true }