From a548723af91ba624570c25e4f2e5092c1fc56840 Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Tue, 19 Nov 2024 15:12:31 +0100 Subject: [PATCH] Cleanup --- .github/workflows/tests.yaml | 9 ++------- composer.json | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 55f9f74c..d7c302a8 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -1,11 +1,10 @@ -name: Continuous Integration +name: CI on: - pull_request: null + pull_request: push: branches: - master - - develop - release/** permissions: @@ -85,10 +84,6 @@ jobs: - name: Setup Problem Matchers for PHPUnit run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - name: Update PHPUnit - run: composer require --dev phpunit/phpunit ^9.5 --no-update - if: matrix.php == '8.0' && matrix.dependencies == 'lowest' - # These dependencies are not used running the tests but can cause deprecation warnings so we remove them before running the tests - name: Remove unused dependencies run: composer remove vimeo/psalm phpstan/phpstan friendsofphp/php-cs-fixer --dev --no-interaction --no-update diff --git a/composer.json b/composer.json index 01bb7fbf..b591b465 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "phpstan/phpstan": "1.12.5", "phpstan/phpstan-phpunit": "1.4.0", "phpstan/phpstan-symfony": "1.4.10", - "phpunit/phpunit": "^8.5|^9.6", + "phpunit/phpunit": "^8.5.40||^9.6.21", "symfony/browser-kit": "^4.4.20||^5.0.11||^6.0||^7.0", "symfony/cache": "^4.4.20||^5.0.11||^6.0||^7.0", "symfony/dom-crawler": "^4.4.20||^5.0.11||^6.0||^7.0",