Merge pull request #10790 from greg0ire/slevomat-cs-upgrade

greg0ire · web-flow · commit f76bab2b7397 · 2023-06-23T22:13:30.000+02:00
Work around slevomat/coding-standard issues
diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php
@@ -208,10 +208,10 @@ public function newDefaultAnnotationDriver($paths = [], $useSimpleAnnotationRead
     }
 
     /**
-     * @deprecated No replacement planned.
-     *
      * Adds a namespace under a certain alias.
      *
+     * @deprecated No replacement planned.
+     *
      * @param string $alias
      * @param string $namespace
      *
diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php
@@ -313,7 +313,6 @@ static function (string $fieldName) use ($data, $class) {
      * that belongs to a particular component/class. Afterwards, all these chunks
      * are processed, one after the other. For each chunk of class data only one of the
      * following code paths is executed:
-     *
      * Path A: The data chunk belongs to a joined/associated object and the association
      *         is collection-valued.
      * Path B: The data chunk belongs to a joined/associated object and the association
diff --git a/lib/Doctrine/ORM/Query/Exec/AbstractSqlExecutor.php b/lib/Doctrine/ORM/Query/Exec/AbstractSqlExecutor.php
@@ -53,10 +53,9 @@ public function removeQueryCacheProfile()
     /**
      * Executes all sql statements.
      *
-     * @param Connection $conn The database connection that is used to execute the queries.
-     * @psalm-param list<mixed>|array<string, mixed> $params The parameters.
-     * @psalm-param array<int, int|string|Type|null>|
-     *              array<string, int|string|Type|null> $types The parameter types.
+     * @param Connection                                                           $conn   The database connection that is used to execute the queries.
+     * @param list<mixed>|array<string, mixed>                                     $params The parameters.
+     * @param array<int, int|string|Type|null>|array<string, int|string|Type|null> $types  The parameter types.
      *
      * @return Result|int
      */
diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php
@@ -2566,7 +2566,8 @@ public function ConditionalPrimary()
      *      EmptyCollectionComparisonExpression | CollectionMemberExpression |
      *      InstanceOfExpression
      *
-     * @return AST\BetweenExpression|
+     * @return AST\Node
+     * @psalm-return AST\BetweenExpression|
      *         AST\CollectionMemberExpression|
      *         AST\ComparisonExpression|
      *         AST\EmptyCollectionComparisonExpression|
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -395,21 +395,6 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Query/Parser.php
 
-		-
-			message: """
-				#^PHPDoc tag @return has invalid value \\(AST\\\\BetweenExpression\\|
-				        AST\\\\CollectionMemberExpression\\|
-				        AST\\\\ComparisonExpression\\|
-				        AST\\\\EmptyCollectionComparisonExpression\\|
-				        AST\\\\ExistsExpression\\|
-				        AST\\\\InExpression\\|
-				        AST\\\\InstanceOfExpression\\|
-				        AST\\\\LikeExpression\\|
-				        AST\\\\NullComparisonExpression\\)\\: Unexpected token "\\\\n     \\* ", expected type at offset 344$#
-			"""
-			count: 1
-			path: lib/Doctrine/ORM/Query/Parser.php
-
 		-
 			message: "#^Parameter \\#2 \\$stringPattern of class Doctrine\\\\ORM\\\\Query\\\\AST\\\\LikeExpression constructor expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\Functions\\\\FunctionNode\\|Doctrine\\\\ORM\\\\Query\\\\AST\\\\InputParameter\\|Doctrine\\\\ORM\\\\Query\\\\AST\\\\Literal\\|Doctrine\\\\ORM\\\\Query\\\\AST\\\\PathExpression, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#"
 			count: 1
diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5804Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5804Test.php
@@ -103,7 +103,7 @@ class GH5804Article
      * @Id
      * @Column(type="GH5804Type", length=255)
      * @GeneratedValue(strategy="CUSTOM")
-     * @CustomIdGenerator(class=\Doctrine\Tests\ORM\Functional\Ticket\GH5804Generator::class)
+     * @CustomIdGenerator(class=GH5804Generator::class)
      */
     public $id;
 
diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/ClassMetadataExporterTestCase.php b/tests/Doctrine/Tests/ORM/Tools/Export/ClassMetadataExporterTestCase.php
@@ -15,6 +15,8 @@
 use Doctrine\ORM\Mapping\Driver\AnnotationDriver;
 use Doctrine\ORM\Mapping\Driver\XmlDriver;
 use Doctrine\ORM\Mapping\Driver\YamlDriver;
+use Doctrine\ORM\Mapping\PostPersist;
+use Doctrine\ORM\Mapping\PrePersist;
 use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
 use Doctrine\ORM\Tools\EntityGenerator;
 use Doctrine\ORM\Tools\Export\ClassMetadataExporter;
@@ -399,26 +401,26 @@ class Group
 }
 class UserListener
 {
-    /** @\Doctrine\ORM\Mapping\PrePersist */
+    /** @PrePersist */
     public function customPrePersist(): void
     {
     }
 
-    /** @\Doctrine\ORM\Mapping\PostPersist */
+    /** @PostPersist */
     public function customPostPersist(): void
     {
     }
 }
 class GroupListener
 {
-    /** @\Doctrine\ORM\Mapping\PrePersist */
+    /** @PrePersist */
     public function prePersist(): void
     {
     }
 }
 class AddressListener
 {
-    /** @\Doctrine\ORM\Mapping\PostPersist */
+    /** @PostPersist */
     public function customPostPersist(): void
     {
     }
diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php
@@ -384,7 +384,8 @@ class DDC1649Two
 {
     /**
      * @var DDC1649One
-     * @Id @ManyToOne(targetEntity="DDC1649One")
+     * @Id
+     * @ManyToOne(targetEntity="DDC1649One")
      */
     public $one;
 }

Original file line number	Diff line number	Diff line change
`@@ -208,10 +208,10 @@ public function newDefaultAnnotationDriver($paths = [], $useSimpleAnnotationRead`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/**`
`211`		`- * @deprecated No replacement planned.`
`212`		`- *`
`213`	`211`	`* Adds a namespace under a certain alias.`
`214`	`212`	`*`
	`213`	`+ * @deprecated No replacement planned.`
	`214`	`+ *`
`215`	`215`	`* @param string $alias`
`216`	`216`	`* @param string $namespace`
`217`	`217`	`*`
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,9 @@ public function removeQueryCacheProfile()`
`53`	`53`	`/**`
`54`	`54`	`* Executes all sql statements.`
`55`	`55`	`*`
`56`		`- * @param Connection $conn The database connection that is used to execute the queries.`
`57`		`- * @psalm-param list<mixed>\|array<string, mixed> $params The parameters.`
`58`		`- * @psalm-param array<int, int\|string\|Type\|null>\|`
`59`		`- * array<string, int\|string\|Type\|null> $types The parameter types.`
	`56`	`+ * @param Connection $conn The database connection that is used to execute the queries.`
	`57`	`+ * @param list<mixed>\|array<string, mixed> $params The parameters.`
	`58`	`+ * @param array<int, int\|string\|Type\|null>\|array<string, int\|string\|Type\|null> $types The parameter types.`
`60`	`59`	`*`
`61`	`60`	`* @return Result\|int`
`62`	`61`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`use Doctrine\ORM\Mapping\Driver\AnnotationDriver;`
`16`	`16`	`use Doctrine\ORM\Mapping\Driver\XmlDriver;`
`17`	`17`	`use Doctrine\ORM\Mapping\Driver\YamlDriver;`
	`18`	`+use Doctrine\ORM\Mapping\PostPersist;`
	`19`	`+use Doctrine\ORM\Mapping\PrePersist;`
`18`	`20`	`use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;`
`19`	`21`	`use Doctrine\ORM\Tools\EntityGenerator;`
`20`	`22`	`use Doctrine\ORM\Tools\Export\ClassMetadataExporter;`
`@@ -399,26 +401,26 @@ class Group`
`399`	`401`	`}`
`400`	`402`	`class UserListener`
`401`	`403`	`{`
`402`		`- /** @\Doctrine\ORM\Mapping\PrePersist */`
	`404`	`+ /** @PrePersist */`
`403`	`405`	`public function customPrePersist(): void`
`404`	`406`	`{`
`405`	`407`	`}`
`406`	`408`
`407`		`- /** @\Doctrine\ORM\Mapping\PostPersist */`
	`409`	`+ /** @PostPersist */`
`408`	`410`	`public function customPostPersist(): void`
`409`	`411`	`{`
`410`	`412`	`}`
`411`	`413`	`}`
`412`	`414`	`class GroupListener`
`413`	`415`	`{`
`414`		`- /** @\Doctrine\ORM\Mapping\PrePersist */`
	`416`	`+ /** @PrePersist */`
`415`	`417`	`public function prePersist(): void`
`416`	`418`	`{`
`417`	`419`	`}`
`418`	`420`	`}`
`419`	`421`	`class AddressListener`
`420`	`422`	`{`
`421`		`- /** @\Doctrine\ORM\Mapping\PostPersist */`
	`423`	`+ /** @PostPersist */`
`422`	`424`	`public function customPostPersist(): void`
`423`	`425`	`{`
`424`	`426`	`}`
Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,8 @@ class DDC1649Two`
`384`	`384`	`{`
`385`	`385`	`/**`
`386`	`386`	`* @var DDC1649One`
`387`		`- * @Id @ManyToOne(targetEntity="DDC1649One")`
	`387`	`+ * @Id`
	`388`	`+ * @ManyToOne(targetEntity="DDC1649One")`
`388`	`389`	`*/`
`389`	`390`	`public $one;`
`390`	`391`	`}`