Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / user / src / UserData.php

diff --git a/web/core/modules/user/src/UserData.php b/web/core/modules/user/src/UserData.php
index 735c3de4e61435ae89cdcd5c3c5e620692d68813..8056f33ce13d103fadc5366281be9feb164a28db 100644 (file)
--- a/web/core/modules/user/src/UserData.php
+++ b/web/core/modules/user/src/UserData.php
@@ -40,7 +40,7 @@ class UserData implements UserDataInterface {
       $query->condition('name', $name);
     }
     $result = $query->execute();
-    // If $module, $uid, and $name was passed, return the value.
+    // If $module, $uid, and $name were passed, return the value.
     if (isset($name) && isset($uid)) {
       $result = $result->fetchAllAssoc('uid');
       if (isset($result[$uid])) {
@@ -48,40 +48,35 @@ class UserData implements UserDataInterface {
       }
       return NULL;
     }
-    // If $module and $uid was passed, return the name/value pairs.
-    elseif (isset($uid)) {
-      $return = [];
+    $return = [];
+    // If $module and $uid were passed, return data keyed by name.
+    if (isset($uid)) {
       foreach ($result as $record) {
         $return[$record->name] = ($record->serialized ? unserialize($record->value) : $record->value);
       }
       return $return;
     }
-    // If $module and $name was passed, return the uid/value pairs.
-    elseif (isset($name)) {
-      $return = [];
+    // If $module and $name were passed, return data keyed by uid.
+    if (isset($name)) {
       foreach ($result as $record) {
         $return[$record->uid] = ($record->serialized ? unserialize($record->value) : $record->value);
       }
       return $return;
     }
     // If only $module was passed, return data keyed by uid and name.
-    else {
-      $return = [];
-      foreach ($result as $record) {
-        $return[$record->uid][$record->name] = ($record->serialized ? unserialize($record->value) : $record->value);
-      }
-      return $return;
+    foreach ($result as $record) {
+      $return[$record->uid][$record->name] = ($record->serialized ? unserialize($record->value) : $record->value);
     }
+    return $return;
   }
 
   /**
    * {@inheritdoc}
    */
   public function set($module, $uid, $name, $value) {
-    $serialized = 0;
-    if (!is_scalar($value)) {
+    $serialized = (int) !is_scalar($value);
+    if ($serialized) {
       $value = serialize($value);
-      $serialized = 1;
     }
     $this->connection->merge('users_data')
       ->keys([