From 7525ef80d780c633145a43e7feddba089e70a6e7 Mon Sep 17 00:00:00 2001
From: Christopher Georg <christopher.georg@sr-travel.de>
Date: Mon, 6 Feb 2023 17:18:40 +0100
Subject: [PATCH 1/3] chore: allow phpunit 10

---
 composer.json                               | 5 +++--
 tests/Controller/CalendarControllerTest.php | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 47b4d40..87c9202 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,9 @@
         "symfony/framework-bundle": "^5.4 || ^6.3 || ^7.0"
     },
     "require-dev": {
-        "phpspec/prophecy": "^1.17",
-        "phpunit/phpunit": "^9.6",
+        "phpspec/prophecy": "^1.8",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.6 || ^10.4",
         "symfony/dotenv": "^5.4 || ^6.3 || ^7.0",
         "symfony/phpunit-bridge": "^5.4 || ^6.3 || ^7.0",
         "symfony/yaml": "^5.4 || ^6.3 || ^7.0"
diff --git a/tests/Controller/CalendarControllerTest.php b/tests/Controller/CalendarControllerTest.php
index 4a7a3d0..c73fe75 100755
--- a/tests/Controller/CalendarControllerTest.php
+++ b/tests/Controller/CalendarControllerTest.php
@@ -12,12 +12,15 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 class CalendarControllerTest extends TestCase
 {
+    use ProphecyTrait;
+
     private ObjectProphecy|CalendarEvent $calendarEvent;
     private Event|ObjectProphecy $event;
     private ObjectProphecy|EventDispatcherInterface $eventDispatcher;

From 2cfecd9ad0fb2dd3849779025696ab39b149be67 Mon Sep 17 00:00:00 2001
From: Christopher Georg <christopher.georg@sr-travel.de>
Date: Fri, 21 Apr 2023 09:19:18 +0700
Subject: [PATCH 2/3] chore: prepare fo phpunit 10 (WIP)

---
 .gitignore       | 1 +
 phpunit.xml.dist | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1d933e0..71e7c28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 .php_cs.cache
 .phpunit.result.cache
 composer.lock
+.phpunit.cache
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 40c118c..d9e7c4a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         colors="true"
          bootstrap="./vendor/autoload.php">
+
     <coverage includeUncoveredFiles="true">
         <include>
             <directory>.</directory>
@@ -17,17 +19,20 @@
             <xml outputDirectory="build/coverage-xml"/>
         </report>
     </coverage>
+
     <php>
         <ini name="error_reporting" value="-1"/>
         <ini name="memory_limit" value="-1"/>
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[total]=0"/>
     </php>
+
     <testsuites>
         <testsuite name="Project Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
     <logging/>
+
     <listeners>
         <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
     </listeners>

From e49c069b6c51b38aa2383c6aeb280dabff4b6c15 Mon Sep 17 00:00:00 2001
From: Christopher Georg <christopher.georg@sr-travel.de>
Date: Fri, 8 Dec 2023 16:54:45 +0100
Subject: [PATCH 3/3] chore: prepare fo phpunit 10

---
 .github/workflows/code_checks.yaml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/code_checks.yaml b/.github/workflows/code_checks.yaml
index fda6aac..7b8a788 100644
--- a/.github/workflows/code_checks.yaml
+++ b/.github/workflows/code_checks.yaml
@@ -11,7 +11,7 @@ jobs:
         php: ['8.2']
         stability: [ prefer-stable ]
         minimum-stability: [ stable ]
-        symfony-version: ['6.3.*']
+        symfony-version: ['6.4.*']
         include:
           - php: '8.0'
             symfony-version: 5.4.*
@@ -25,15 +25,12 @@ jobs:
           - php: '8.2'
             symfony-version: 6.3.*
             stability: prefer-stable
-          # change after phpspec/prophecy supports php 8.3
-          #- php: '8.3'
-            #symfony-version: 6.3.*
-            #stability: prefer-stable
-            #--ignore-platform-req=php+
-          - php: '8.2'
-            symfony-version: 7.0.x@dev
+          - php: '8.3'
+            symfony-version: 6.4.*
+            stability: prefer-stable
+          - php: '8.3'
+            symfony-version: 7.0.*
             stability: prefer-stable
-            minimum-stability: dev
 
     name: PHP ${{ matrix.php }} - ${{ matrix.symfony-version }} - ${{ matrix.stability }}
     steps: