From aa4699041625a6b81ea834fdf28384f020417c26 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 12 Apr 2025 10:12:01 +0000
Subject: [PATCH 1/2] chore(deps): update dependency psalm/phar to v6

---
 api/composer.json |  2 +-
 api/composer.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/api/composer.json b/api/composer.json
index 7f8e201e29..911c311c24 100644
--- a/api/composer.json
+++ b/api/composer.json
@@ -61,7 +61,7 @@
         "phpstan/phpstan": "2.1.11",
         "phpunit/phpunit": "11.5.17",
         "rector/rector": "2.0.11",
-        "psalm/phar": "5.26.1",
+        "psalm/phar": "6.10.0",
         "spatie/phpunit-snapshot-assertions": "5.1.8",
         "symfony/browser-kit": "7.2.4",
         "symfony/css-selector": "7.2.0",
diff --git a/api/composer.lock b/api/composer.lock
index 5433833dc0..6285fa6e04 100644
--- a/api/composer.lock
+++ b/api/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "03473d09537350dcf5dfcbb3be7b0b6a",
+    "content-hash": "e16a062d70feca8a278a6525244f6369",
     "packages": [
         {
             "name": "api-platform/core",
@@ -12192,20 +12192,20 @@
         },
         {
             "name": "psalm/phar",
-            "version": "5.26.1",
+            "version": "6.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/psalm/phar.git",
-                "reference": "8a38e7ad04499a0ccd2c506fd1da6fc01fff4547"
+                "reference": "17ae70dd523f392966b60210e67708a3a5df129b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/psalm/phar/zipball/8a38e7ad04499a0ccd2c506fd1da6fc01fff4547",
-                "reference": "8a38e7ad04499a0ccd2c506fd1da6fc01fff4547",
+                "url": "https://api.github.com/repos/psalm/phar/zipball/17ae70dd523f392966b60210e67708a3a5df129b",
+                "reference": "17ae70dd523f392966b60210e67708a3a5df129b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^8.2"
             },
             "conflict": {
                 "vimeo/psalm": "*"
@@ -12221,9 +12221,9 @@
             "description": "Composer-based Psalm Phar",
             "support": {
                 "issues": "https://github.com/psalm/phar/issues",
-                "source": "https://github.com/psalm/phar/tree/5.26.1"
+                "source": "https://github.com/psalm/phar/tree/6.10.0"
             },
-            "time": "2024-09-09T16:22:43+00:00"
+            "time": "2025-03-31T10:19:54+00:00"
         },
         {
             "name": "react/cache",

From 462c90366f4ec9a96069736eecd7b586302432b0 Mon Sep 17 00:00:00 2001
From: Urban Suppiger <urban@suppiger.net>
Date: Sat, 12 Apr 2025 13:50:49 +0200
Subject: [PATCH 2/2] don't ensure override attribute

---
 api/psalm.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/psalm.xml b/api/psalm.xml
index 3b6d9b6b57..09f4cd8c50 100644
--- a/api/psalm.xml
+++ b/api/psalm.xml
@@ -6,6 +6,7 @@
     cacheDirectory="./.cache"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
+    ensureOverrideAttribute="false"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"