Merge branch '2.14.x' into 3.0.x

* 2.14.x:
  Bump coding standard to v11 (doctrine#10295)
  PHPStan 1.9.3 (doctrine#10298)
  Rename AbstractCommandTest (doctrine#10294)

composer.json

@@ -36,9 +36,9 @@
         "symfony/console": "^5.4 || ^6.0"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^10.0",
+        "doctrine/coding-standard": "^11.0",
         "phpbench/phpbench": "^1.0",
-        "phpstan/phpstan": "1.9.2",
+        "phpstan/phpstan": "1.9.3",
         "phpunit/phpunit": "^9.5",
         "psr/log": "^1 || ^2 || ^3",
         "squizlabs/php_codesniffer": "3.7.1",

lib/Doctrine/ORM/Cache/CollectionCacheKey.php

@@ -33,6 +33,7 @@ public function __construct(
         ksort($ownerIdentifier);
 
         $this->ownerIdentifier = $ownerIdentifier;
+
         parent::__construct(str_replace('\\', '.', strtolower($entityClass)) . '_' . implode(' ', $ownerIdentifier) . '__' . $association);
     }
 }

lib/Doctrine/ORM/Cache/EntityCacheKey.php

@@ -32,6 +32,7 @@ public function __construct(
         ksort($identifier);
 
         $this->identifier = $identifier;
+
         parent::__construct(str_replace('\\', '.', strtolower($entityClass) . '_' . implode(' ', $identifier)));
     }
 }

lib/Doctrine/ORM/Mapping/Driver/SimplifiedXmlDriver.php

@@ -19,6 +19,7 @@ class SimplifiedXmlDriver extends XmlDriver
     public function __construct($prefixes, $fileExtension = self::DEFAULT_FILE_EXTENSION)
     {
         $locator = new SymfonyFileLocator((array) $prefixes, $fileExtension);
+
         parent::__construct($locator, $fileExtension);
     }
 }

phpstan.neon

@@ -12,11 +12,6 @@ parameters:
             message: '~^Match expression does not handle remaining values:~'
             path: lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php
 
-        # https://github.com/phpstan/phpstan/issues/7292
-        -
-            message: '#^Offset class\-string on non\-empty\-array\<class\-string, array\<string, mixed\>\> in isset\(\) always exists and is not nullable\.$#'
-            path: lib/Doctrine/ORM/UnitOfWork.php
-
         # DBAL 4 compatibility
         -
             message: '~^Method Doctrine\\ORM\\Query\\AST\\Functions\\TrimFunction::getTrimMode\(\) never returns .* so it can be removed from the return type\.$~'

tests/Doctrine/Tests/Models/CMS/CmsAddress.php

@@ -17,7 +17,9 @@
 class CmsAddress
 {
     /** @var int */
-    #[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
     public $id;
 
     /** @var string */

tests/Doctrine/Tests/Models/Cache/City.php

@@ -9,25 +9,34 @@
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping\ClassMetadata;
 
-#[ORM\Entity, ORM\Table(name: 'cache_city'), ORM\Cache]
+#[ORM\Entity]
+#[ORM\Table(name: 'cache_city')]
+#[ORM\Cache]
 class City
 {
     /** @var int */
-    #[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
     protected $id;
 
     /** @var Collection<int, Travel> */
     #[ORM\ManyToMany(targetEntity: 'Travel', mappedBy: 'visitedCities')]
     public $travels;
 
     /** @psalm-var Collection<int, Attraction> */
-    #[ORM\Cache, ORM\OrderBy(['name' => 'ASC'])]
+    #[ORM\Cache]
+    #[ORM\OrderBy(['name' => 'ASC'])]
     #[ORM\OneToMany(targetEntity: 'Attraction', mappedBy: 'city')]
     public $attractions;
 
     public function __construct(
-        #[ORM\Column(unique: true)] protected string $name,
-        #[ORM\Cache] #[ORM\ManyToOne(targetEntity: 'State', inversedBy: 'cities')] #[ORM\JoinColumn(name: 'state_id', referencedColumnName: 'id')] protected State|null $state = null,
+        #[ORM\Column(unique: true)]
+        protected string $name,
+        #[ORM\Cache]
+        #[ORM\ManyToOne(targetEntity: 'State', inversedBy: 'cities')]
+        #[ORM\JoinColumn(name: 'state_id', referencedColumnName: 'id')]
+        protected State|null $state = null,
     ) {
         $this->travels     = new ArrayCollection();
         $this->attractions = new ArrayCollection();

tests/Doctrine/Tests/Models/Company/CompanyContract.php

@@ -16,14 +16,17 @@
 use Doctrine\ORM\Mapping\ManyToMany;
 use Doctrine\ORM\Mapping\ManyToOne;
 
-#[ORM\Entity, ORM\Table(name: 'company_contracts')]
+#[ORM\Entity]
+#[ORM\Table(name: 'company_contracts')]
 #[ORM\InheritanceType('SINGLE_TABLE')]
 #[ORM\DiscriminatorColumn(name: 'discr', type: 'string')]
 #[ORM\DiscriminatorMap(['fix' => 'CompanyFixContract', 'flexible' => 'CompanyFlexContract', 'flexultra' => 'CompanyFlexUltraContract'])]
 #[ORM\EntityListeners(['CompanyContractListener'])]
 abstract class CompanyContract
 {
-    #[ORM\Id, ORM\Column(type: 'integer'), ORM\GeneratedValue]
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
     private int $id;
 
     #[ManyToOne(targetEntity: 'CompanyEmployee', inversedBy: 'soldContracts')]

tests/Doctrine/Tests/Models/DDC1476/DDC1476EntityWithDefaultFieldType.php

@@ -11,7 +11,9 @@
 class DDC1476EntityWithDefaultFieldType
 {
     /** @var int */
-    #[ORM\Id, ORM\Column, ORM\GeneratedValue(strategy: 'NONE')]
+    #[ORM\Id]
+    #[ORM\Column]
+    #[ORM\GeneratedValue(strategy: 'NONE')]
     protected $id;
 
     /** @var string */

tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php

@@ -6,10 +6,13 @@
 
 use Doctrine\ORM\Mapping as ORM;
 
-#[ORM\Entity, ORM\Table(name: 'explicit_table', schema: 'explicit_schema')]
+#[ORM\Entity]
+#[ORM\Table(name: 'explicit_table', schema: 'explicit_schema')]
 class ExplicitSchemaAndTable
 {
     /** @var int */
-    #[ORM\Id, ORM\Column(type: 'integer'), ORM\GeneratedValue(strategy: 'AUTO')]
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
     public $id;
 }

tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php

@@ -10,10 +10,13 @@
  * Quoted column name to check that sequence names are
  * correctly handled
  */
-#[ORM\Entity, ORM\Table(name: 'implicit_schema.implicit_table')]
+#[ORM\Entity]
+#[ORM\Table(name: 'implicit_schema.implicit_table')]
 class SchemaAndTableInTableName
 {
     /** @var int */
-    #[ORM\Id, ORM\Column(type: 'integer'), ORM\GeneratedValue(strategy: 'AUTO')]
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
     public $id;
 }

tests/Doctrine/Tests/Models/DDC3579/DDC3579Group.php

@@ -15,7 +15,9 @@
 #[Entity]
 class DDC3579Group
 {
-    #[Id, GeneratedValue, Column(type: 'integer')]
+    #[Id]
+    #[GeneratedValue]
+    #[Column(type: 'integer')]
     #[GeneratedValue]
     private int $id;
 
@@ -24,7 +26,8 @@ class DDC3579Group
     private $admins;
 
     public function __construct(
-        #[Column] private string|null $name = null,
+        #[Column]
+        private string|null $name = null,
     ) {
         $this->admins = new ArrayCollection();
     }

tests/Doctrine/Tests/Models/DDC3579/DDC3579User.php

@@ -16,15 +16,18 @@
 class DDC3579User
 {
     /** @var int */
-    #[Id, GeneratedValue, Column(type: 'integer', name: 'user_id', length: 150)]
+    #[Id]
+    #[GeneratedValue]
+    #[Column(type: 'integer', name: 'user_id', length: 150)]
     protected $id;
 
     /** @var ArrayCollection */
     #[ManyToMany(targetEntity: DDC3579Group::class)]
     protected $groups;
 
     public function __construct(
-        #[Column(name: 'user_name', nullable: true, unique: false, length: 250)] protected string|null $name = null,
+        #[Column(name: 'user_name', nullable: true, unique: false, length: 250)]
+        protected string|null $name = null,
     ) {
         $this->groups = new ArrayCollection();
     }

tests/Doctrine/Tests/Models/DDC3597/DDC3597Image.php

@@ -20,6 +20,7 @@ class DDC3597Image extends DDC3597Media
     public function __construct(string $distributionHash)
     {
         parent::__construct($distributionHash);
+
         $this->dimension = new DDC3597Dimension();
     }
 

tests/Doctrine/Tests/Models/DDC5934/DDC5934BaseContract.php

@@ -17,7 +17,9 @@
 class DDC5934BaseContract
 {
     /** @var int */
-    #[Id, Column, GeneratedValue]
+    #[Id]
+    #[Column]
+    #[GeneratedValue]
     public $id;
 
     /** @psalm-var Collection<int, DDC5934Member> */

tests/Doctrine/Tests/Models/DDC869/DDC869Payment.php

@@ -11,7 +11,9 @@
 class DDC869Payment
 {
     /** @var int */
-    #[ORM\Id, ORM\Column(type: 'integer'), ORM\GeneratedValue]
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
     protected $id;
 
     /** @var float */

tests/Doctrine/Tests/Models/DDC964/DDC964User.php

@@ -21,7 +21,9 @@
 class DDC964User
 {
     /** @var int */
-    #[Id, GeneratedValue, Column(type: 'integer', name: 'user_id', length: 150)]
+    #[Id]
+    #[GeneratedValue]
+    #[Column(type: 'integer', name: 'user_id', length: 150)]
     protected $id;
 
     /** @psalm-var Collection<int, DDC964Group> */
@@ -37,7 +39,8 @@ class DDC964User
     protected $address;
 
     public function __construct(
-        #[Column(name: 'user_name', nullable: true, unique: false, length: 250)] protected string|null $name = null,
+        #[Column(name: 'user_name', nullable: true, unique: false, length: 250)]
+        protected string|null $name = null,
     ) {
         $this->groups = new ArrayCollection();
     }

tests/Doctrine/Tests/Models/Enums/Card.php

@@ -14,7 +14,9 @@
 class Card
 {
     /** @var int */
-    #[Id, GeneratedValue, Column(type: 'integer')]
+    #[Id]
+    #[GeneratedValue]
+    #[Column(type: 'integer')]
     public $id;
 
     /** @var Suit */

tests/Doctrine/Tests/Models/Enums/CardWithDefault.php

@@ -11,7 +11,8 @@
 #[Entity]
 class CardWithDefault
 {
-    #[Id, Column]
+    #[Id]
+    #[Column]
     public string $id;
 
     #[Column(options: ['default' => Suit::Hearts])]

tests/Doctrine/Tests/Models/Enums/CardWithNullable.php

@@ -14,7 +14,9 @@
 class CardWithNullable
 {
     /** @var int */
-    #[Id, GeneratedValue, Column(type: 'integer')]
+    #[Id]
+    #[GeneratedValue]
+    #[Column(type: 'integer')]
     public $id;
 
     /** @var ?Suit */

tests/Doctrine/Tests/Models/Enums/Product.php

@@ -13,7 +13,9 @@
 #[Entity]
 class Product
 {
-    #[Id, GeneratedValue, Column(type: 'integer')]
+    #[Id]
+    #[GeneratedValue]
+    #[Column(type: 'integer')]
     public int $id;
 
     #[Embedded(class: Quantity::class)]

tests/Doctrine/Tests/Models/Enums/Scale.php

@@ -14,7 +14,9 @@
 class Scale
 {
     /** @var int */
-    #[Id, GeneratedValue, Column(type: 'integer')]
+    #[Id]
+    #[GeneratedValue]
+    #[Column(type: 'integer')]
     public $id;
 
     /** @var Unit[] */

tests/Doctrine/Tests/Models/Enums/TypedCard.php

@@ -12,7 +12,9 @@
 #[Entity]
 class TypedCard
 {
-    #[Id, GeneratedValue, Column]
+    #[Id]
+    #[GeneratedValue]
+    #[Column]
     public int $id;
 
     #[Column]

tests/Doctrine/Tests/Models/Enums/TypedCardEnumCompositeId.php

@@ -11,9 +11,11 @@
 #[Entity]
 class TypedCardEnumCompositeId
 {
-    #[Id, Column(type: 'string', enumType: Suit::class)]
+    #[Id]
+    #[Column(type: 'string', enumType: Suit::class)]
     public Suit $suit;
 
-    #[Id, Column(type: 'string', enumType: Unit::class)]
+    #[Id]
+    #[Column(type: 'string', enumType: Unit::class)]
     public Unit $unit;
 }

tests/Doctrine/Tests/Models/Enums/TypedCardEnumId.php

@@ -11,6 +11,7 @@
 #[Entity]
 class TypedCardEnumId
 {
-    #[Id, Column(type: 'string', enumType: Suit::class)]
+    #[Id]
+    #[Column(type: 'string', enumType: Suit::class)]
     public Suit $suit;
 }

tests/Doctrine/Tests/Models/GH10132/Complex.php

@@ -15,7 +15,8 @@
 #[Entity]
 class Complex
 {
-    #[Id, Column(type: 'string', enumType: Suit::class)]
+    #[Id]
+    #[Column(type: 'string', enumType: Suit::class)]
     protected Suit $type;
 
     #[OneToMany(targetEntity: ComplexChild::class, mappedBy: 'complex', cascade: ['persist'])]

tests/Doctrine/Tests/Models/GH10132/ComplexChild.php

@@ -18,7 +18,8 @@ class ComplexChild
     #[JoinColumn(name: 'complexType', referencedColumnName: 'type', nullable: false)]
     protected Complex $complex;
 
-    #[Id, Column(type: 'string', enumType: Suit::class)]
+    #[Id]
+    #[Column(type: 'string', enumType: Suit::class)]
     protected Suit $complexType;
 
     public function setComplex(Complex $complex): void

tests/Doctrine/Tests/Models/ReadonlyProperties/Author.php

@@ -10,10 +10,13 @@
 use Doctrine\ORM\Mapping\Id;
 use Doctrine\ORM\Mapping\Table;
 
-#[Entity, Table(name: 'author')]
+#[Entity]
+#[Table(name: 'author')]
 class Author
 {
-    #[Column, Id, GeneratedValue(strategy: 'IDENTITY')]
+    #[Column]
+    #[Id]
+    #[GeneratedValue(strategy: 'IDENTITY')]
     private readonly int $id;
 
     #[Column]