Merge pull request #484 from VincentLanglet/patch-1

Add psalm.xml to .gitattributes
doctrine · Jul 29, 2023 · a9ec7af · a9ec7af
2 parents a77f4cc + ae6170f
commit a9ec7af
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
 {