Merge pull request #637 from TomHAnderson/hotfix/tests-phpcs

Hotfix/tests phpcs
laravel-doctrine · Oct 28, 2024 · a62a443 · a62a443
2 parents de450e5 + 806b106
commit a62a443
Show file tree

Hide file tree

Showing 33 changed files with 147 additions and 75 deletions.
diff --git a/tests/Assets/AnotherListenerStub.php b/tests/Assets/AnotherListenerStub.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets;
 
 class AnotherListenerStub

diff --git a/tests/Assets/Auth/AuthenticableMock.php b/tests/Assets/Auth/AuthenticableMock.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Auth;
 
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;

diff --git a/tests/Assets/Auth/AuthenticableWithNonEmptyConstructorMock.php b/tests/Assets/Auth/AuthenticableWithNonEmptyConstructorMock.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Auth;
 
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
@@ -9,6 +11,7 @@ class AuthenticableWithNonEmptyConstructorMock implements AuthenticatableContrac
 {
     use Authenticatable;
 
+    /** @param string[] $passwords */
     public function __construct(array $passwords)
     {
         $this->password = $passwords[0];

diff --git a/tests/Assets/Auth/Passwords/UserMock.php b/tests/Assets/Auth/Passwords/UserMock.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Auth\Passwords;
 
 use Illuminate\Contracts\Auth\CanResetPassword;
@@ -8,20 +10,18 @@ class UserMock implements CanResetPassword
 {
     /**
      * Get the e-mail address where password reset links are sent.
-     * @return string
      */
-    public function getEmailForPasswordReset()
+    public function getEmailForPasswordReset(): string
     {
         return '[email protected]';
     }
 
     /**
      * Send the password reset notification.
-     *
-     * @param  string $token
-     * @return void
      */
-    public function sendPasswordResetNotification($token)
+    // phpcs:disable
+    public function sendPasswordResetNotification($token): void
     {
     }
+    // phpcs:enable
 }
diff --git a/tests/Assets/Configuration/TypeMock.php b/tests/Assets/Configuration/TypeMock.php
@@ -1,18 +1,21 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Configuration;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
 
 class TypeMock extends Type
 {
+    /** @param string[] $column */
     public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
         return '';
     }
 
-    public function getName()
+    public function getName(): void
     {
     }
 }
diff --git a/tests/Assets/Configuration/TypeMock2.php b/tests/Assets/Configuration/TypeMock2.php
@@ -1,18 +1,21 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Configuration;
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
 
 class TypeMock2 extends Type
 {
+    /** @param string[] $column */
     public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
         return '';
     }
 
-    public function getName()
+    public function getName(): void
     {
     }
 }
diff --git a/tests/Assets/Decorator.php b/tests/Assets/Decorator.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets;
 
 use Doctrine\ORM\Decorator\EntityManagerDecorator;

diff --git a/tests/Assets/Entity/Foo.php b/tests/Assets/Entity/Foo.php
@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Entity;
 
 class Foo
 {
-    private $id;
+    private int $id;
 
-    private $name;
+    private string $name;
 }
diff --git a/tests/Assets/Entity/Scientist.php b/tests/Assets/Entity/Scientist.php
@@ -1,23 +1,28 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Entity;
 
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Theory;
 
-#[ORM\Entity(repositoryClass: "LaravelDoctrineTest\ORM\Assets\Repository\ScientistRepository")]
+#[ORM\Entity(repositoryClass: 'LaravelDoctrineTest\ORM\Assets\Repository\ScientistRepository')]
 class Scientist
 {
     #[ORM\Id]
-    #[ORM\Column(type: "integer")]
-    #[ORM\GeneratedValue(strategy: "AUTO")]
-    private $id;
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private int $id;
 
-    #[ORM\Column(type: "string", nullable: true)]
-    private $firstName;
+    #[ORM\Column(type: 'string', nullable: true)]
+    private string $firstName;
 
-    #[ORM\Column(type: "string", nullable: false)]
-    private $lastName;
+    #[ORM\Column(type: 'string', nullable: false)]
+    private string $lastName;
 
-    #[ORM\OneToMany(targetEntity: \Theory::class, mappedBy: "scientist")]
-    private $theories;
+    /** @var Collection|Theory[] */
+    #[ORM\OneToMany(targetEntity: Theory::class, mappedBy: 'scientist')]
+    private Collection $theories;
 }
diff --git a/tests/Assets/Entity/Theory.php b/tests/Assets/Entity/Theory.php
@@ -1,21 +1,24 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Scientist;
 
-#[ORM\Entity(repositoryClass: "LaravelDoctrineTest\ORM\Assets\Repository\TheoryRepository")]
+#[ORM\Entity(repositoryClass: 'LaravelDoctrineTest\ORM\Assets\Repository\TheoryRepository')]
 class Theory
 {
     #[ORM\Id]
-    #[ORM\Column(type: "integer")]
-    #[ORM\GeneratedValue(strategy: "AUTO")]
-    private $id;
+    #[ORM\Column(type: 'integer')]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private int $id;
 
-    #[ORM\Column(type: "string", nullable: false)]
-    private $title;
+    #[ORM\Column(type: 'string', nullable: false)]
+    private string $title;
 
-    #[ORM\ManyToOne(targetEntity: \Scientist::class, inversedBy: "theories")]
-    #[ORM\JoinColumn(name: "scientist_id", referencedColumnName: "id", nullable: false)]
-    private $scientist;
+    #[ORM\ManyToOne(targetEntity: Scientist::class, inversedBy: 'theories')]
+    #[ORM\JoinColumn(name: 'scientist_id', referencedColumnName: 'id', nullable: false)]
+    private Scientist $scientist;
 }
diff --git a/tests/Assets/Extensions/ExtensionMock.php b/tests/Assets/Extensions/ExtensionMock.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Extensions;
 
 use Doctrine\Common\EventManager;
@@ -15,9 +17,7 @@ public function addSubscribers(EventManager $manager, EntityManagerInterface $em
         (new ExtensionManagerTest())->assertTrue(true);
     }
 
-    /**
-     * @return mixed[]
-     */
+    /** @return mixed[] */
     public function getFilters(): array
     {
         return [];

diff --git a/tests/Assets/Extensions/ExtensionMock2.php b/tests/Assets/Extensions/ExtensionMock2.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Extensions;
 
 use Doctrine\Common\EventManager;
@@ -12,9 +14,7 @@ public function addSubscribers(EventManager $manager, EntityManagerInterface $em
     {
     }
 
-    /**
-     * @return mixed[]
-     */
+    /** @return mixed[] */
     public function getFilters(): array
     {
         return [];

diff --git a/tests/Assets/Extensions/ExtensionWithFiltersMock.php b/tests/Assets/Extensions/ExtensionWithFiltersMock.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Extensions;
 
 use Doctrine\Common\EventManager;
@@ -12,14 +14,12 @@ public function addSubscribers(EventManager $manager, EntityManagerInterface $em
     {
     }
 
-    /**
-     * @return mixed[]
-     */
+    /** @return mixed[] */
     public function getFilters(): array
     {
         return [
             'filter'  => 'FilterMock',
-            'filter2' => 'FilterMock'
+            'filter2' => 'FilterMock',
         ];
     }
 }
diff --git a/tests/Assets/FakeConnection.php b/tests/Assets/FakeConnection.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets;
 
 use Doctrine\DBAL\Connection;

diff --git a/tests/Assets/FakeEventManager.php b/tests/Assets/FakeEventManager.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets;
 
 use Doctrine\Common\EventManager;

diff --git a/tests/Assets/FilterStub.php b/tests/Assets/FilterStub.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets;
 
-use Doctrine\ORM\Query\Filter\SQLFilter;
 use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\Query\Filter\SQLFilter;
 
 class FilterStub extends SQLFilter
 {

diff --git a/tests/Assets/ListenerStub.php b/tests/Assets/ListenerStub.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets;
 
 class ListenerStub

diff --git a/tests/Assets/Middleware/BindableEntity.php b/tests/Assets/Middleware/BindableEntity.php
@@ -1,19 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Middleware;
 
+use function strtolower;
+
 class BindableEntity
 {
-    public $id;
+    public int $id;
 
-    public $name;
+    public string $name;
 
-    public function getId()
+    public function getId(): int
     {
         return $this->id;
     }
 
-    public function getName()
+    public function getName(): string
     {
         return strtolower($this->name);
     }

diff --git a/tests/Assets/Middleware/BindableEntityWithInterface.php b/tests/Assets/Middleware/BindableEntityWithInterface.php
@@ -1,21 +1,25 @@
 <?php
 
+declare(strict_types=1);
+
 namespace LaravelDoctrineTest\ORM\Assets\Middleware;
 
 use LaravelDoctrine\ORM\Contracts\UrlRoutable;
 
+use function strtolower;
+
 class BindableEntityWithInterface implements UrlRoutable
 {
-    public $id;
+    public int $id;
 
-    public $name;
+    public string $name;
 
-    public function getId()
+    public function getId(): int
     {
         return $this->id;
     }
 
-    public function getName()
+    public function getName(): string
     {
         return strtolower($this->name);
     }