Changed to suggestings (back to original) + fixed typo in scalar type

diff --git a/src/Model/OpenWebAuthToken.php b/src/Model/OpenWebAuthToken.php
index 0c85839bdea6490c659c963e9c8d42b5dfb8b259..5071b00d3a594a2e59b9b1276be4def3f0415af2 100644 (file)
--- a/src/Model/OpenWebAuthToken.php
+++ b/src/Model/OpenWebAuthToken.php
@@ -84,7 +84,7 @@ class OpenWebAuthToken
         */
        public static function purge(string $type, string $interval)
        {
-               $condition = ['`type` = ? AND `created` < ?', $type, DateTimeFormat::utcNow() . ' - INTERVAL ' . $interval];
+               $condition = ["`type` = ? AND `created` < ?", $type, DateTimeFormat::utcNow() . ' - INTERVAL ' . $interval];
                DBA::delete('openwebauth-token', $condition);
        }
 

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index ba4db6aca8f4127491800cc050f8c37ede054c09..d3d3783e2df4e143db95346245c45daa1af49cb9 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -167,7 +167,7 @@ class Photo
 
                $sql_acl = Security::getPermissionsSQLByUserId($uid, $accessible);
 
-               $conditions = ['`resource-id` = ? AND `scale` <= ? ' . $sql_acl, $resourceid, $scale];
+               $conditions = ["`resource-id` = ? AND `scale` <= ? " . $sql_acl, $resourceid, $scale];
                $params = ['order' => ['scale' => true]];
                $photo = self::selectFirst([], $conditions, $params);
 
@@ -333,7 +333,7 @@ class Photo
         */
        public static function store(Image $image, int $uid, int $cid, string $rid, string $filename, string $album, int $scale, int $type = self::DEFAULT, string $allow_cid = '', string $allow_gid = '', string $deny_cid = '', string $deny_gid = '', string $desc = ''): bool
        {
-               $photo = self::selectFirst(['guid'], ['`resource-id` = ? AND `guid` != ?', $rid, '']);
+               $photo = self::selectFirst(['guid'], ["`resource-id` = ? AND `guid` != ?", $rid, '']);
                if (DBA::isResult($photo)) {
                        $guid = $photo['guid'];
                } else {
@@ -590,7 +590,7 @@ class Photo
         * @param string $hemi      hemi
         * @return float
         */
-       public static function getGps(array $exifCoord, strinf $hemi): float
+       public static function getGps(array $exifCoord, string $hemi): float
        {
                $degrees = count($exifCoord) > 0 ? self::gps2Num($exifCoord[0]) : 0;
                $minutes = count($exifCoord) > 1 ? self::gps2Num($exifCoord[1]) : 0;