Merge pull request #23 from samsonasik/apply-php74

Apply PHP 7.4 syntax and typed property
mezzio · Sep 14, 2022 · 595a8f6 · 595a8f6
2 parents 5133c59 + 411ac9d
commit 595a8f6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/src/FlashMessageMiddleware.php b/src/FlashMessageMiddleware.php
@@ -17,14 +17,12 @@ class FlashMessageMiddleware implements MiddlewareInterface
 {
     public const FLASH_ATTRIBUTE = 'flash';
 
-    /** @var string */
-    private $attributeKey;
+    private string $attributeKey;
 
     /** @psalm-var callable(SessionInterface, string): FlashMessagesInterface */
     private $flashMessageFactory;
 
-    /** @var string */
-    private $sessionKey;
+    private string $sessionKey;
 
     public function __construct(
         string $flashMessagesClass = FlashMessages::class,

diff --git a/src/FlashMessages.php b/src/FlashMessages.php
@@ -30,13 +30,11 @@
 class FlashMessages implements FlashMessagesInterface
 {
     /** @var array<string,mixed> */
-    private $currentMessages = [];
+    private array $currentMessages = [];
 
-    /** @var SessionInterface */
-    private $session;
+    private SessionInterface $session;
 
-    /** @var string */
-    private $sessionKey;
+    private string $sessionKey;
 
     private function __construct(SessionInterface $session, string $sessionKey)
     {

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;
 
     public function setUp(): void
     {

diff --git a/test/FlashMessageMiddlewareTest.php b/test/FlashMessageMiddlewareTest.php
@@ -78,7 +78,7 @@ public function testProcessUsesConfiguredClassAndSessionKeyAndAttributeKeyToCrea
             ->method('withAttribute')
             ->with(
                 'non-standard-flash-attr',
-                $this->callback(function (TestAsset\FlashMessages $flash) use ($session) {
+                $this->callback(function (TestAsset\FlashMessages $flash) use ($session): bool {
                     $this->assertSame($session, $flash->session);
                     $this->assertSame('non-standard-flash-next', $flash->sessionKey);
                     return true;