From 971062f7ed5679dfe0ce01ada76bc37b9932cfa4 Mon Sep 17 00:00:00 2001
From: Johannes Wachter <johannes@sulu.io>
Date: Tue, 16 Jan 2024 11:21:47 +0100
Subject: [PATCH] remove conflicts

---
 .github/workflows/test-application.yaml | 12 ++++++------
 composer.json                           |  8 ++------
 phpunit.xml.dist                        |  1 +
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml
index 2e824e8e..460e8459 100644
--- a/.github/workflows/test-application.yaml
+++ b/.github/workflows/test-application.yaml
@@ -29,7 +29,7 @@ jobs:
                       dependency-versions: 'lowest'
                       tools: 'composer:v1'
                       php-cs-fixer: false
-                      matrix.max-phpunit-version: '7'
+                      max-phpunit-version: '7'
 
                     - php-version: '7.3'
                       elasticsearch-version: '2.4.6'
@@ -38,7 +38,7 @@ jobs:
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
                       php-cs-fixer: false
-                      matrix.max-phpunit-version: '7'
+                      max-phpunit-version: '7'
 
                     - php-version: '7.4'
                       elasticsearch-version: '2.4.6'
@@ -47,7 +47,7 @@ jobs:
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
                       php-cs-fixer: true
-                      matrix.max-phpunit-version: '7'
+                      max-phpunit-version: '7'
 
                     - php-version: '8.0'
                       elasticsearch-version: '7.11.1'
@@ -56,7 +56,7 @@ jobs:
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
                       php-cs-fixer: false
-                      matrix.max-phpunit-version: '7'
+                      max-phpunit-version: '7'
 
                     - php-version: '8.1'
                       elasticsearch-version: '7.11.1'
@@ -65,7 +65,7 @@ jobs:
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
                       php-cs-fixer: false
-                      matrix.max-phpunit-version: '8'
+                      max-phpunit-version: '8'
 
                     - php-version: '8.1'
                       elasticsearch-version: '7.11.1'
@@ -74,7 +74,7 @@ jobs:
                       dependency-versions: 'highest'
                       tools: 'composer:v2'
                       php-cs-fixer: false
-                      matrix.max-phpunit-version: '8'
+                      max-phpunit-version: '8'
 
         services:
             elasticsearch:
diff --git a/composer.json b/composer.json
index a627d238..a2e98326 100644
--- a/composer.json
+++ b/composer.json
@@ -40,9 +40,7 @@
         "behat/behat": "^3.4.2",
 
         "webmozart/assert": "^1.7",
-        "phpspec/prophecy": "^1.15",
-        "doctrine/annotations": "^1.14",
-        "phpspec/prophecy-phpunit": "^1.1 || ^2.1"
+        "doctrine/annotations": "^1.14"
     },
     "suggest": {
         "sensio/distribution-bundle": "Required if the SearchScriptHandler is used",
@@ -52,9 +50,7 @@
     "conflict": {
         "guzzlehttp/ringphp": "< 1.0.7",
         "symfony/security-guard": "5.4.0-BETA1",
-        "doctrine/doctrine-cache-bundle": "<1.3.1",
-        "sebastian/comparator": "^5.0",
-        "phpunit/phpunit": "> 8.0"
+        "doctrine/doctrine-cache-bundle": "<1.3.1"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c2bbacc9..690c18a7 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -23,6 +23,7 @@
 
     <php>
         <env name="SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT" value="1"/>
+        <env name="SYMFONY_PHPUNIT_REQUIRE" value="phpspec/prophecy-phpunit:^1.1||^2.1"/>
         <env name="SYMFONY_PHPUNIT_REMOVE" value="symfony/yaml"/>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
         <server name="KERNEL_DIR" value="Tests/Resources/app" />