Manually fix CS

bosske1 · Feb 5, 2021 · 7ed487b · 7ed487b
1 parent 40f3925
commit 7ed487b
Show file tree

Hide file tree

Showing 20 changed files with 194 additions and 83 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php b/lib/Doctrine/ORM/Mapping/DefaultEntityListenerResolver.php
@@ -33,10 +33,7 @@
  */
 class DefaultEntityListenerResolver implements EntityListenerResolver
 {
-    /**
-     * @var array Map to store entity listener instances.
-     * @psalm-var array<class-string, object>
-     */
+    /** @psalm-var array<class-string, object> Map to store entity listener instances. */
     private $instances = [];
 
     /**
@@ -50,7 +47,8 @@ public function clear($className = null)
             return;
         }
 
-        if (isset($this->instances[$className = trim($className, '\\')])) {
+        $className = trim($className, '\\');
+        if (isset($this->instances[$className])) {
             unset($this->instances[$className]);
         }
     }
@@ -72,7 +70,8 @@ public function register($object)
      */
     public function resolve($className)
     {
-        if (isset($this->instances[$className = trim($className, '\\')])) {
+        $className = trim($className, '\\');
+        if (isset($this->instances[$className])) {
             return $this->instances[$className];
         }
 

diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php
@@ -22,6 +22,7 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\ORM\Events;
+use Doctrine\ORM\Id\TableGenerator;
 use Doctrine\ORM\Mapping;
 use Doctrine\ORM\Mapping\Builder\EntityListenerBuilder;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
@@ -354,7 +355,7 @@ public function loadMetadataForClass($className, ClassMetadata $metadata)
                             'initialValue' => $seqGeneratorAnnot->initialValue,
                         ]
                     );
-                } elseif ($this->reader->getPropertyAnnotation($property, 'Doctrine\ORM\Id\TableGenerator')) {
+                } elseif ($this->reader->getPropertyAnnotation($property, TableGenerator::class)) {
                     throw MappingException::tableIdGeneratorNotImplemented($className);
                 } else {
                     $customGeneratorAnnot = $this->reader->getPropertyAnnotation($property, Mapping\CustomIdGenerator::class);

diff --git a/tests/Doctrine/Tests/Models/DDC117/DDC117Article.php b/tests/Doctrine/Tests/Models/DDC117/DDC117Article.php
@@ -5,58 +5,77 @@
 namespace Doctrine\Tests\Models\DDC117;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 
 /**
  * @Entity
  */
 class DDC117Article
 {
-    /** @Id @Column(type="integer", name="article_id") @GeneratedValue */
+    /**
+     * @var int
+     * @Id @Column(type="integer", name="article_id") @GeneratedValue
+     */
     private $id;
 
-    /** @Column */
+    /**
+     * @var string
+     * @Column
+     */
     private $title;
 
-    /** @OneToMany(targetEntity="DDC117Reference", mappedBy="source", cascade={"remove"}) */
+    /**
+     * @psalm-var ArrayCollection<int, DDC117Reference>
+     * @OneToMany(targetEntity="DDC117Reference", mappedBy="source", cascade={"remove"})
+     */
     private $references;
 
-    /** @OneToOne(targetEntity="DDC117ArticleDetails", mappedBy="article", cascade={"persist", "remove"}) */
+    /**
+     * @var DDC117ArticleDetails
+     * @OneToOne(targetEntity="DDC117ArticleDetails", mappedBy="article", cascade={"persist", "remove"})
+     */
     private $details;
 
-    /** @OneToMany(targetEntity="DDC117Translation", mappedBy="article", cascade={"persist", "remove"}) */
+    /**
+     * @psalm-var ArrayCollection<int, DDC117Translation>
+     * @OneToMany(targetEntity="DDC117Translation", mappedBy="article", cascade={"persist", "remove"})
+     */
     private $translations;
 
-    /** @OneToMany(targetEntity="DDC117Link", mappedBy="source", indexBy="target_id", cascade={"persist", "remove"}) */
+    /**
+     * @var Collection<int, DDC117Translation>
+     * @OneToMany(targetEntity="DDC117Link", mappedBy="source", indexBy="target_id", cascade={"persist", "remove"})
+     */
     private $links;
 
-    public function __construct($title)
+    public function __construct(string $title)
     {
         $this->title        = $title;
         $this->references   = new ArrayCollection();
         $this->translations = new ArrayCollection();
     }
 
-    public function setDetails($details): void
+    public function setDetails(DDC117ArticleDetails $details): void
     {
         $this->details = $details;
     }
 
-    public function id()
+    public function id(): int
     {
         return $this->id;
     }
 
-    public function addReference($reference): void
+    public function addReference(DDC117Reference $reference): void
     {
         $this->references[] = $reference;
     }
 
-    public function references()
+    public function references(): Collection
     {
         return $this->references;
     }
 
-    public function addTranslation($language, $title): void
+    public function addTranslation(string $language, string $title): void
     {
         $this->translations[] = new DDC117Translation($this, $language, $title);
     }

diff --git a/tests/Doctrine/Tests/Models/DDC117/DDC117ArticleDetails.php b/tests/Doctrine/Tests/Models/DDC117/DDC117ArticleDetails.php
@@ -10,29 +10,33 @@
 class DDC117ArticleDetails
 {
     /**
+     * @var DDC117Article
      * @Id
      * @OneToOne(targetEntity="DDC117Article", inversedBy="details")
      * @JoinColumn(name="article_id", referencedColumnName="article_id")
      */
     private $article;
 
-    /** @Column(type="text") */
+    /**
+     * @var string
+     * @Column(type="text")
+     */
     private $text;
 
-    public function __construct($article, $text)
+    public function __construct(DDC117Article $article, string $text)
     {
         $this->article = $article;
         $article->setDetails($this);
 
         $this->update($text);
     }
 
-    public function update($text): void
+    public function update(string $text): void
     {
         $this->text = $text;
     }
 
-    public function getText()
+    public function getText(): string
     {
         return $this->text;
     }

diff --git a/tests/Doctrine/Tests/Models/DDC117/DDC117Translation.php b/tests/Doctrine/Tests/Models/DDC117/DDC117Translation.php
@@ -5,32 +5,46 @@
 namespace Doctrine\Tests\Models\DDC117;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 
 /**
  * @Entity
  */
 class DDC117Translation
 {
     /**
+     * @var DDC117Article
      * @Id
      * @ManyToOne(targetEntity="DDC117Article", inversedBy="translations")
      * @JoinColumn(name="article_id", referencedColumnName="article_id")
      */
     private $article;
 
-    /** @Id @column(type="string") */
+    /**
+     * @var string
+     * @Id @column(type="string")
+     */
     private $language;
 
-    /** @column(type="string") */
+    /**
+     * @var string
+     * @column(type="string")
+     */
     private $title;
 
-    /** @ManyToMany(targetEntity="DDC117Editor", mappedBy="reviewingTranslations") */
+    /**
+     * @var Collection<int, DDC117Editor>
+     * @ManyToMany(targetEntity="DDC117Editor", mappedBy="reviewingTranslations")
+     */
     public $reviewedByEditors;
 
-    /** @OneToMany(targetEntity="DDC117Editor", mappedBy="lastTranslation") */
+    /**
+     * @var Collection<int, DDC117Editor>
+     * @OneToMany(targetEntity="DDC117Editor", mappedBy="lastTranslation")
+     */
     public $lastTranslatedBy;
 
-    public function __construct($article, $language, $title)
+    public function __construct(DDC117Article $article, string $language, string $title)
     {
         $this->article           = $article;
         $this->language          = $language;
@@ -39,22 +53,22 @@ public function __construct($article, $language, $title)
         $this->lastTranslatedBy  = new ArrayCollection();
     }
 
-    public function getArticleId()
+    public function getArticleId(): int
     {
         return $this->article->id();
     }
 
-    public function getLanguage()
+    public function getLanguage(): string
     {
         return $this->language;
     }
 
-    public function getLastTranslatedBy()
+    public function getLastTranslatedBy(): Collection
     {
         return $this->lastTranslatedBy;
     }
 
-    public function getReviewedByEditors()
+    public function getReviewedByEditors(): Collection
     {
         return $this->reviewedByEditors;
     }

diff --git a/tests/Doctrine/Tests/Models/DDC1476/DDC1476EntityWithDefaultFieldType.php b/tests/Doctrine/Tests/Models/DDC1476/DDC1476EntityWithDefaultFieldType.php
@@ -12,13 +12,17 @@
 class DDC1476EntityWithDefaultFieldType
 {
     /**
+     * @var int
      * @Id
      * @Column()
      * @GeneratedValue("NONE")
      */
     protected $id;
 
-    /** @column() */
+    /**
+     * @var string
+     * @column()
+     */
     protected $name;
 
     public function getId(): int

diff --git a/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php b/tests/Doctrine/Tests/Models/DDC3346/DDC3346Author.php
@@ -4,21 +4,30 @@
 
 namespace Doctrine\Tests\Models\DDC3346;
 
+use Doctrine\Common\Collections\Collection;
+
 /**
  * @Entity
  * @Table(name="ddc3346_users")
  */
 class DDC3346Author
 {
     /**
+     * @var int
      * @Id @Column(type="integer")
      * @GeneratedValue
      */
     public $id;
 
-    /** @Column(type="string", length=255, unique=true) */
+    /**
+     * @var string
+     * @Column(type="string", length=255, unique=true)
+     */
     public $username;
 
-    /** @OneToMany(targetEntity="DDC3346Article", mappedBy="user", fetch="EAGER", cascade={"detach"}) */
+    /**
+     * @var Collection<int, DDC3346Article>
+     * @OneToMany(targetEntity="DDC3346Article", mappedBy="user", fetch="EAGER", cascade={"detach"})
+     */
     public $articles = [];
 }
diff --git a/tests/Doctrine/Tests/Models/DDC889/DDC889SuperClass.php b/tests/Doctrine/Tests/Models/DDC889/DDC889SuperClass.php
@@ -11,7 +11,10 @@
  */
 class DDC889SuperClass
 {
-    /** @Column() */
+    /**
+     * @var string
+     * @Column()
+     */
     protected $name;
 
     public static function loadMetadata(ClassMetadataInfo $metadata): void

diff --git a/tests/Doctrine/Tests/Models/Forum/ForumUser.php b/tests/Doctrine/Tests/Models/Forum/ForumUser.php
@@ -11,29 +11,36 @@
 class ForumUser
 {
     /**
+     * @var int
      * @Column(type="integer")
      * @Id @GeneratedValue
      */
     public $id;
-    /** @Column(type="string", length=50) */
+
+    /**
+     * @var string
+     * @Column(type="string", length=50)
+     */
     public $username;
+
     /**
+     * @var ForumAvatar
      * @OneToOne(targetEntity="ForumAvatar", cascade={"persist"})
      * @JoinColumn(name="avatar_id", referencedColumnName="id")
      */
     public $avatar;
 
-    public function getId()
+    public function getId(): int
     {
         return $this->id;
     }
 
-    public function getUsername()
+    public function getUsername(): string
     {
         return $this->username;
     }
 
-    public function getAvatar()
+    public function getAvatar(): ForumAvatar
     {
         return $this->avatar;
     }