diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 5cbbc4c..f4cbbe1 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,10 +13,13 @@ jobs: fail-fast: true matrix: os: [macos-latest, ubuntu-latest, windows-latest] - php: [8.3, 8.2, 8.1] - laravel: [11.*, 10.*] + php: [8.4, 8.3, 8.2, 8.1] + laravel: [12.*, 11.*, 10.*] stability: [prefer-lowest, prefer-stable] include: + - laravel: 12.* + canvas: ^10.0 + carbon: 3.* - laravel: 11.* canvas: 9.* carbon: 2.* @@ -24,6 +27,8 @@ jobs: canvas: ^8.11 carbon: 2.* exclude: + - laravel: 12.* + php: 8.1 - laravel: 11.* php: 8.1 diff --git a/.gitignore b/.gitignore index 3717383..2166492 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .idea .phpunit.cache +.DS_Store build composer.lock coverage diff --git a/composer.json b/composer.json index a53ad96..399b4d0 100644 --- a/composer.json +++ b/composer.json @@ -18,19 +18,19 @@ "require": { "php": "^8.1", "spatie/laravel-package-tools": "^1.14.0", - "illuminate/contracts": "^10.0|^11.0" + "illuminate/contracts": "^10.0|^11.0|^12.0" }, "require-dev": { - "larastan/larastan": "^2.9", + "larastan/larastan": "^2.9|^3.0", "laravel/pint": "^1.0", "nunomaduro/collision": "^7.0|^8.0", - "orchestra/testbench": "^8.11|^9.0", - "pestphp/pest": "^2.0", - "pestphp/pest-plugin-arch": "^2.0", - "pestphp/pest-plugin-laravel": "^2.0", + "orchestra/testbench": "^8.11|^9.0|^10.0", + "pestphp/pest": "^2.0|^3.0|^4.0", + "pestphp/pest-plugin-arch": "^2.0|^3.0|^4.0", + "pestphp/pest-plugin-laravel": "^2.0|^3.0|^4.0", "phpstan/extension-installer": "^1.1", - "phpstan/phpstan-deprecation-rules": "^1.0", - "phpstan/phpstan-phpunit": "^1.0" + "phpstan/phpstan-deprecation-rules": "^1.0|^2.0", + "phpstan/phpstan-phpunit": "^1.0|^2.0" }, "autoload": { "psr-4": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a925dff..fb9ee9b 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,36 +1,23 @@ - - - - tests - - - - - ./src - - - - - - - - - - + + + + tests + + + + + + + + + + + + + + + ./src + + diff --git a/phpunit.xml.dist.bak b/phpunit.xml.dist.bak new file mode 100644 index 0000000..a925dff --- /dev/null +++ b/phpunit.xml.dist.bak @@ -0,0 +1,36 @@ + + + + + tests + + + + + ./src + + + + + + + + + + +