From 523bc8e788faf2b87ec8d8baead887f5b07de23e Mon Sep 17 00:00:00 2001
From: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Date: Sat, 29 Jul 2023 18:01:57 +0200
Subject: [PATCH 1/2] Add psalm.xml to .gitattributes

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index d7c0f84d2..3e89296ba 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,3 +4,4 @@
 /phpcs.xml.dist export-ignore
 /phpstan.neon export-ignore
 /phpunit.xml.dist export-ignore
+/psalm.xml export-ignore

From ae6170f361a0f43975cde38e08af1358815e561d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= <postmaster@greg0ire.fr>
Date: Sat, 29 Jul 2023 18:09:04 +0200
Subject: [PATCH 2/2] Address coding standard issues

---
 .../Doctrine/Tests/Common/Annotations/AbstractReaderTest.php  | 4 +++-
 tests/Doctrine/Tests/Common/Annotations/DummyClass.php        | 2 +-
 .../Doctrine/Tests/Common/Annotations/Ticket/DCOM141Test.php  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php b/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php
index f416023e8..1cd486248 100644
--- a/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php
+++ b/tests/Doctrine/Tests/Common/Annotations/AbstractReaderTest.php
@@ -661,7 +661,9 @@ class TestImportWithConcreteAnnotation
 class DummyClass2
 {
     /**
-     * @DummyId @DummyColumn(type="integer") @DummyGeneratedValue
+     * @DummyId
+     * @DummyColumn(type="integer")
+     * @DummyGeneratedValue
      * @var int
      */
     public $id;
diff --git a/tests/Doctrine/Tests/Common/Annotations/DummyClass.php b/tests/Doctrine/Tests/Common/Annotations/DummyClass.php
index 303109bcd..5742166f0 100644
--- a/tests/Doctrine/Tests/Common/Annotations/DummyClass.php
+++ b/tests/Doctrine/Tests/Common/Annotations/DummyClass.php
@@ -21,7 +21,7 @@ class DummyClass
     public $field1;
 
     /**
-     * @var mixed;
+     * @var mixed
      * @DummyJoinTable(name="join_table",
      *      joinColumns={@DummyJoinColumn(name="col1", referencedColumnName="col2")},
      *      inverseJoinColumns={
diff --git a/tests/Doctrine/Tests/Common/Annotations/Ticket/DCOM141Test.php b/tests/Doctrine/Tests/Common/Annotations/Ticket/DCOM141Test.php
index 875ebe99f..43840fbf1 100644
--- a/tests/Doctrine/Tests/Common/Annotations/Ticket/DCOM141Test.php
+++ b/tests/Doctrine/Tests/Common/Annotations/Ticket/DCOM141Test.php
@@ -5,6 +5,7 @@
 use Doctrine\Common\Annotations\AnnotationReader;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
+use SimpleXMLElement;
 
 /**
  * @group
@@ -44,7 +45,7 @@ class DCOM141Annotation
 }
 
 /**
- * @DCOM141Annotation(\SimpleXMLElement::class)
+ * @DCOM141Annotation(SimpleXMLElement::class)
  */
 class DCOM141ConsumerPrefixed
 {