diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml index 6a4336eb..de0f78a9 100644 --- a/.github/workflows/ci_build.yml +++ b/.github/workflows/ci_build.yml @@ -8,12 +8,13 @@ on: jobs: build: - name: PHP ${{ matrix.php-versions }} + name: PHP ${{ matrix.php-versions }} (${{ matrix.deps }}) runs-on: ubuntu-latest strategy: fail-fast: false matrix: php-versions: ['8.2', '8.3', '8.4'] + deps: ['prefer-latest', 'prefer-lowest'] steps: - name: Setup PHP Action uses: shivammathur/setup-php@v2 @@ -32,8 +33,14 @@ jobs: run: "mysql -u root -h 127.0.0.1 -e 'create database errorheromodule' && mysql -u root -h 127.0.0.1 errorheromodule < spec/Fixture/data/sql.sql" - name: "Validate composer.json" run: "composer validate" - - name: "Install dependencies" - run: "composer install --ignore-platform-reqs" + - name: "Install dependencies (${{ matrix.deps }})" + run: | + if [ "${{ matrix.deps }}" = "prefer-lowest" ]; then + composer install --no-interaction --no-progress --ignore-platform-reqs + composer update webmozart/assert:^1.11 --ignore-platform-reqs + else + composer install --no-interaction --no-progress --ignore-platform-reqs + fi - name: "CS Check" run: "composer cs-check" - name: "Code analyze" @@ -45,11 +52,11 @@ jobs: composer dump-autoload -o mkdir -p build/logs && bin/kahlan --coverage=4 --reporter=verbose --clover=build/logs/clover.xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} file: ./build/logs/clover.xml flags: tests name: codecov-umbrella - yml: ./codecov.yml + codecov_yml_path: ./codecov.yml fail_ci_if_error: true diff --git a/composer.json b/composer.json index 841c227c..8af08823 100644 --- a/composer.json +++ b/composer.json @@ -40,12 +40,12 @@ "laminas/laminas-diactoros": "^2.26", "laminas/laminas-log": "^2.17.1", "laminas/laminas-mail": "^2.25.1", - "laminas/laminas-psr7bridge": "^1.11", - "laminas/laminas-uri": "^2.13", + "laminas/laminas-psr7bridge": "^1.12", + "laminas/laminas-uri": "^2.14", "psr/container": "^1.1.2 || 2.0", - "samsonasik/array-lookup": "^2.0", + "samsonasik/array-lookup": "^2.2", "seld/jsonlint": "^1.11", - "webmozart/assert": "^1.11" + "webmozart/assert": "^1.11 || ^2.1" }, "conflict": { "doctrine/dbal": "<3.0", @@ -56,22 +56,23 @@ "laminas/laminas-mvc-console": "*" }, "require-dev": { - "doctrine/dbal": "^3.9.3", + "doctrine/dbal": "^3.10.4", "doctrine/doctrine-orm-module": "^4.2.1 || ^5.3", - "kahlan/kahlan": "^5.2.8", - "laminas/laminas-cli": "^1.11", - "laminas/laminas-coding-standard": "^3.0", - "laminas/laminas-form": "^2.16 || ^3.21", + "kahlan/kahlan": "^6.0.2", + "laminas/laminas-cli": "^1.13", + "laminas/laminas-coding-standard": "^3.1", + "laminas/laminas-form": "^2.16 || ^3.24.2", "laminas/laminas-mvc": "^3.8", - "laminas/laminas-servicemanager": "^3.23", - "mezzio/mezzio": "^3.20.1", - "mezzio/mezzio-laminasviewrenderer": "^2.16", - "php-coveralls/php-coveralls": "^2.7.0", - "phpstan/phpstan": "^2.0.4", + "laminas/laminas-servicemanager": "^3.24", + "mezzio/mezzio": "^3.27.0", + "mezzio/mezzio-laminasviewrenderer": "^2.19", + "php-coveralls/php-coveralls": "^2.9.1", + "phpstan/phpstan": "^2.1.33", "phpstan/phpstan-webmozart-assert": "^2.0", - "pimple/pimple": "^3.5", + "pimple/pimple": "^3.6.1", "rector/rector": "dev-main", - "symfony/dependency-injection": "^5.4.48" + "symfony/dependency-injection": "^5.4.48", + "symfony/console": "^6.4" }, "suggest": { "mezzio/mezzio-laminasviewrenderer": "^2.0 to be able to use laminas-view template engine in mezzio ^3.0", diff --git a/src/Compat/Logger.php b/src/Compat/Logger.php index df54c177..31533275 100644 --- a/src/Compat/Logger.php +++ b/src/Compat/Logger.php @@ -257,8 +257,6 @@ public function __construct($options = null) /** * Shutdown all writers - * - * @return void */ public function __destruct() {