Merge pull request #139 from samsonasik/update-to-latest-php81-syntax

Update to latest PHP 8.1 syntax
mezzio · Nov 3, 2024 · 64990c7 · 64990c7
2 parents 7aed2ae + 0a3b998
commit 64990c7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 35 deletions.
diff --git a/src/DefaultUser.php b/src/DefaultUser.php
@@ -14,23 +14,15 @@
  */
 final class DefaultUser implements UserInterface
 {
-    private string $identity;
-
-    /** @psalm-var array<int|string, string> */
-    private $roles;
-
-    /** @psalm-var array<string, mixed> */
-    private $details;
-
     /**
      * @psalm-param array<int|string, string> $roles
      * @psalm-param array<string, mixed> $details
      */
-    public function __construct(string $identity, array $roles = [], array $details = [])
-    {
-        $this->identity = $identity;
-        $this->roles    = $roles;
-        $this->details  = $details;
+    public function __construct(
+        private readonly string $identity,
+        private readonly array $roles = [],
+        private array $details = []
+    ) {
     }
 
     public function getIdentity(): string

diff --git a/src/UserRepository/Htpasswd.php b/src/UserRepository/Htpasswd.php
@@ -16,7 +16,7 @@
 use function fopen;
 use function password_verify;
 use function sprintf;
-use function strpos;
+use function str_starts_with;
 use function trim;
 
 /**
@@ -27,7 +27,7 @@
  */
 class Htpasswd implements UserRepositoryInterface
 {
-    private string $filename;
+    private readonly string $filename;
 
     /**
      * @var callable
@@ -98,7 +98,7 @@ public function authenticate(string $credential, ?string $password = null): ?Use
      */
     protected function checkBcryptHash(string $hash): void
     {
-        if (0 !== strpos($hash, '$2y$')) {
+        if (! str_starts_with($hash, '$2y$')) {
             throw new Exception\RuntimeException(
                 'The htpasswd file uses not secure hash algorithm. Please use bcrypt.'
             );

diff --git a/src/UserRepository/PdoDatabase.php b/src/UserRepository/PdoDatabase.php
@@ -13,7 +13,7 @@
 
 use function password_verify;
 use function sprintf;
-use function strpos;
+use function str_contains;
 
 /**
  * Adapter for PDO database
@@ -22,11 +22,6 @@
  */
 class PdoDatabase implements UserRepositoryInterface
 {
-    private PDO $pdo;
-
-    /** @psalm-var array<string, mixed> */
-    private $config;
-
     /**
      * @var callable
      * @psalm-var callable(string, array<int|string, string>, array<string, mixed>): UserInterface
@@ -38,13 +33,10 @@ class PdoDatabase implements UserRepositoryInterface
      * @psalm-param callable(string, array<int|string, string>, array<string, mixed>): UserInterface $userFactory
      */
     public function __construct(
-        PDO $pdo,
-        array $config,
+        private readonly PDO $pdo,
+        private array $config,
         callable $userFactory
     ) {
-        $this->pdo    = $pdo;
-        $this->config = $config;
-
         // Provide type safety for the composed user factory.
         $this->userFactory = static function (
             string $identity,
@@ -114,7 +106,7 @@ protected function getUserRoles(string $identity): array
 
         Assert::string($this->config['sql_get_roles']);
 
-        if (false === strpos($this->config['sql_get_roles'], ':identity')) {
+        if (! str_contains($this->config['sql_get_roles'], ':identity')) {
             throw new Exception\InvalidConfigException(
                 'The sql_get_roles configuration setting must include an :identity parameter'
             );
@@ -160,7 +152,7 @@ protected function getUserDetails(string $identity): array
 
         Assert::string($this->config['sql_get_details']);
 
-        if (false === strpos($this->config['sql_get_details'], ':identity')) {
+        if (! str_contains($this->config['sql_get_details'], ':identity')) {
             throw new Exception\InvalidConfigException(
                 'The sql_get_details configuration setting must include a :identity parameter'
             );

diff --git a/test/UserRepository/HtpasswdFactoryTest/ConfigImplementingArrayAccess.php b/test/UserRepository/HtpasswdFactoryTest/ConfigImplementingArrayAccess.php
@@ -19,15 +19,11 @@
  */
 final class ConfigImplementingArrayAccess implements ArrayAccess
 {
-    /** @var array<array-key,mixed> */
-    private array $data;
-
     /**
-     * @param array<string,mixed> $data
+     * @param array<array-key,mixed> $data
      */
-    public function __construct(array $data)
+    public function __construct(private array $data)
     {
-        $this->data = $data;
     }
 
     /**