diff -u b/core/modules/user/src/UserDataQueryInterface.php b/core/modules/user/src/UserDataQueryInterface.php
--- b/core/modules/user/src/UserDataQueryInterface.php
+++ b/core/modules/user/src/UserDataQueryInterface.php
@@ -6,50 +6,50 @@
 
   /**
    * Set the module value.
-   * 
+   *
    * @param string $module
    *   The name of the module the data is associated with.
-   * 
+   *
    * @return $this
    */
   public function module($module);
 
   /**
    * Set the user account ID the data is associated with.
-   * 
+   *
    * @param $uid
    *   The user account ID the data is associated with.
-   * 
+   *
    * @return $this
    */
   public function uid($uid);
 
   /**
    * Set the name of the data key.
-   * 
+   *
    * @param string $name
    *   The name of the data key.
-   * 
+   *
    * @return $this
    */
   public function name($name);
 
   /**
    * Set the value stored.
-   * 
+   *
    * @param string $value
    *   The value stored.
-   * 
+   *
    * @return $this
-   */  
+   */
   public function value($value);
 
   /**
    * Run the query.
-   * 
+   *
    * @return \Traversable
-   *   A list of result objects. Each object contains has module, uid, name
-   *   and value properties.
+   *   A list of result objects. Each object has module, uid, name and value
+   *   properties.
    */
   public function execute();
 
diff -u b/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
--- b/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -27,7 +27,7 @@
       - { name: backend_overridable }
   user.data.query:
     class: Drupal\user\UserDataQuery
-    shared: FALSE
+    shared: false
     arguments: ['@database']
     tags:
       - { name: backend_overridable }