diff --git a/.github/workflows/code_checks.yml b/.github/workflows/validate.yml similarity index 65% rename from .github/workflows/code_checks.yml rename to .github/workflows/validate.yml index 23aa584..68af384 100644 --- a/.github/workflows/code_checks.yml +++ b/.github/workflows/validate.yml @@ -2,13 +2,15 @@ name: PHP Composer on: push: - branches: [ master ] + branches: + - 'master' pull_request: - branches: [ master ] + branches: + - 'master' jobs: build: - + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} runs-on: ubuntu-latest strategy: fail-fast: true @@ -16,8 +18,6 @@ jobs: php: [ '7.2', '7.3', '7.4' ] laravel: [ '5.5.*', '5.6.*', '5.7.*', '5.8.*', '^6.0', '^7.0' ] - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - steps: - uses: actions/checkout@v2 @@ -29,20 +29,15 @@ jobs: - uses: shivammathur/setup-php@v1 with: php-version: ${{ matrix.php }} - coverage: xdebug + coverage: none - - name: Validate composer.json and composer.lock + - name: Validate composer.json run: composer validate - name: Install dependencies run: | - composer require "illuminate/support:${{ matrix.laravel }}" "illuminate/support:${{ matrix.laravel }}" --no-interaction --no-update + composer require "illuminate/support:${{ matrix.laravel }}" "illuminate/http:${{ matrix.laravel }}" --no-interaction --no-update composer update --prefer-dist --no-interaction --no-suggest - name: Run test - run: ./vendor/bin/phpunit --coverage-clover=coverage.clover --verbose - - - name: External Code Coverage - run: | - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover coverage.clover + run: ./vendor/bin/phpunit --verbose diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 8096e16..1fdd5a5 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,14 +1,20 @@ filter: paths: - - 'src/*' + - 'src/' excluded_paths: - - 'tests/*' - - 'vendor/*' + - 'tests/' + dependency_paths: + - 'vendor/' checks: php: true -tools: - external_code_coverage: - runs: 3 - timeout: 1200 +build: + nodes: + coverage: + tests: + override: + - command: ./vendor/bin/phpunit --coverage-clover=coverage.clover + coverage: + file: coverage.clover + format: clover diff --git a/composer.json b/composer.json index 2a4f4c4..2dcfd68 100644 --- a/composer.json +++ b/composer.json @@ -19,8 +19,8 @@ ], "require": { "php": "^7.1", - "illuminate/support": "^5.5 || ^6.0", - "illuminate/http": "^5.5 || ^6.0" + "illuminate/support": "^5.5 || ^6.0 || ^7.0", + "illuminate/http": "^5.5 || ^6.0 || ^7.0" }, "require-dev": { "orchestra/testbench": "^3.5 || ^4.0 || ^5.0",