Merge pull request #15 from samsonasik/apply-php74

Apply PHP 7.4 syntax and typed property
mezzio · Sep 13, 2022 · 3c637eb · 3c637eb
2 parents a6eff6d + 0491022
commit 3c637eb
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 26 deletions.
diff --git a/src/CsrfMiddleware.php b/src/CsrfMiddleware.php
@@ -4,6 +4,7 @@
 
 namespace Mezzio\Csrf;
 
+use Mezzio\Csrf\CsrfGuardFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
@@ -23,11 +24,9 @@ class CsrfMiddleware implements MiddlewareInterface
 {
     public const GUARD_ATTRIBUTE = 'csrf';
 
-    /** @var string */
-    private $attributeKey;
+    private string $attributeKey;
 
-    /** @var CsrfGuardFactoryInterface */
-    private $guardFactory;
+    private CsrfGuardFactoryInterface $guardFactory;
 
     public function __construct(
         CsrfGuardFactoryInterface $guardFactory,

diff --git a/src/FlashCsrfGuard.php b/src/FlashCsrfGuard.php
@@ -11,8 +11,7 @@
 
 class FlashCsrfGuard implements CsrfGuardInterface
 {
-    /** @var FlashMessagesInterface */
-    private $flashMessages;
+    private FlashMessagesInterface $flashMessages;
 
     public function __construct(FlashMessagesInterface $flashMessages)
     {

diff --git a/src/FlashCsrfGuardFactory.php b/src/FlashCsrfGuardFactory.php
@@ -10,8 +10,7 @@
 
 class FlashCsrfGuardFactory implements CsrfGuardFactoryInterface
 {
-    /** @var string */
-    private $attributeKey;
+    private string $attributeKey;
 
     public function __construct(string $attributeKey = FlashMessageMiddleware::FLASH_ATTRIBUTE)
     {

diff --git a/src/SessionCsrfGuard.php b/src/SessionCsrfGuard.php
@@ -11,8 +11,7 @@
 
 class SessionCsrfGuard implements CsrfGuardInterface
 {
-    /** @var SessionInterface */
-    private $session;
+    private SessionInterface $session;
 
     public function __construct(SessionInterface $session)
     {

diff --git a/src/SessionCsrfGuardFactory.php b/src/SessionCsrfGuardFactory.php
@@ -10,8 +10,7 @@
 
 class SessionCsrfGuardFactory implements CsrfGuardFactoryInterface
 {
-    /** @var string */
-    private $attributeKey;
+    private string $attributeKey;
 
     public function __construct(string $attributeKey = SessionMiddleware::SESSION_ATTRIBUTE)
     {

diff --git a/test/ConfigProviderTest.php b/test/ConfigProviderTest.php
@@ -9,8 +9,7 @@
 
 class ConfigProviderTest extends TestCase
 {
-    /** @var ConfigProvider */
-    private $provider;
+    private ConfigProvider $provider;
 
     protected function setUp(): void
     {

diff --git a/test/CsrfMiddlewareTest.php b/test/CsrfMiddlewareTest.php
@@ -15,8 +15,8 @@
 
 class CsrfMiddlewareTest extends TestCase
 {
-    /** @var MockObject<CsrfGuardFactoryInterface> */
-    private $guardFactory;
+    /** @var MockObject&CsrfGuardFactoryInterface */
+    private CsrfGuardFactoryInterface $guardFactory;
 
     protected function setUp(): void
     {

diff --git a/test/FlashCsrfGuardTest.php b/test/FlashCsrfGuardTest.php
@@ -11,10 +11,9 @@
 
 class FlashCsrfGuardTest extends TestCase
 {
-    /** @var MockObject<FlashMessagesInterface>  */
-    private $flash;
-    /** @var FlashCsrfGuard */
-    private $guard;
+    /** @var MockObject&FlashMessagesInterface  */
+    private FlashMessagesInterface $flash;
+    private FlashCsrfGuard $guard;
 
     protected function setUp(): void
     {
@@ -39,7 +38,7 @@ public function testGenerateTokenStoresTokenInFlashAndReturnsIt(string $keyName)
         $this->flash->expects(self::atLeastOnce())->method('flash')
             ->with(
                 $keyName,
-                $this->callback(function ($token) use (&$expected) {
+                $this->callback(function ($token) use (&$expected): bool {
                     $this->assertMatchesRegularExpression('/^[a-f0-9]{32}$/', $token);
                     $expected = $token;
                     return true;

diff --git a/test/SessionCsrfGuardTest.php b/test/SessionCsrfGuardTest.php
@@ -11,10 +11,9 @@
 
 class SessionCsrfGuardTest extends TestCase
 {
-    /** @var MockObject<SessionInterface> */
-    private $session;
-    /** @var SessionCsrfGuard */
-    private $guard;
+    /** @var MockObject&SessionInterface */
+    private SessionInterface $session;
+    private SessionCsrfGuard $guard;
 
     protected function setUp(): void
     {
@@ -39,7 +38,7 @@ public function testGenerateTokenStoresTokenInSessionAndReturnsIt(string $keyNam
         $this->session->expects(self::atLeastOnce())->method('set')
             ->with(
                 $keyName,
-                $this->callback(function ($token) use (&$expected) {
+                $this->callback(function ($token) use (&$expected): bool {
                     $this->assertMatchesRegularExpression('/^[a-f0-9]{32}$/', $token);
                     $expected = $token;
                     return true;