Merge pull request #8504 from greg0ire/cs-20210223

CS batch 18/an estimated 26
doctrine · Feb 23, 2021 · 89f57de · 89f57de
2 parents ae19f40 + 2dce5b2
commit 89f57de
Show file tree

Hide file tree

Showing 56 changed files with 331 additions and 185 deletions.
diff --git a/tests/Doctrine/Tests/Models/Company/CompanyEmployee.php b/tests/Doctrine/Tests/Models/Company/CompanyEmployee.php
@@ -24,7 +24,10 @@ class CompanyEmployee extends CompanyPerson
      */
     private $department;
 
-    /** @Column(type="datetime", nullable=true) */
+    /**
+     * @var DateTime|null
+     * @Column(type="datetime", nullable=true)
+     */
     private $startDate;
 
     /**

diff --git a/tests/Doctrine/Tests/Models/DDC1590/DDC1590Entity.php b/tests/Doctrine/Tests/Models/DDC1590/DDC1590Entity.php
@@ -20,7 +20,10 @@ abstract class DDC1590Entity
      */
     protected $id;
 
-    /** @Column(type="datetime") */
+    /**
+     * @var DateTime
+     * @Column(type="datetime")
+     */
     protected $created_at;
 
     /**

diff --git a/tests/Doctrine/Tests/Models/GH7141/GH7141Article.php b/tests/Doctrine/Tests/Models/GH7141/GH7141Article.php
@@ -5,9 +5,11 @@
 namespace Doctrine\Tests\Models\GH7141;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 
 class GH7141Article
 {
+    /** @psalm-var Collection<int, mixed> */
     private $tags;
 
     public function __construct()

diff --git a/tests/Doctrine/Tests/Models/GH7316/GH7316Article.php b/tests/Doctrine/Tests/Models/GH7316/GH7316Article.php
@@ -5,9 +5,11 @@
 namespace Doctrine\Tests\Models\GH7316;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 
 class GH7316Article
 {
+    /** @psalm-var Collection<int, mixed> */
     private $tags;
 
     public function __construct()

diff --git a/tests/Doctrine/Tests/Models/Generic/BooleanModel.php b/tests/Doctrine/Tests/Models/Generic/BooleanModel.php
@@ -16,6 +16,10 @@ class BooleanModel
      * @GeneratedValue(strategy="AUTO")
      */
     public $id;
-    /** @Column(type="boolean") */
+
+    /**
+     * @var bool
+     * @Column(type="boolean")
+     */
     public $booleanField;
 }
diff --git a/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php b/tests/Doctrine/Tests/Models/Generic/DateTimeModel.php
@@ -16,10 +16,22 @@ class DateTimeModel
      * @GeneratedValue
      */
     public $id;
-    /** @Column(name="col_datetime", type="datetime", nullable=true) */
+
+    /**
+     * @var DateTime|null
+     * @Column(name="col_datetime", type="datetime", nullable=true)
+     */
     public $datetime;
-    /** @Column(name="col_date", type="date", nullable=true) */
+
+    /**
+     * @var DateTime|null
+     * @Column(name="col_date", type="date", nullable=true)
+     */
     public $date;
-    /** @Column(name="col_time", type="time", nullable=true) */
+
+    /**
+     * @var DateTime|null
+     * @Column(name="col_time", type="time", nullable=true)
+     */
     public $time;
 }
diff --git a/tests/Doctrine/Tests/Models/Generic/DecimalModel.php b/tests/Doctrine/Tests/Models/Generic/DecimalModel.php
@@ -16,9 +16,16 @@ class DecimalModel
      * @GeneratedValue(strategy="AUTO")
      */
     public $id;
-    /** @Column(name="`decimal`", type="decimal", scale=2, precision=5) */
+
+    /**
+     * @var float
+     * @Column(name="`decimal`", type="decimal", scale=2, precision=5)
+     */
     public $decimal;
 
-    /** @Column(name="`high_scale`", type="decimal", scale=4, precision=14) */
+    /**
+     * @var float
+     * @Column(name="`high_scale`", type="decimal", scale=4, precision=14)
+     */
     public $highScale;
 }
diff --git a/tests/Doctrine/Tests/Models/Generic/SerializationModel.php b/tests/Doctrine/Tests/Models/Generic/SerializationModel.php
@@ -16,9 +16,16 @@ class SerializationModel
      * @GeneratedValue(strategy="AUTO")
      */
     public $id;
-    /** @Column(name="the_array", type="array", nullable=true) */
+
+    /**
+     * @var mixed[]
+     * @Column(name="the_array", type="array", nullable=true)
+     */
     public $array;
 
-    /** @Column(name="the_obj", type="object", nullable=true) */
+    /**
+     * @var object
+     * @Column(name="the_obj", type="object", nullable=true)
+     */
     public $object;
 }
diff --git a/tests/Doctrine/Tests/Models/GeoNames/Admin1.php b/tests/Doctrine/Tests/Models/GeoNames/Admin1.php
@@ -20,6 +20,7 @@ class Admin1
     public $id;
 
     /**
+     * @var Country
      * @Id
      * @ManyToOne(targetEntity="Country")
      * @JoinColumn(name="country", referencedColumnName="id")
@@ -28,6 +29,7 @@ class Admin1
     public $country;
 
     /**
+     * @psalm-var Collection<int, Admin1AlternateName>
      * @OneToMany(targetEntity="Admin1AlternateName", mappedBy="admin1")
      * @Cache
      */
@@ -39,7 +41,7 @@ class Admin1
      */
     public $name;
 
-    public function __construct($id, $name, Country $country)
+    public function __construct(int $id, string $name, Country $country)
     {
         $this->id      = $id;
         $this->name    = $name;

diff --git a/tests/Doctrine/Tests/Models/GeoNames/Admin1AlternateName.php b/tests/Doctrine/Tests/Models/GeoNames/Admin1AlternateName.php
@@ -12,14 +12,15 @@
 class Admin1AlternateName
 {
     /**
-     * @var string
+     * @var int
      * @Id
      * @Column(type="string", length=25)
      * @GeneratedValue(strategy="NONE")
      */
     public $id;
 
     /**
+     * @var Admin1
      * @ManyToOne(targetEntity="Admin1", inversedBy="names")
      * @JoinColumns({
      *    @JoinColumn(name="admin1", referencedColumnName="id"),
@@ -35,7 +36,7 @@ class Admin1AlternateName
      */
     public $name;
 
-    public function __construct($id, $name, Admin1 $admin1)
+    public function __construct(int $id, string $name, Admin1 $admin1)
     {
         $this->id     = $id;
         $this->name   = $name;

diff --git a/tests/Doctrine/Tests/Models/GeoNames/City.php b/tests/Doctrine/Tests/Models/GeoNames/City.php
@@ -20,13 +20,15 @@ class City
     public $id;
 
     /**
+     * @var Country
      * @ManyToOne(targetEntity="Country")
      * @JoinColumn(name="country", referencedColumnName="id")
      * @Cache
      */
     public $country;
 
     /**
+     * @var Admin1
      * @ManyToOne(targetEntity="Admin1")
      * @JoinColumns({
      *   @JoinColumn(name="admin1", referencedColumnName="id"),
@@ -42,7 +44,7 @@ class City
      */
     public $name;
 
-    public function __construct($id, $name)
+    public function __construct(int $id, string $name)
     {
         $this->id   = $id;
         $this->name = $name;

diff --git a/tests/Doctrine/Tests/Models/Global/GlobalNamespaceModel.php b/tests/Doctrine/Tests/Models/Global/GlobalNamespaceModel.php
@@ -2,11 +2,13 @@
 
 declare(strict_types=1);
 
+use Doctrine\Common\Collections\Collection;
+
 /**
  * @Entity
  * @Table(name="articles")
  */
-class DoctrineGlobal_Article
+class DoctrineGlobalArticle
 {
     /**
      * @var int
@@ -21,11 +23,15 @@ class DoctrineGlobal_Article
      */
     protected $headline;
 
-    /** @column(type="text") */
+    /**
+     * @var string
+     * @Column(type="text")
+     */
     protected $text;
 
     /**
-     * @ManyToMany(targetEntity="DoctrineGlobal_User")
+     * @psalm-var Collection<int, DoctrineGlobalUser>
+     * @ManyToMany(targetEntity="DoctrineGlobalUser")
      * @JoinTable(name="author_articles",
      *      joinColumns={@JoinColumn(name="article_id", referencedColumnName="id")},
      *      inverseJoinColumns={@JoinColumn(name="author_id", referencedColumnName="id", unique=true)}
@@ -34,7 +40,8 @@ class DoctrineGlobal_Article
     protected $author;
 
     /**
-     * @ManyToMany(targetEntity="DoctrineGlobal_User")
+     * @psalm-var Collection<int, DoctrineGlobalUser>
+     * @ManyToMany(targetEntity="DoctrineGlobalUser")
      * @JoinTable(name="editor_articles",
      *      joinColumns={@JoinColumn(name="article_id", referencedColumnName="id")},
      *      inverseJoinColumns={@JoinColumn(name="editor_id", referencedColumnName="id", unique=true)}
@@ -47,7 +54,7 @@ class DoctrineGlobal_Article
  * @Entity
  * @Table(name="users")
  */
-class DoctrineGlobal_User
+class DoctrineGlobalUser
 {
     /**
      * @Id

diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php b/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php
@@ -32,7 +32,7 @@ class LegacyArticle
 
     /**
      * @var LegacyUser
-     * @ManyToOne(targetEntity="LegacyUser", inversedBy="_articles")
+     * @ManyToOne(targetEntity="LegacyUser", inversedBy="articles")
      * @JoinColumn(name="iUserId", referencedColumnName="iUserId")
      */
     public $user;

diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php
@@ -18,32 +18,35 @@ class LegacyCar
      * @GeneratedValue
      * @Column(name="iCarId", type="integer", nullable=false)
      */
-    public $_id;
+    public $id;
 
     /**
      * @psalm-var Collection<int, LegacyUser>
-     * @ManyToMany(targetEntity="LegacyUser", mappedBy="_cars")
+     * @ManyToMany(targetEntity="LegacyUser", mappedBy="cars")
      */
-    public $_users;
+    public $users;
 
     /**
      * @var string
      * @Column(name="sDescription", type="string", length=255, unique=true)
      */
-    public $_description;
+    public $description;
 
-    public function getDescription()
+    public function getDescription(): string
     {
-        return $this->_description;
+        return $this->description;
     }
 
     public function addUser(LegacyUser $user): void
     {
-        $this->_users[] = $user;
+        $this->users[] = $user;
     }
 
-    public function getUsers()
+    /**
+     * @psalm-return Collection<int, LegacyUser>
+     */
+    public function getUsers(): Collection
     {
-        return $this->_users;
+        return $this->users;
     }
 }