Fixed `Argument 1 passed to Grav\Common\User\DataUser\User::filterUse…

…rname() must be of the type string` [#1992]
getgrav · Dec 10, 2020 · d345939 · d345939
1 parent ea358c2
commit d345939
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
     * Fixed broken list in `bin/gpm index` [#3092](https://github.com/getgrav/grav/issues/3092)
     * Fixed CLI/GPM command failures returning 0 (success) value [#3017](https://github.com/getgrav/grav/issues/3017)
     * Fixed unimplemented `PageObject::getOriginal()` call [#3098](https://github.com/getgrav/grav/issues/3098)
+    * Fixed `Argument 1 passed to Grav\Common\User\DataUser\User::filterUsername() must be of the type string` [#1992](https://github.com/getgrav/grav-plugin-admin/issues/1992)
 
 # v1.7.0-rc.19
 ## 12/02/2020

diff --git a/system/src/Grav/Common/Flex/Types/Users/UserCollection.php b/system/src/Grav/Common/Flex/Types/Users/UserCollection.php
@@ -43,6 +43,8 @@ public static function getCachedMethods(): array
      */
     public function load($username): UserInterface
     {
+        $username = (string)$username;
+
         if ($username !== '') {
             $key = $this->filterUsername($username);
             $user = $this->get($key);

diff --git a/system/src/Grav/Common/Flex/Types/Users/UserIndex.php b/system/src/Grav/Common/Flex/Types/Users/UserIndex.php
@@ -79,6 +79,8 @@ public static function updateObjectMeta(array &$meta, array $data, FlexStorageIn
      */
     public function load($username): UserInterface
     {
+        $username = (string)$username;
+
         if ($username !== '') {
             $key = static::filterUsername($username, $this->getFlexDirectory()->getStorage());
             $user = $this->get($key);

diff --git a/system/src/Grav/Common/User/DataUser/User.php b/system/src/Grav/Common/User/DataUser/User.php
@@ -120,7 +120,7 @@ public function save()
         }
 
         if ($file) {
-            $username = $this->filterUsername($this->get('username'));
+            $username = $this->filterUsername((string)$this->get('username'));
 
             if (!$file->filename()) {
                 $locator = Grav::instance()['locator'];

diff --git a/system/src/Grav/Common/User/DataUser/UserCollection.php b/system/src/Grav/Common/User/DataUser/UserCollection.php
@@ -48,6 +48,8 @@ public function __construct(string $className)
      */
     public function load($username): UserInterface
     {
+        $username = (string)$username;
+
         $grav = Grav::instance();
         /** @var UniformResourceLocator $locator */
         $locator = $grav['locator'];