From c8c491f2b752ed3d058d152b31c33a26f307f069 Mon Sep 17 00:00:00 2001 From: Korben Dallas Date: Thu, 25 Apr 2024 15:35:41 +0200 Subject: [PATCH] Upgrade php versions (#10) * Upgrade php versions --- .coveralls.yml | 3 -- .github/workflows/ci.yml | 82 +++++---------------------------- composer.json | 8 ++-- phpunit.github.xml | 19 -------- phpunit.xml.dist | 21 --------- tests.sh | 6 --- tests/FunctionalTestCase.php | 9 ---- tests/TestCase.php | 11 ----- tests/_data/Helpers/.gitkeep | 0 tests/_data/Models/.gitkeep | 0 tests/_data/Presenters/.gitkeep | 0 tests/unit/.gitkeep | 0 12 files changed, 16 insertions(+), 143 deletions(-) delete mode 100644 .coveralls.yml delete mode 100644 phpunit.github.xml delete mode 100644 phpunit.xml.dist delete mode 100755 tests.sh delete mode 100644 tests/FunctionalTestCase.php delete mode 100644 tests/TestCase.php delete mode 100644 tests/_data/Helpers/.gitkeep delete mode 100644 tests/_data/Models/.gitkeep delete mode 100644 tests/_data/Presenters/.gitkeep delete mode 100644 tests/unit/.gitkeep diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 1621caa..0000000 --- a/.coveralls.yml +++ /dev/null @@ -1,3 +0,0 @@ -coverage_clover: build/logs/clover.xml -json_path: build/logs/coveralls-upload.json -service_name: travis-ci diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aee5414..8947686 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,6 @@ name: CI -on: +on: push: pull_request: @@ -8,21 +8,24 @@ env: php_extensions: 'dom, iconv, intl, json, mbstring, opcache, pcntl, pcov, session, simplexml, xml, zip' key: cache-v0.1 -jobs: +jobs: lint: runs-on: '${{ matrix.operating_system }}' - timeout-minutes: 20 - strategy: + timeout-minutes: 20 + strategy: matrix: operating_system: - ubuntu-latest php_versions: - '7.4' + - '8.0' + - '8.1' + - '8.2' fail-fast: false - env: + env: PHP_CS_FIXER_FUTURE_MODE: '0' name: 'Lint PHP' - steps: + steps: - name: 'Checkout' uses: actions/checkout@v2 - name: 'Setup cache environment' @@ -39,11 +42,11 @@ jobs: key: '${{ steps.cache-env.outputs.key }}' restore-keys: '${{ steps.cache-env.outputs.key }}' - name: 'Setup PHP' - uses: shivammathur/setup-php@v2 - with: + uses: shivammathur/setup-php@v2 + with: php-version: ${{ matrix.php_versions }} extensions: '${{ env.php_extensions }}' - ini-values: memory_limit=-1 + ini-values: memory_limit=-1 tools: pecl, composer coverage: none - name: 'Setup problem matchers for PHP (aka PHP error logs)' @@ -55,64 +58,3 @@ jobs: working-directory: './' - name: 'Linting PHP source files' run: 'vendor/bin/ecs check --config=ecs.php .' - test: - strategy: - fail-fast: false - matrix: - operating_system: - - ubuntu-latest - php_versions: - - '7.2' - - '7.3' - - '7.4' - - '8.0' - runs-on: '${{ matrix.operating_system }}' - name: 'Test / PHP ${{ matrix.php_versions }}' - needs: - - lint - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: 'Setup cache environment' - id: cache-env - uses: shivammathur/cache-extensions@v1 - with: - php-version: ${{ matrix.php_versions }} - extensions: ${{ env.php_extensions }} - key: '${{ env.key }}' - - name: 'Cache extensions' - uses: actions/cache@v1 - with: - path: '${{ steps.cache-env.outputs.dir }}' - key: '${{ steps.cache-env.outputs.key }}' - restore-keys: '${{ steps.cache-env.outputs.key }}' - - name: 'Setup PHP' - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php_versions }} - extensions: ${{ env.php_extensions }} - ini-values: 'pcov.directory=src, date.timezone=UTC, upload_max_filesize=20M, post_max_size=20M, memory_limit=512M, short_open_tag=Off' - coverage: pcov - tools: 'phpunit' - - name: 'Install PHP dependencies with Composer' - run: composer install --prefer-dist --no-progress --no-suggest --optimize-autoloader - working-directory: './' - - name: 'Run Unit Tests with PHPUnit' - run: './vendor/bin/phpunit --verbose --stderr --configuration phpunit.github.xml --coverage-clover build/logs/clover.xml --coverage-text' - working-directory: './' - - name: Upload coverage results to Coveralls - env: - COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_PARALLEL: true - COVERALLS_FLAG_NAME: php-${{ matrix.php_versions }} - run: ./vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v - coverage: - needs: test - runs-on: ubuntu-latest - name: "Code coverage" - steps: - - name: Coveralls Finished - uses: coverallsapp/github-action@v1.1.2 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - parallel-finished: true diff --git a/composer.json b/composer.json index d151f0e..990dfd6 100644 --- a/composer.json +++ b/composer.json @@ -21,14 +21,14 @@ } ], "require": { - "php": "^7.2|^7.3|^7.4|^8.0", + "php": "^7.4|^8.0|^8.1|^8.2", "ext-json": "*", - "laravel/framework": "^5.8|^6.0|^7.0|^8.0|^9.0", - "hemp/presenter": "^2.0" + "laravel/framework": "^5.8|^6.0|^7.0|^8.0|^9.0|^10.0|^11.9", + "hemp/presenter": "^2.0|^3.0" }, "require-dev": { "umbrellio/code-style-php": "^1.0", - "orchestra/testbench": "^3.5|^4.0|^5.0|^6.0", + "orchestra/testbench": "^3.5|^4.0|^5.0|^6.0|^7.0|^8.0|^9.0", "symplify/easy-coding-standard": "^9.3.15", "php-coveralls/php-coveralls": "^2.1" }, diff --git a/phpunit.github.xml b/phpunit.github.xml deleted file mode 100644 index 50b4ab4..0000000 --- a/phpunit.github.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - ./tests - - - - - ./src - - - diff --git a/phpunit.xml.dist b/phpunit.xml.dist deleted file mode 100644 index 795a08d..0000000 --- a/phpunit.xml.dist +++ /dev/null @@ -1,21 +0,0 @@ - - - - - ./src - - - - - ./tests - - - diff --git a/tests.sh b/tests.sh deleted file mode 100755 index 1fcbac0..0000000 --- a/tests.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -COMPOSER_MEMORY_LIMIT=-1 composer update -composer lint -php -d pcov.directory='.' vendor/bin/phpunit --coverage-html build --coverage-text - diff --git a/tests/FunctionalTestCase.php b/tests/FunctionalTestCase.php deleted file mode 100644 index 0671575..0000000 --- a/tests/FunctionalTestCase.php +++ /dev/null @@ -1,9 +0,0 @@ -