Moved tests, changes after review

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index d1ec2e6e751d1066740d7520688e42d1c437dceb..2edca93870806066742d40ddd14c23573f4238f2 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -633,7 +633,7 @@ class Photo
        {
                $sql_extra = Security::getPermissionsSQLByUserId($uid);
 
-               $avatar_type = (local_user() && (local_user() == $uid)) ? Photo::USER_AVATAR : Photo::DEFAULT;
+               $avatar_type = (local_user() && (local_user() == $uid)) ? self::USER_AVATAR : self::DEFAULT;
 
                $key = "photo_albums:".$uid.":".local_user().":".remote_user();
                $albums = DI::cache()->get($key);
@@ -743,7 +743,7 @@ class Photo
                                'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
                                'resource-id' => $image_rid, 'uid' => $uid
                        ];
-                       if (!Photo::exists($condition)) {
+                       if (!self::exists($condition)) {
                                $photo = self::selectFirst(['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'uid'], ['resource-id' => $image_rid]);
                                if (!DBA::isResult($photo)) {
                                        Logger::info('Image not found', ['resource-id' => $image_rid]);
@@ -786,7 +786,7 @@ class Photo
 
                $condition = ['resource-id' => $image_rid, 'uid' => $uid];
                Logger::info('Set permissions', ['condition' => $condition, 'permissions' => $fields]);
-               Photo::update($fields, $condition);
+               self::update($fields, $condition);
        }
 
        /**
@@ -978,7 +978,7 @@ class Photo
         * @param array $files uploaded file array
         * @return array photo record
         */
-       public static function upload(int $uid, array $files, string $album = '', string $allow_cid = null, string $allow_gid = null, string $deny_cid = '', string $deny_gid = '', string $desc = '', string $resource_id = '')
+       public static function upload(int $uid, array $files, string $album = '', string $allow_cid = null, string $allow_gid = null, string $deny_cid = '', string $deny_gid = '', string $desc = '', string $resource_id = ''): array
        {
                $user = User::getOwnerDataById($uid);
                if (empty($user)) {
@@ -997,7 +997,7 @@ class Photo
                $width    = $data['width'];
                $height   = $data['height'];
 
-               $resource_id = $resource_id ?: Photo::newResource();
+               $resource_id = $resource_id ?: self::newResource();
                $album       = $album ?: DI::l10n()->t('Wall Photos');
 
                if (is_null($allow_cid) && is_null($allow_gid)) {
@@ -1048,8 +1048,6 @@ class Photo
                $picture['picture']     = DI::baseUrl() . '/photo/{$resource_id}-0.' . $Image->getExt();
                $picture['preview']     = DI::baseUrl() . '/photo/{$resource_id}-{$smallest}.' . $Image->getExt();
 
-               $Image->__destruct();
-
                Logger::info('upload done', ['picture' => $picture]);
                return $picture;
        }
@@ -1060,11 +1058,11 @@ class Photo
         * @param array $files uploaded file array
         * @return string avatar resource
         */
-       public static function uploadAvatar(int $uid, array $files)
+       public static function uploadAvatar(int $uid, array $files): string
        {
                $data = self::uploadImage($files);
                if (empty($data)) {
-                       return [];
+                       return '';
                }
 
                $Image    = $data['image'];
@@ -1072,8 +1070,8 @@ class Photo
                $width    = $data['width'];
                $height   = $data['height'];
 
-               $resource_id = Photo::newResource();
-               $album       = DI::l10n()->t(Photo::PROFILE_PHOTOS);
+               $resource_id = self::newResource();
+               $album       = DI::l10n()->t(self::PROFILE_PHOTOS);
 
                // upload profile image (scales 4, 5, 6)
                logger::info('starting new profile image upload');
@@ -1082,7 +1080,7 @@ class Photo
                        $Image->scaleDown(300);
                }
 
-               $r = Photo::store($Image, $uid, 0, $resource_id, $filename, $album, 4, Photo::USER_AVATAR);
+               $r = self::store($Image, $uid, 0, $resource_id, $filename, $album, 4, self::USER_AVATAR);
                if (!$r) {
                        logger::notice('profile image upload with scale 4 (300) failed');
                }
@@ -1091,7 +1089,7 @@ class Photo
                        $Image->scaleDown(80);
                }
 
-               $r = Photo::store($Image, $uid, 0, $resource_id, $filename, $album, 5, Photo::USER_AVATAR);
+               $r = self::store($Image, $uid, 0, $resource_id, $filename, $album, 5, self::USER_AVATAR);
                if (!$r) {
                        logger::notice('profile image upload with scale 5 (80) failed');
                }
@@ -1100,16 +1098,15 @@ class Photo
                        $Image->scaleDown(48);
                }
 
-               $r = Photo::store($Image, $uid, 0, $resource_id, $filename, $album, 6, Photo::USER_AVATAR);
+               $r = self::store($Image, $uid, 0, $resource_id, $filename, $album, 6, self::USER_AVATAR);
                if (!$r) {
                        logger::notice('profile image upload with scale 6 (48) failed');
                }
 
-               $Image->__destruct();
                logger::info('new profile image upload ended');
 
                $condition = ["`profile` AND `resource-id` != ? AND `uid` = ?", $resource_id, $uid];
-               Photo::update(['profile' => false, 'photo-type' => Photo::DEFAULT], $condition);
+               self::update(['profile' => false, 'photo-type' => self::DEFAULT], $condition);
 
                Contact::updateSelfFromUserID($uid, true);
 
@@ -1125,12 +1122,12 @@ class Photo
         * @param array $files uploaded file array
         * @return string avatar resource
         */
-       public static function uploadBanner(int $uid, array $files)
+       public static function uploadBanner(int $uid, array $files): string
        {
                $data = self::uploadImage($files);
                if (empty($data)) {
                        Logger::info('upload failed');
-                       return [];
+                       return '';
                }
 
                $Image    = $data['image'];
@@ -1138,8 +1135,8 @@ class Photo
                $width    = $data['width'];
                $height   = $data['height'];
 
-               $resource_id = Photo::newResource();
-               $album       = DI::l10n()->t(Photo::BANNER_PHOTOS);
+               $resource_id = self::newResource();
+               $album       = DI::l10n()->t(self::BANNER_PHOTOS);
 
                if ($width > 960) {
                        $Image->scaleDown(960);
@@ -1150,11 +1147,10 @@ class Photo
                        logger::notice('profile banner upload with scale 3 (960) failed');
                }
 
-               $Image->__destruct();
                logger::info('new profile banner upload ended');
 
                $condition = ["`photo-type` = ? AND `resource-id` != ? AND `uid` = ?", self::USER_BANNER, $resource_id, $uid];
-               Photo::update(['photo-type' => Photo::DEFAULT], $condition);
+               self::update(['photo-type' => self::DEFAULT], $condition);
 
                Contact::updateSelfFromUserID($uid, true);
 

diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index cd996d6d4f2772194a2b2c566da202962351e2d9..aade6f4377b6def73aab14a997cf8e71b4f64b91 100644 (file)
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -691,28 +691,6 @@ class ApiTest extends FixtureTest
                $this->markTestIncomplete();
        }
 
-       /**
-        * Test the ACL::isValidContact() function.
-        *
-        * @return void
-        */
-       public function testCheckAclInput()
-       {
-               $result = ACL::isValidContact('<aclstring>', BaseApi::getCurrentUserID());
-               self::assertFalse($result);
-       }
-
-       /**
-        * Test the ACL::isValidContact() function with an empty ACL string.
-        *
-        * @return void
-        */
-       public function testCheckAclInputWithEmptyAclString()
-       {
-               $result = ACL::isValidContact('', BaseApi::getCurrentUserID());
-               self::assertTrue($result);
-       }
-
        /**
         * Test the save_media_to_database() function.
         *

diff --git a/tests/src/Core/ACLTest.php b/tests/src/Core/ACLTest.php
new file mode 100644 (file)
index 0000000..920bc50
--- /dev/null
+++ b/tests/src/Core/ACLTest.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Friendica\Test\src\Core;
+
+use Friendica\Core\ACL;
+use Friendica\Module\BaseApi;
+use Friendica\Test\FixtureTest;
+
+class ACLTest extends FixtureTest
+{
+       /**
+        * Test the ACL::isValidContact() function.
+        *
+        * @return void
+        */
+       public function testCheckAclInput()
+       {
+               $result = ACL::isValidContact('<aclstring>', BaseApi::getCurrentUserID());
+               self::assertFalse($result);
+       }
+
+       /**
+        * Test the ACL::isValidContact() function with an empty ACL string.
+        *
+        * @return void
+        */
+       public function testCheckAclInputWithEmptyAclString()
+       {
+               $result = ACL::isValidContact('', BaseApi::getCurrentUserID());
+               self::assertTrue($result);
+       }
+}