diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml index 9a897ad..818f37b 100644 --- a/.github/workflows/code-analysis.yml +++ b/.github/workflows/code-analysis.yml @@ -11,15 +11,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['8.2'] + php: [ 8.2, 8.3 ] actions: - - name: ECS - run: 'composer test:style' + - name: ECS + run: 'composer test:style' steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -27,6 +27,6 @@ jobs: php-version: ${{ matrix.php }} - name: Install Composer dependencies - uses: ramsey/composer-install@v1 + uses: ramsey/composer-install@v2 - run: ${{ matrix.actions.run }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4fb1bf6..5906d50 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,15 +10,20 @@ jobs: fail-fast: true matrix: os: [ ubuntu-latest ] - php: [ 8.2 ] - laravel: [ 10.* ] + php: [ 8.2, 8.3 ] + laravel: [ 10.*, 11.* ] stability: [ prefer-lowest, prefer-stable ] + include: + - laravel: 10.* + testbench: 8.* + - laravel: 11.* + testbench: 9.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -29,8 +34,8 @@ jobs: - name: Install Composer dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction --ansi - - name: Test php code + - name: Execute tests run: composer test:unit diff --git a/README.md b/README.md index 3fafd70..a5ff33c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ [![Tests](https://github.com/worksome/cdn-headers/actions/workflows/tests.yml/badge.svg)](https://github.com/worksome/cdn-headers/actions/workflows/tests.yml) [![Code Analysis](https://github.com/worksome/cdn-headers/actions/workflows/code-analysis.yml/badge.svg)](https://github.com/worksome/cdn-headers/actions/workflows/code-analysis.yml) - Package that wraps around CDN headers. Currently supports: - Cloudflare diff --git a/composer.json b/composer.json index 2be098b..3000523 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,16 @@ "description": "Package that wraps around CDN headers.", "type": "library", "license": "MIT", + "require": { + "php": "^8.2", + "illuminate/support": "^10.0 || ^11.0", + "illuminate/contracts": "^10.0 || ^11.0" + }, + "require-dev": { + "pestphp/pest": "^2.33", + "worksome/coding-style": "^2.8", + "mockery/mockery": "^1.6" + }, "autoload": { "psr-4": { "Worksome\\CdnHeaders\\": "src/" @@ -13,22 +23,6 @@ "Worksome\\CdnHeaders\\Tests\\": "tests" } }, - "authors": [ - { - "name": "Lukas Juhas", - "email": "lukas@worksome.com" - } - ], - "require-dev": { - "pestphp/pest": "^2.0", - "worksome/coding-style": "^2.5", - "mockery/mockery": "^1.5.1" - }, - "require": { - "php": "^8.2", - "illuminate/support": "^10.0", - "illuminate/contracts": "^10.0" - }, "scripts": { "lint": "vendor/bin/ecs --fix", "test:unit": "vendor/bin/pest", diff --git a/config/cdn-headers.php b/config/cdn-headers.php index d39d272..bc85dbb 100644 --- a/config/cdn-headers.php +++ b/config/cdn-headers.php @@ -2,7 +2,6 @@ declare(strict_types=1); - // config for Worksome/cdn-headers return [ 'default-provider' => env('CDN_HEADERS_PROVIDER', 'cloudflare'), diff --git a/phpunit.xml b/phpunit.xml index c0d1b0f..0facc2a 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -10,9 +10,9 @@ ./tests - + ./src - +