Bump coding standard to v11 (#10295)

composer.json

@@ -40,7 +40,7 @@
     },
     "require-dev": {
         "doctrine/annotations": "^1.13",
-        "doctrine/coding-standard": "^9.0.2 || ^10.0",
+        "doctrine/coding-standard": "^9.0.2 || ^11.0",
         "phpbench/phpbench": "^0.16.10 || ^1.0",
         "phpstan/phpstan": "~1.4.10 || 1.9.3",
         "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",

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);
     }
 }

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

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

lib/Doctrine/ORM/OptimisticLockException.php

@@ -23,6 +23,7 @@ class OptimisticLockException extends ORMException
     public function __construct($msg, $entity)
     {
         parent::__construct($msg);
+
         $this->entity = $entity;
     }
 

lib/Doctrine/ORM/Proxy/ProxyFactory.php

@@ -56,6 +56,7 @@ public function __construct(EntityManagerInterface $em, $proxyDir, $proxyNs, $au
         $proxyGenerator = new ProxyGenerator($proxyDir, $proxyNs);
 
         $proxyGenerator->setPlaceholder('baseProxyInterface', Proxy::class);
+
         parent::__construct($proxyGenerator, $em->getMetadataFactory(), $autoGenerate);
 
         $this->em                  = $em;

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

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

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

@@ -25,7 +25,9 @@
  * @Entity
  * @Table("cache_city")
  */
-#[ORM\Entity, ORM\Table(name: 'cache_city'), ORM\Cache]
+#[ORM\Entity]
+#[ORM\Table(name: 'cache_city')]
+#[ORM\Cache]
 class City
 {
     /**
@@ -34,7 +36,9 @@ class City
      * @GeneratedValue
      * @Column(type="integer")
      */
-    #[ORM\Id, ORM\GeneratedValue, ORM\Column(type: 'integer')]
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: 'integer')]
     protected $id;
 
     /**
@@ -68,7 +72,8 @@ class City
      * @OrderBy({"name" = "ASC"})
      * @OneToMany(targetEntity="Attraction", mappedBy="city")
      */
-    #[ORM\Cache, ORM\OrderBy(['name' => 'ASC'])]
+    #[ORM\Cache]
+    #[ORM\OrderBy(['name' => 'ASC'])]
     #[ORM\OneToMany(targetEntity: 'Attraction', mappedBy: 'city')]
     public $attractions;
 

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

@@ -81,7 +81,8 @@
  *      ),
  * })
  */
-#[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'])]
@@ -94,7 +95,9 @@ abstract class CompanyContract
      * @Column(type="integer")
      * @GeneratedValue
      */
-    #[ORM\Id, ORM\Column(type: 'integer'), ORM\GeneratedValue]
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
     private $id;
 
     /**

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

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

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

@@ -15,7 +15,8 @@
  * @Entity
  * @Table(name="explicit_table", schema="explicit_schema")
  */
-#[ORM\Entity, ORM\Table(name: 'explicit_table', schema: 'explicit_schema')]
+#[ORM\Entity]
+#[ORM\Table(name: 'explicit_table', schema: 'explicit_schema')]
 class ExplicitSchemaAndTable
 {
     /**
@@ -24,6 +25,8 @@ class ExplicitSchemaAndTable
      * @Column(type="integer")
      * @GeneratedValue(strategy="AUTO")
      */
-    #[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

@@ -18,7 +18,8 @@
  * @Entity
  * @Table(name="implicit_schema.implicit_table")
  */
-#[ORM\Entity, ORM\Table(name: 'implicit_schema.implicit_table')]
+#[ORM\Entity]
+#[ORM\Table(name: 'implicit_schema.implicit_table')]
 class SchemaAndTableInTableName
 {
     /**
@@ -27,6 +28,8 @@ class SchemaAndTableInTableName
      * @Column(type="integer")
      * @GeneratedValue(strategy="AUTO")
      */
-    #[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

@@ -22,7 +22,9 @@ class DDC3579Group
      * @Id
      * @Column(type="integer")
      */
-    #[Id, GeneratedValue, Column(type: 'integer')]
+    #[Id]
+    #[GeneratedValue]
+    #[Column(type: 'integer')]
     private $id;
 
     /**

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

@@ -22,7 +22,9 @@ class DDC3579User
      * @GeneratedValue
      * @Column(type="integer", name="user_id", length=150)
      */
-    #[Id, GeneratedValue, Column(type: 'integer', name: 'user_id', length: 150)]
+    #[Id]
+    #[GeneratedValue]
+    #[Column(type: 'integer', name: 'user_id', length: 150)]
     protected $id;
 
     /**

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

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

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

@@ -23,7 +23,9 @@ class DDC5934BaseContract
      * @Column(name="id", type="integer")
      * @GeneratedValue()
      */
-    #[Id, Column, GeneratedValue]
+    #[Id]
+    #[Column]
+    #[GeneratedValue]
     public $id;
 
     /**

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

@@ -21,7 +21,9 @@ class DDC869Payment
      * @Column(type="integer")
      * @GeneratedValue
      */
-    #[ORM\Id, ORM\Column(type: 'integer'), ORM\GeneratedValue]
+    #[ORM\Id]
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue]
     protected $id;
 
     /**

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

@@ -27,7 +27,9 @@ class DDC964User
      * @GeneratedValue
      * @Column(type="integer", name="user_id", length=150)
      */
-    #[Id, GeneratedValue, Column(type: 'integer', name: 'user_id', length: 150)]
+    #[Id]
+    #[GeneratedValue]
+    #[Column(type: 'integer', name: 'user_id', length: 150)]
     protected $id;
 
     /**

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

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

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

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

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

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

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

@@ -17,13 +17,15 @@ class TypedCardEnumCompositeId
      * @ORM\Id()
      * @ORM\Column(type="string", enumType=Suit::class)
      */
-    #[Id, Column(type: 'string', enumType: Suit::class)]
+    #[Id]
+    #[Column(type: 'string', enumType: Suit::class)]
     public Suit $suit;
 
     /**
      * @ORM\Id()
      * @ORM\Column(type="string", enumType=Unit::class)
      */
-    #[Id, Column(type: 'string', enumType: Unit::class)]
+    #[Id]
+    #[Column(type: 'string', enumType: Unit::class)]
     public Unit $unit;
 }

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

@@ -17,6 +17,7 @@ class TypedCardEnumId
      * @ORM\Id()
      * @ORM\Column(type="string", enumType=Suit::class)
      */
-    #[Id, Column(type: 'string', enumType: Suit::class)]
+    #[Id]
+    #[Column(type: 'string', enumType: Suit::class)]
     public Suit $suit;
 }

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]

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

@@ -14,16 +14,20 @@
 use Doctrine\ORM\Mapping\ManyToMany;
 use Doctrine\ORM\Mapping\Table;
 
-#[Entity, Table(name: 'book')]
+#[Entity]
+#[Table(name: 'book')]
 class Book
 {
-    #[Column, Id, GeneratedValue(strategy: 'IDENTITY')]
+    #[Column]
+    #[Id]
+    #[GeneratedValue(strategy: 'IDENTITY')]
     private readonly int $id;
 
     #[Column]
     private readonly string $title;
 
-    #[ManyToMany(targetEntity: Author::class), JoinTable(name: 'book_author')]
+    #[ManyToMany(targetEntity: Author::class)]
+    #[JoinTable(name: 'book_author')]
     private readonly Collection $authors;
 
     public function __construct()

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

@@ -12,16 +12,20 @@
 use Doctrine\ORM\Mapping\ManyToOne;
 use Doctrine\ORM\Mapping\Table;
 
-#[Entity, Table(name: 'simple_book')]
+#[Entity]
+#[Table(name: 'simple_book')]
 class SimpleBook
 {
-    #[Column, Id, GeneratedValue(strategy: 'IDENTITY')]
+    #[Column]
+    #[Id]
+    #[GeneratedValue(strategy: 'IDENTITY')]
     private readonly int $id;
 
     #[Column]
     private readonly string $title;
 
-    #[ManyToOne, JoinColumn(nullable: false)]
+    #[ManyToOne]
+    #[JoinColumn(nullable: false)]
     private readonly Author $author;
 
     public function getId(): int