From 27b5ea4eb7012ca2f493a8a0323ae24b984cf8c6 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Mon, 18 Nov 2024 11:56:20 +0100 Subject: [PATCH] Prepare 3.0 Branch --- .github/workflows/test-application.yaml | 22 +---------------- composer.json | 32 ++++++++++++------------- phpunit-9.xml.dist | 24 ------------------- 3 files changed, 17 insertions(+), 61 deletions(-) delete mode 100644 phpunit-9.xml.dist diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 6c4dd7e..9e64c71 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -19,28 +19,8 @@ jobs: fail-fast: false matrix: include: - - php-version: '7.2' - dependency-versions: 'lowest' - phpunit-config: 'phpunit-9.xml.dist' - - - php-version: '7.3' - dependency-versions: 'highest' - phpunit-config: 'phpunit-9.xml.dist' - - - php-version: '7.4' - dependency-versions: 'highest' - phpunit-config: 'phpunit-9.xml.dist' - - - php-version: '8.0' - dependency-versions: 'highest' - phpunit-config: 'phpunit-9.xml.dist' - - - php-version: '8.1' - dependency-versions: 'highest' - phpunit-config: 'phpunit-9.xml.dist' - - php-version: '8.2' - dependency-versions: 'highest' + dependency-versions: 'lowest' - php-version: '8.3' dependency-versions: 'highest' diff --git a/composer.json b/composer.json index 49e6ddb..923caa7 100644 --- a/composer.json +++ b/composer.json @@ -11,36 +11,36 @@ } ], "require": { - "php": "^7.2 || ^8.0", + "php": "^8.2", "doctrine/orm": "^2.5.3", "friendsofsymfony/rest-bundle": "^2.5 || ^3.0", "jms/serializer-bundle": "^3.0 || ^4.0 || ^5.0", "php-task/php-task": "^1.3.3 || ^2.0", "php-task/task-bundle": "^2.0 || ^3.0", - "sulu/sulu": "^2.4.0 || ^2.5.0@dev", - "symfony/config": "^4.3 || ^5.4 || ^6.3 || ^7.0", - "symfony/dependency-injection": "^4.3 || ^5.4 || ^6.3 || ^7.0", - "symfony/deprecation-contracts": "^1.0 || ^2.0 || ^3.0", - "symfony/http-foundation": "^4.3 || ^5.4 || ^6.3 || ^7.0", - "symfony/http-kernel": "^4.3 || ^5.4 || ^6.3 || ^7.0" + "sulu/sulu": "^3.0 || ^3.0@dev", + "symfony/config": "^6.4 || ^7.1", + "symfony/dependency-injection": "^6.4 || ^7.1", + "symfony/deprecation-contracts": "^2.5 || ^3.0", + "symfony/http-foundation": "^6.4 || ^7.1", + "symfony/http-kernel": "^6.4 || ^7.1" }, "require-dev": { "handcraftedinthealps/zendsearch": "^2.0", - "jackalope/jackalope-doctrine-dbal": "^1.3.0 || ^2.0", + "jackalope/jackalope-doctrine-dbal": "^1.6 || ^2.0", "jangregor/phpstan-prophecy": "^1.0", - "php-cs-fixer/shim": "^3.0", - "phpspec/prophecy": "^1.8", - "phpspec/prophecy-phpunit": "^1.1 || ^2.0", + "php-cs-fixer/shim": "^3.6", + "phpspec/prophecy": "^1.18", + "phpspec/prophecy-phpunit": "^2.1", "phpstan/phpstan": "^1.0", "phpstan/phpstan-doctrine": "^1.0", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-symfony": "^1.0", - "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.0", - "symfony/browser-kit": "^4.3 || ^5.4 || ^6.3 || ^7.0", - "symfony/dotenv": "^4.3 || ^5.4 || ^6.3 || ^7.0", + "phpunit/phpunit": "^10.5", + "symfony/browser-kit": "^6.4 || ^7.1", + "symfony/dotenv": "^6.4 || ^7.1", "symfony/monolog-bundle": "^3.1", - "symfony/security-bundle": "^4.3 || ^5.4 || ^6.3 || ^7.0", - "symfony/stopwatch": "^4.3 || ^5.4 || ^6.3 || ^7.0", + "symfony/security-bundle": "^6.4 || ^7.1", + "symfony/stopwatch": "^6.4 || ^7.1", "thecodingmachine/phpstan-strict-rules": "^1.0" }, "autoload": { diff --git a/phpunit-9.xml.dist b/phpunit-9.xml.dist deleted file mode 100644 index 7145839..0000000 --- a/phpunit-9.xml.dist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - ./Tests - - - - - - ./ - - Resources/ - Tests/ - vendor/ - - - - - - - - -