diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d09e4b..39d402c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,11 @@ jobs: strategy: fail-fast: false matrix: - php-version: ['7.4', '8.2'] + php-version: ['8.1', '8.2'] db-type: [sqlite, mysql, pgsql] prefer-lowest: [''] include: - - php-version: '7.4' + - php-version: '8.1' db-type: 'sqlite' prefer-lowest: 'prefer-lowest' @@ -55,7 +55,7 @@ jobs: - name: Run PHPUnit run: | - if [[ ${{ matrix.php-version }} == '7.4' && ${{ matrix.db-type }} == 'sqlite' ]]; then + if [[ ${{ matrix.php-version }} == '8.1' && ${{ matrix.db-type }} == 'sqlite' ]]; then vendor/bin/phpunit --coverage-clover=coverage.xml else vendor/bin/phpunit @@ -65,7 +65,7 @@ jobs: run: if ${{ matrix.prefer-lowest == 'prefer-lowest' }}; then vendor/bin/validate-prefer-lowest -m; fi - name: Code Coverage Report - if: success() && matrix.php-version == '7.4' && matrix.db-type == 'sqlite' + if: success() && matrix.php-version == '8.1' && matrix.db-type == 'sqlite' uses: codecov/codecov-action@v3 validation: @@ -78,7 +78,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.1' extensions: mbstring coverage: none diff --git a/.php_cs b/.php_cs deleted file mode 100644 index 23ba165..0000000 --- a/.php_cs +++ /dev/null @@ -1,13 +0,0 @@ -=7.4", + "php": ">=8.1", "php-http/httplug": "^2.0", "php-http/discovery": "^1.0", - "cakephp/cakephp": "^4.2" + "cakephp/cakephp": "^5.0" }, "require-dev": { "phpunit/phpunit": "^9.5", @@ -35,11 +40,6 @@ "psr/http-client-implementation": "1.0", "php-http/client-implementation": "1.0" }, - "scripts": { - "test": "vendor/bin/phpunit", - "test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml" - }, - "prefer-stable": true, "scripts": { "test": "phpunit", "test-coverage": "phpunit --log-junit webroot/coverage/unitreport.xml --coverage-html webroot/coverage --coverage-clover webroot/coverage/coverage.xml", @@ -50,6 +50,7 @@ "cs-check": "phpcs --extensions=php", "cs-fix": "phpcbf --extensions=php" }, + "prefer-stable": true, "config": { "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true