Set config resolver in constructor

Author: glye

src/contracts/Repository/PasswordHashService.php

@@ -8,17 +8,8 @@
 
 namespace Ibexa\Contracts\Core\Repository;
 
-use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
-
 interface PasswordHashService
 {
-    /**
-     * Sets the ConfigResolver instance.
-     *
-     * @param \Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface $configResolver
-     */
-    public function setConfigResolver(ConfigResolverInterface $configResolver): void;
-
     /**
      * Returns default password hash type.
      *

src/lib/Repository/User/PasswordHashService.php

@@ -23,14 +23,15 @@ final class PasswordHashService implements PasswordHashServiceInterface
 
     private ConfigResolverInterface $configResolver;
 
-    public function __construct(int $hashType = User::DEFAULT_PASSWORD_HASH)
+    public function __construct(int $hashType = User::DEFAULT_PASSWORD_HASH, ConfigResolverInterface $configResolver = null)
     {
-        // Kept for BC, but overwritten by @see setConfigResolver()
-        $this->defaultHashType = $hashType;
-    }
+        if ($configResolver === null) {
+            // Kept for BC, but overwritten by @see setConfigResolver() if set
+            $this->defaultHashType = $hashType;
+
+            return;
+        }
 
-    public function setConfigResolver(ConfigResolverInterface $configResolver): void
-    {
         $this->configResolver = $configResolver;
         $this->defaultHashType = $this->configResolver->getParameter('password_hash.default_type');
     }
@@ -114,6 +115,11 @@ public function isValidPassword(
 
     public function updatePasswordHashTypeOnChange(): bool
     {
+        if (!isset($this->configResolver)) {
+            // If the ConfigResolver is not set, default to false
+            return false;
+        }
+
         return $this->configResolver->getParameter('password_hash.update_type_on_change');
     }
 }

src/lib/Resources/settings/fieldtype_services.yml

@@ -61,8 +61,9 @@ services:
     Ibexa\Core\FieldType\FieldTypeRegistry: ~
 
     Ibexa\Core\Repository\User\PasswordHashService:
-        calls:
-            - [ setConfigResolver, [ '@ibexa.config.resolver' ] ]
+        arguments:
+            $hashType: '%ibexa.site_access.config.password_hash.default_type%'
+            $configResolver: '@ibexa.config.resolver'
 
     Ibexa\Contracts\Core\Repository\PasswordHashService:
         alias: Ibexa\Core\Repository\User\PasswordHashService