diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index b1c1ac8..02e8c3a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -12,18 +12,26 @@ on: jobs: test: - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest timeout-minutes: 5 strategy: fail-fast: false matrix: - os: [ubuntu-latest] - php: [8.3, 8.2] - laravel: [11.*] - stability: [prefer-stable] - testbench: [9.*] - - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.os }} + php: ['8.2', '8.3', '8.4', '8.5'] + laravel: ['11.*', '12.*', '13.*'] + livewire: ['3.*', '4.*'] + exclude: + - laravel: '13.*' + php: '8.2' + include: + - laravel: '11.*' + testbench: '9.*' + - laravel: '12.*' + testbench: '10.*' + - laravel: '13.*' + testbench: '11.*' + + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Livewire ${{ matrix.livewire }} steps: - name: Checkout code @@ -43,8 +51,8 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.stability }} --prefer-dist --no-interaction + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "livewire/livewire:${{ matrix.livewire }}" --no-interaction --no-update + composer update --prefer-stable --prefer-dist --no-interaction - name: List Installed Dependencies run: composer show -D diff --git a/composer.json b/composer.json index 9aa9f51..553fd6e 100755 --- a/composer.json +++ b/composer.json @@ -11,12 +11,12 @@ "license": "MIT", "require": { "php": "^8.2", - "livewire/livewire": "^3.0" + "livewire/livewire": "^3.0|^4.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.8", - "larastan/larastan": "^2.9", - "orchestra/testbench": "^9.0", + "larastan/larastan": "^2.9|^3.0", + "orchestra/testbench": "^9.0|^10.0", "phpunit/phpunit": "^11.1" }, "autoload": { diff --git a/src/LivewireRecaptcha.php b/src/LivewireRecaptcha.php index de203cc..55d0907 100644 --- a/src/LivewireRecaptcha.php +++ b/src/LivewireRecaptcha.php @@ -15,10 +15,10 @@ class LivewireRecaptcha * @return string */ public static function directive( - string $version = null, - string $siteKey = null, - string $theme = null, - string $size = null, + ?string $version = null, + ?string $siteKey = null, + ?string $theme = null, + ?string $size = null, ): string { $version ??= config('services.google.recaptcha.version') ?? 'v3';