diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 0c3c794..eae0336 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -1,50 +1,47 @@ name: run-tests on: - push: - branches: [master] - pull_request: - branches: [master] + push: + pull_request: jobs: - test: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: true - matrix: - os: [ubuntu-latest] - php: [8.2] - laravel: [10.*] - stability: [prefer-lowest, prefer-stable] - include: - - laravel: 10.* - testbench: 8.* - - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo - coverage: none - - - name: Setup problem matchers - run: | - echo "::add-matcher::${{ runner.tool_cache }}/php.json" - echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - - 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 - - - name: List Installed Dependencies - run: composer show -D - - - name: Execute tests - run: composer test + test: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: true + matrix: + os: [ubuntu-latest] + php: [ 8.3, 8.2 ] + laravel: [ '10.*', '11.*' ] + stability: [prefer-lowest, prefer-stable] + include: + - laravel: 11.* + testbench: 9.* + - laravel: 10.* + testbench: 8.* + + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo + coverage: none + + - name: Setup problem matchers + run: | + echo "::add-matcher::${{ runner.tool_cache }}/php.json" + echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + + - 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 + + - name: Execute tests + run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index 0c5f6b8..055634c 100644 --- a/composer.json +++ b/composer.json @@ -16,14 +16,14 @@ ], "require": { "php": "^8.2", - "laravel/framework": "^10.13", - "spatie/laravel-package-tools": "^1.15", "google/apiclient": "^2.13", - "maatwebsite/excel": "^3.1" + "laravel/framework": "^10.0|^11.0", + "maatwebsite/excel": "^3.1", + "spatie/laravel-package-tools": "^1.15" }, "require-dev": { "laravel/pint": "^1.0", - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^10.5|^11.0" }, "autoload": { "psr-4": { diff --git a/src/LaravelExcelToGoogleSheetServiceProvider.php b/src/LaravelExcelToGoogleSheetServiceProvider.php index 3ac4ae1..98df127 100644 --- a/src/LaravelExcelToGoogleSheetServiceProvider.php +++ b/src/LaravelExcelToGoogleSheetServiceProvider.php @@ -31,7 +31,7 @@ public function bootingPackage(): void $this->app->bind(GoogleSheetPusher::class, fn () => new GoogleSheetPusher($this->app->make(GoogleSheetService::class))); } - protected function guardAgainstInvalidConfiguration(array $config = null): void + protected function guardAgainstInvalidConfiguration(?array $config = null): void { if (is_array($config['service_account_credentials_json'])) { return;