diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 941c977..d5a6526 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,11 +11,13 @@ jobs: strategy: matrix: - php: [8.0, 7.4] - laravel: [9.*, 8.*, 7.*, 6.*, 5.8.*] + php: [8.2, 8.1, 8.0, 7.4] + laravel: [10.*, 9.*, 8.*, 7.*, 6.*, 5.8.*] dependency-version: [prefer-lowest, prefer-stable] os: [ubuntu-latest, windows-latest] include: + - laravel: 10.* + testbench: 8.* - laravel: 9.* testbench: 7.* - laravel: 8.* @@ -27,14 +29,26 @@ jobs: - laravel: 5.8.* testbench: 3.8.* exclude: + - laravel: 10.* + php: 8.0 + - laravel: 10.* + php: 7.4 - laravel: 9.* php: 7.4 - laravel: 8.* - php: 7.4 + php: 8.2 - laravel: 7.* - php: 8.0 + php: 8.2 + - laravel: 7.* + php: 8.1 + - laravel: 6.* + php: 8.2 - laravel: 6.* - php: 8 + php: 8.1 + - laravel: 5.8.* + php: 8.2 + - laravel: 5.8.* + php: 8.1 - laravel: 5.8.* php: 8.0 @@ -45,11 +59,10 @@ jobs: uses: actions/checkout@v1 - name: Setup PHP - uses: shivammathur/setup-php@v1 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - extension-csv: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo - extensions: + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo coverage: none - name: Install dependencies diff --git a/composer.json b/composer.json index 67bb65d..6098b7e 100644 --- a/composer.json +++ b/composer.json @@ -13,12 +13,13 @@ } ], "require": { - "php": ">=7.1", - "laravel/framework": "^5.2 || ^6.0 || ^7.0 || ^8.0 || ^9.0", + "php": ">=7.1 || ^8.0", + "laravel/framework": "^5.2 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0", "ext-json": "*" }, "require-dev": { - "orchestra/testbench": "^7.1" + "orchestra/testbench": "^7.1 || ^8.0", + "phpunit/phpunit": "^8.5.23 || ^9.5.10" }, "autoload": { "psr-4": { @@ -30,9 +31,10 @@ "\"Programic\\\\LaravelConvertCaseMiddleware\\Tests\\": "tests" } }, + "minimum-stability": "dev", "scripts": { "test": [ - "vendor/bin/phpunit" + "vendor/bin/phpunit tests" ] } } diff --git a/tests/TestCase.php b/tests/TestCase.php index a7fdc88..c1c4edd 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -2,12 +2,7 @@ namespace Programic\LaravelConvertCaseMiddleware\Tests; -use Orchestra\Testbench\TestCase as Orchestra; - -abstract class TestCase extends Orchestra +abstract class TestCase extends \Orchestra\Testbench\TestCase { - public function setUp(): void - { - parent::setUp(); - } + // }