Extracting synchronization to service

Author: mamazu

src/Resources/config/services.xml

@@ -33,9 +33,9 @@
                 </service>
             </argument>
             <argument type="service" id="sylius.admin_user_provider.name_based" />
-            <argument type="service" id="property_accessor" />
             <argument type="service" id="sylius_ldap.ldap.ldap_attribute_fetcher" />
             <argument type="service" id="sylius.factory.admin_user" />
+            <argument type="service" id="Brille24\SyliusLdapPlugin\User\UserSynchronizer" />
         </service>
 
         <service id="Symfony\Component\Ldap\Ldap">
@@ -54,5 +54,9 @@
             </argument>
         </service>
 
+        <service id="Brille24\SyliusLdapPlugin\User\UserSynchronizer">
+            <argument type="service" id="property_accessor" />
+        </service>
+
     </services>
 </container>

src/User/SymfonyToSyliusUserProviderProxy.php

@@ -43,27 +43,27 @@ final class SymfonyToSyliusUserProviderProxy implements SyliusUserProviderInterf
     private $attributeFetcher;
 
     /**
-     * @var PropertyAccessorInterface
+     * @var FactoryInterface
      */
-    private $propertyAccessor;
+    private $adminUserFactory;
 
     /**
-     * @var FactoryInterface
+     * @var UserSynchronizer
      */
-    private $adminUserFactory;
+    private $userSynchronizer;
 
     public function __construct(
         SymfonyUserProviderInterface $ldapUserProvider,
         AbstractUserProvider $adminUserProvider,
-        PropertyAccessorInterface $propertyAccessor,
         LdapAttributeFetcherInterface $attributeFetcher,
-        FactoryInterface $adminUserFactory
+        FactoryInterface $adminUserFactory,
+        UserSynchronizer $userSynchronizer
     ) {
         $this->ldapUserProvider = $ldapUserProvider;
         $this->adminUserProvider = $adminUserProvider;
         $this->attributeFetcher = $attributeFetcher;
-        $this->propertyAccessor = $propertyAccessor;
         $this->adminUserFactory = $adminUserFactory;
+        $this->userSynchronizer = $userSynchronizer;
     }
 
     public function loadUserByUsername($username): SymfonyUserInterface
@@ -79,7 +79,7 @@ public function loadUserByUsername($username): SymfonyUserInterface
             return $syliusLdapUser;
         }
 
-        $this->synchroniseUsers($syliusLdapUser, $syliusUser);
+        $this->userSynchronizer->synchroniseUsers($syliusLdapUser, $syliusUser);
 
         return $syliusUser;
     }
@@ -95,7 +95,7 @@ public function refreshUser(SymfonyUserInterface $user): SymfonyUserInterface
         // Non-sylius-users (e.g.: symfony-users) are immutable and cannot be updated / synced.
         Assert::isInstanceOf($user, SyliusUserInterface::class);
 
-        $this->synchroniseUsers($syliusLdapUser, $user);
+        $this->userSynchronizer->synchroniseUsers($syliusLdapUser, $user);
 
         return $user;
     }
@@ -118,7 +118,6 @@ private function convertSymfonyToSyliusUser(SymfonyUserInterface $symfonyUser):
         $syliusUser->setPassword('');
         $syliusUser->setLocked($locked);
         $syliusUser->setEnabled(!$locked);
-//        $syliusUser->setExpiresAt($ldapAttributes['expires_at']);
         $syliusUser->setLastLogin($this->attributeFetcher->toDateTime($ldapAttributes['last_login']));
         $syliusUser->setVerifiedAt($this->attributeFetcher->toDateTime($ldapAttributes['verified_at']));
         $syliusUser->setEmailCanonical($ldapAttributes['email_canonical']);
@@ -134,31 +133,4 @@ private function convertSymfonyToSyliusUser(SymfonyUserInterface $symfonyUser):
         return $syliusUser;
     }
 
-    private function synchroniseUsers(
-        SyliusUserInterface $sourceUser,
-        SyliusUserInterface $targetUser
-    ): void {
-        $attributesToSync = [
-            'email',
-            'expiresAt',
-            'lastLogin',
-            'enabled',
-            'verifiedAt',
-            'emailCanonical',
-            'username',
-            'usernameCanonical',
-            'credentialsExpireAt',
-        ];
-
-        if ($targetUser instanceof AdminUserInterface && $sourceUser instanceof AdminUserInterface) {
-            $attributesToSync[] = 'lastName';
-            $attributesToSync[] = 'firstName';
-            $attributesToSync[] = 'localeCode';
-        }
-
-        foreach ($attributesToSync as $attributeToSync) {
-            $value = $this->propertyAccessor->getValue($sourceUser, $attributeToSync);
-            $this->propertyAccessor->setValue($targetUser, $attributeToSync, $value);
-        }
-    }
 }

src/User/UserSynchronizer.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Brille24\SyliusLdapPlugin\User;
+
+use Sylius\Component\Core\Model\AdminUserInterface;
+use Sylius\Component\User\Model\UserInterface as SyliusUserInterface;
+use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
+
+final class UserSynchronizer implements UserSynchronizerInterface
+{
+    /**
+     * @var PropertyAccessorInterface
+     */
+    private $propertyAccessor;
+
+    public function __construct(PropertyAccessorInterface $propertyAccessor)
+    {
+        $this->propertyAccessor = $propertyAccessor;
+    }
+
+    public function synchroniseUsers(SyliusUserInterface $sourceUser, SyliusUserInterface $targetUser): void
+    {
+        $attributesToSync = [
+            'email',
+            'expiresAt',
+            'lastLogin',
+            'enabled',
+            'verifiedAt',
+            'emailCanonical',
+            'username',
+            'usernameCanonical',
+            'credentialsExpireAt',
+        ];
+
+        if ($targetUser instanceof AdminUserInterface && $sourceUser instanceof AdminUserInterface) {
+            $attributesToSync[] = 'lastName';
+            $attributesToSync[] = 'firstName';
+        }
+
+        foreach ($attributesToSync as $attributeToSync) {
+            $value = $this->propertyAccessor->getValue($sourceUser, $attributeToSync);
+            $this->propertyAccessor->setValue($targetUser, $attributeToSync, $value);
+        }
+    }
+}

src/User/UserSynchronizerInterface.php

@@ -0,0 +1,11 @@
+<?php
+declare(strict_types=1);
+
+namespace Brille24\SyliusLdapPlugin\User;
+
+use Sylius\Component\User\Model\UserInterface as SyliusUserInterface;
+
+interface UserSynchronizerInterface
+{
+    public function synchroniseUsers(SyliusUserInterface $sourceUser, SyliusUserInterface $targetUser): void;
+}