Changed "Photo::select(" to "Photo::selectToArray("

diff --git a/src/Model/Attach.php b/src/Model/Attach.php
index 716004ab32b75ad3f75714083e08d50f300fcbb2..758d3ae831c51ba112280a5f6fa49e8acd86e741 100644 (file)
--- a/src/Model/Attach.php
+++ b/src/Model/Attach.php
@@ -55,8 +55,7 @@ class Attach extends BaseObject
                        $fields = self::getFields();
                }
 
-               $r = DBA::select('attach', $fields, $conditions, $params);
-               return DBA::toArray($r);
+               $r = DBA::selectToArray('attach', $fields, $conditions, $params);
        }
 
        /**

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 0e3661b0f33e4110915908a8542353e35823112b..a1c53fbbe785d6921ba941567054e7a9c6746a72 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -29,7 +29,7 @@ require_once "include/dba.php";
 class Photo extends BaseObject
 {
        /**
-        * @brief Select rows from the photo table
+        * @brief Select rows from the photo table and returns them as array
         *
         * @param array $fields     Array of selected fields, empty for all
         * @param array $conditions Array of fields for conditions
@@ -38,16 +38,15 @@ class Photo extends BaseObject
         * @return boolean|array
         *
         * @throws \Exception
-        * @see   \Friendica\Database\DBA::select
+        * @see   \Friendica\Database\DBA::selectToArray
         */
-       public static function select(array $fields = [], array $conditions = [], array $params = [])
+       public static function selectToArray(array $fields = [], array $conditions = [], array $params = [])
        {
                if (empty($fields)) {
                        $fields = self::getFields();
                }
 
-               $r = DBA::select("photo", $fields, $conditions, $params);
-               return DBA::toArray($r);
+               return DBA::selectToArray("photo", $fields, $conditions, $params);
        }
 
        /**
@@ -89,7 +88,7 @@ class Photo extends BaseObject
                $conditions["resource-id"] = $resourceid;
                $conditions["uid"] = $uid;
 
-               return self::select([], $conditions, $params);
+               return self::selectToArray([], $conditions, $params);
        }
 
        /**
@@ -350,7 +349,7 @@ class Photo extends BaseObject
        public static function delete(array $conditions, array $options = [])
        {
                // get photo to delete data info
-               $photos = self::select(["backend-class","backend-ref"], $conditions);
+               $photos = self::selectToArray(["backend-class","backend-ref"], $conditions);
 
                foreach($photos as $photo) {
                        /** @var IStorage $backend_class */
@@ -380,7 +379,7 @@ class Photo extends BaseObject
        {
                if (!is_null($img)) {
                        // get photo to update
-                       $photos = self::select(["backend-class","backend-ref"], $conditions);
+                       $photos = self::selectToArray(["backend-class","backend-ref"], $conditions);
 
                        foreach($photos as $photo) {
                                /** @var IStorage $backend_class */