diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70a6305..a38af80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,11 +21,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] php: [8.3, 8.4] - laravel: ["11.*"] - stability: [prefer-lowest, prefer-stable] - include: - - laravel: 11.* - carbon: ^2.63 + laravel: [11, 12] steps: - uses: actions/checkout@v4 @@ -52,12 +48,11 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:${{ matrix.os == 'windows-latest' && '^^^' || '' }}${{ matrix.carbon }}" --no-interaction --no-update - composer update --${{ matrix.stability }} --prefer-dist --no-interaction + composer update --prefer-dist --no-interaction --with="illuminate/contracts:^${{ matrix.laravel }}" - name: List Installed Dependencies run: composer show -D - name: Run Testsuite - run: ./vendor/bin/phpunit + run: ./vendor/bin/phpunit ${{ matrix.laravel >= 10 && '--display-deprecations --fail-on-deprecation' || '' }} \ No newline at end of file diff --git a/composer.json b/composer.json index 2d17f3a..ae7cc38 100644 --- a/composer.json +++ b/composer.json @@ -18,11 +18,12 @@ ], "require": { "php": "^8.2", - "illuminate/auth": "^11.0", - "illuminate/console": "^11.0", - "illuminate/encryption": "^11.0", - "illuminate/support": "^11.0", - "illuminate/view": "^11.0", + "illuminate/contracts": "^11.0|^12.0", + "illuminate/auth": "^11.0|^12.0", + "illuminate/console": "^11.0|^12.0", + "illuminate/encryption": "^11.0|^12.0", + "illuminate/support": "^11.0|^12.0", + "illuminate/view": "^11.0|^12.0", "laravel/socialite": "^5.0", "socialiteproviders/gitlab": "^4.0", "socialiteproviders/dropbox": "^4.1" @@ -30,10 +31,10 @@ "require-dev": { "laravel/pint": "^1.14", "fakerphp/faker": "^1.9.1", - "larastan/larastan": "^2.9", + "larastan/larastan": "^2.9|^3.0", "mockery/mockery": "^1.4.4", - "phpunit/phpunit": "^10.5", - "orchestra/testbench": "^9.9" + "phpunit/phpunit": "^10.5|^11.5", + "orchestra/testbench": "^9.9|^10.0" }, "autoload": { "psr-4": { @@ -68,5 +69,7 @@ "Identity": "Oneofftech\\Identities\\Facades\\Identity" } } - } + }, + "minimum-stability": "dev", + "prefer-stable": true }