Merge pull request #28 from prajapati-kaushik/6555-made-for-symfony6-…

…support refactor: mode for symofny6 support #6555
linkorb · Sep 17, 2022 · 44c7768 · 44c7768
2 parents 5081640 + 7723d25
commit 44c7768
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 37 deletions.
diff --git a/composer.json b/composer.json
@@ -1,36 +1,41 @@
 {
-    "name": "userbase/client",
-    "description": "UserBase PHP Client: Identity + Login + Signup Service",
-    "homepage": "http://www.github.com/userbase-project/userbase-client-php",
-    "keywords": ["login", "signup", "user", "account"],
-    "type": "library",
-    "authors": [
-        {
-            "name": "Joost Faassen",
-            "email": "j.faassen@linkorb.com",
-            "role": "Development"
-        },
-        {
-            "name": "kaushik prajapati",
-            "email": "prajapatikaushik@gmail.com",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0",
-        "linkorb/envoi": "^1.0",
-        "linkorb/userbase-role-contracts": "^2.0",
-        "psr/cache": "~1.0",
-        "symfony/cache": "~3.0 || ^4.0 || ^5.0",
-        "symfony/event-dispatcher-contracts": "^2.0",
-        "symfony/security-core": "~2.6 || ~3.0 || ^4.0 || ^5.0"
+  "name": "userbase/client",
+  "description": "UserBase PHP Client: Identity + Login + Signup Service",
+  "homepage": "http://www.github.com/userbase-project/userbase-client-php",
+  "keywords": [
+    "login",
+    "signup",
+    "user",
+    "account"
+  ],
+  "type": "library",
+  "authors": [
+    {
+      "name": "Joost Faassen",
+      "email": "j.faassen@linkorb.com",
+      "role": "Development"
     },
-    "require-dev": {
-      "symfony/dotenv": "~3.0 || ^4.0 || ^5.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "UserBase\\Client\\": "src/"
-        }
+    {
+      "name": "kaushik prajapati",
+      "email": "prajapatikaushik@gmail.com",
+      "role": "Developer"
+    }
+  ],
+  "require": {
+    "php": ">=5.3.0",
+    "linkorb/envoi": "^1.0",
+    "linkorb/userbase-role-contracts": "^2.0",
+    "psr/cache": "~1.0",
+    "symfony/cache": "~3.0 || ^4.0 || ^5.0 || ^6.0",
+    "symfony/event-dispatcher-contracts": "^2.0 || ^3.0",
+    "symfony/security-core": "~2.6 || ~3.0 || ^4.0 || ^5.0 || ^6.0"
+  },
+  "require-dev": {
+    "symfony/dotenv": "~3.0 || ^4.0 || ^5.0 || ^6.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "UserBase\\Client\\": "src/"
     }
+  }
 }
diff --git a/src/Event/UserLoadedEvent.php b/src/Event/UserLoadedEvent.php
@@ -2,6 +2,7 @@
 
 namespace UserBase\Client\Event;
 
+
 use Symfony\Contracts\EventDispatcher\Event;
 use UserBase\Client\Model\User;
 

diff --git a/src/Model/User.php b/src/Model/User.php
@@ -2,17 +2,20 @@
 
 namespace UserBase\Client\Model;
 
-use LinkORB\Contracts\UserbaseRole\RoleInterface;
-use RuntimeException;
 use Symfony\Component\Security\Core\User\UserInterface as BaseUserInterface;
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
+use Symfony\Component\Security\Core\User\LegacyPasswordAuthenticatedUserInterface;
+use RuntimeException;
+use LinkORB\Contracts\UserbaseRole\RoleInterface;
 
 final class User implements
     AccountContainerInterface,
     BaseUserInterface,
     LegacyAdvancedUserInterface,
     PolicyContainerInterface,
     RoleInterface,
-    UserInterface
+    UserInterface,
+    LegacyPasswordAuthenticatedUserInterface
 {
     /**
      * @deprecated
@@ -102,8 +105,9 @@ public function getRoles()
 
     /**
      * {@inheritdoc}
+     *  @see PasswordAuthenticatedUserInterface
      */
-    public function getPassword()
+    public function getPassword(): ?string
     {
         return $this->password;
     }
@@ -117,7 +121,7 @@ public function setPassword($password)
     /**
      * {@inheritdoc}
      */
-    public function getSalt()
+    public function getSalt(): ?string
     {
         return $this->salt;
     }