Merge pull request #4243 from MrPetovan/task/switch-to-array-new-style

[friendica.git] / src / Model / User.php

diff --git a/src/Model/User.php b/src/Model/User.php
index 927bcaa75f9bc5f9d4c4178287a30f7d2f2118f5..2ba0f05bd81a279ed5d27a95fdd738eb941a9571 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -84,7 +84,7 @@ class User
                        return $default_group;
                }
 
-               $user = dba::selectOne('user', ['def_gid'], ['uid' => $uid]);
+               $user = dba::selectFirst('user', ['def_gid'], ['uid' => $uid]);
 
                if (DBM::is_result($user)) {
                        $default_group = $user["def_gid"];
@@ -112,7 +112,7 @@ class User
                if (is_object($user_info)) {
                        $user = (array) $user_info;
                } elseif (is_int($user_info)) {
-                       $user = dba::selectOne('user', ['uid', 'password'],
+                       $user = dba::selectFirst('user', ['uid', 'password'],
                                [
                                        'uid' => $user_info,
                                        'blocked' => 0,
@@ -217,8 +217,8 @@ class User
                                $openid = new \LightOpenID;
                                $openid->identity = $openid_url;
                                $openid->returnUrl = System::baseUrl() . '/openid';
-                               $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson');
-                               $openid->optional = array('namePerson/first', 'media/image/aspect11', 'media/image/default');
+                               $openid->required = ['namePerson/friendly', 'contact/email', 'namePerson'];
+                               $openid->optional = ['namePerson/first', 'media/image/aspect11', 'media/image/default'];
                                try {
                                        $authurl = $openid->authUrl();
                                } catch (Exception $e) {
@@ -328,7 +328,7 @@ class User
 
                if ($insert_result) {
                        $uid = dba::lastInsertId();
-                       $user = dba::selectOne('user', [], ['uid' => $uid]);
+                       $user = dba::selectFirst('user', [], ['uid' => $uid]);
                } else {
                        throw new Exception(t('An error occurred during registration. Please try again.'));
                }
@@ -456,11 +456,11 @@ class User
 
                $body = sprintf($body, $username, $sitename);
 
-               return notification(array(
+               return notification([
                        'type' => SYSTEM_EMAIL,
                        'to_email' => $email,
                        'subject'=> sprintf( t('Registration at %s'), $sitename),
-                       'body' => $body));
+                       'body' => $body]);
        }
 
        /**
@@ -510,12 +510,12 @@ class User
                $preamble = sprintf($preamble, $username, $sitename);
                $body = sprintf($body, $email, $sitename, $siteurl, $username, $password);
 
-               return notification(array(
+               return notification([
                        'type' => SYSTEM_EMAIL,
                        'to_email' => $email,
                        'subject'=> sprintf( t('Registration details for %s'), $sitename),
                        'preamble'=> $preamble,
-                       'body' => $body));
+                       'body' => $body]);
        }
 
        /**
@@ -530,7 +530,7 @@ class User
 
                logger('Removing user: ' . $uid);
 
-               $user = dba::selectOne('user', [], ['uid' => $uid]);
+               $user = dba::selectFirst('user', [], ['uid' => $uid]);
 
                call_hooks('remove_user', $user);