add type to function

pull/7361/head
Your Name 6 days ago
parent d4e7948a2f
commit 9fde74082a

@ -80,7 +80,7 @@ class AvatarController extends Controller
}
}
public function buildPath($id)
public function buildPath($id): string
{
$padded = str_pad($id, 19, 0, STR_PAD_LEFT);
$parts = str_split($padded, 3);

@ -131,7 +131,7 @@ class RemoteOidcController extends Controller
return Auth::guard();
}
private function ensure_valid_username($starting_username)
private function ensure_valid_username($starting_username): string
{
$starting_username = explode('@', $starting_username)[0];
$temp_username = preg_replace('/[^a-z0-9_]+/i', '', $starting_username);

@ -150,7 +150,7 @@ class ProcessMovePipeline implements ShouldQueue
return false;
}
protected function lowerTrim($str)
protected function lowerTrim($str): string
{
return trim(strtolower($str));
}

@ -102,7 +102,7 @@ class SharePipeline implements ShouldQueue
return $this->remoteAnnounceDeliver();
}
protected function counterGuardKey($statusId)
protected function counterGuardKey($statusId): string
{
return 'pf:share-pipeline:counted:'.$statusId;
}

@ -29,7 +29,7 @@ class Contact extends Model
return url('/i/contact-admin-response/'.$this->id);
}
public function getMessageId()
public function getMessageId(): string
{
return $this->id.'-'.(string) Str::uuid().'@'.strtolower(config('pixelfed.domain.app', 'example.org'));
}

@ -26,7 +26,7 @@ class CustomFilterKeyword extends Model
$this->attributes['keyword'] = mb_strtolower(trim($value));
}
public function toRegex()
public function toRegex(): string
{
$pattern = preg_quote($this->keyword, '/');

@ -13,7 +13,7 @@ class DirectMessage extends Model
return $this->belongsTo(Status::class, 'status_id', 'id');
}
public function url()
public function url(): string
{
return config('app.url').'/account/direct/m/'.$this->status_id;
}

@ -72,7 +72,7 @@ class Group extends Model
return GroupService::isMember($this->id, $id);
}
public function getMembershipType()
public function getMembershipType(): string
{
return $this->is_private ? 'private' : ($this->is_local ? 'local' : 'all');
}

@ -16,7 +16,7 @@ class GroupComment extends Model
return $this->belongsTo(Profile::class);
}
public function url()
public function url(): string
{
return '/group/'.$this->group_id.'/c/'.$this->id;
}

@ -19,7 +19,7 @@ class GroupPost extends Model
protected $guarded = [];
public function mediaPath()
public function mediaPath(): string
{
return 'public/g/_v1/'.$this->group_id.'/'.$this->id;
}
@ -39,7 +39,7 @@ class GroupPost extends Model
return $this->belongsTo(Profile::class);
}
public function url()
public function url(): string
{
return '/groups/'.$this->group_id.'/p/'.$this->id;
}

@ -21,7 +21,7 @@ class Hashtag extends Model
);
}
public function url($suffix = '')
public function url($suffix = ''): string
{
return config('routes.hashtag.base').$this->slug.$suffix;
}

@ -17,7 +17,7 @@ class LiveStream extends Model
return url($path);
}
public function getStreamServer()
public function getStreamServer(): string
{
$proto = 'rtmp://';
$host = config('livestreaming.server.host');
@ -27,7 +27,7 @@ class LiveStream extends Model
return $proto.$host.$port.$path;
}
public function getStreamKeyUrl()
public function getStreamKeyUrl(): string
{
$path = $this->getStreamServer().'?';
$query = http_build_query([
@ -37,7 +37,7 @@ class LiveStream extends Model
return $path.$query;
}
public function getStreamRtmpUrl()
public function getStreamRtmpUrl(): string
{
return $this->getStreamServer().'/'.$this->stream_id;
}

@ -85,7 +85,7 @@ class Media extends Model
return explode('/', $this->mime)[0];
}
public function activityVerb()
public function activityVerb(): string
{
$verb = 'Document';
switch ($this->mimeType()) {
@ -109,7 +109,7 @@ class Media extends Model
return $verb;
}
public function mediaType()
public function mediaType(): string
{
$verb = 'Document';
switch ($this->mimeType()) {

@ -15,7 +15,7 @@ class ModLog extends Model
return $this->belongsTo(User::class, 'user_id');
}
public function actionToText()
public function actionToText(): string
{
$msg = 'Unknown action';

@ -41,7 +41,7 @@ class Place extends Model
return $this->url();
}
public function getName()
public function getName(): string
{
return $this->name.', '.$this->country;
}

@ -41,7 +41,7 @@ class Portfolio extends Model
return 'https://'.config('portfolio.domain').config('portfolio.path').'/'.$account['username'].$suffix;
}
public function permalink($suffix = '')
public function permalink($suffix = ''): string
{
$account = AccountService::get($this->profile_id);

@ -315,7 +315,7 @@ class Profile extends Model
return $this->sharedInbox ?? $this->inboxUrl();
}
public function getDefaultScope()
public function getDefaultScope(): string
{
return $this->is_private == true ? 'private' : 'public';
}

@ -178,7 +178,7 @@ class Status extends Model
return url($path);
}
public function editUrl()
public function editUrl(): string
{
return $this->url().'/edit';
}
@ -308,7 +308,7 @@ class Status extends Model
);
}
public function reportUrl()
public function reportUrl(): string
{
return route('report.form')."?type=post&id={$this->id}";
}

@ -83,7 +83,7 @@ class User extends Authenticatable implements OAuthenticatable
return $this->hasMany(UserFilter::class, 'user_id', 'profile_id');
}
public function receivesBroadcastNotificationsOn()
public function receivesBroadcastNotificationsOn(): string
{
return 'App.User.'.$this->id;
}
@ -93,7 +93,7 @@ class User extends Authenticatable implements OAuthenticatable
return $this->hasMany(UserDevice::class);
}
public function storageUsedKey()
public function storageUsedKey(): string
{
return 'profile:storage:used:'.$this->id;
}

@ -332,7 +332,7 @@ class AccountService
return Profile::whereKey($profileId)->value('user_id');
}
public static function getMetaDescription($id)
public static function getMetaDescription($id): string
{
$account = self::get($id, true);

@ -13,7 +13,7 @@ class GroupPostService
const COMMENT_COUNT_KEY = 'pf:services:groups:post:comment_count:';
public static function key($gid, $pid)
public static function key($gid, $pid): string
{
return self::CACHE_KEY.$gid.':'.$pid;
}

@ -18,7 +18,7 @@ class GroupService
{
const CACHE_KEY = 'pf:services:groups:';
protected static function key($name)
protected static function key($name): string
{
return self::CACHE_KEY.$name;
}

@ -11,7 +11,7 @@ class GroupCommentService
{
const CACHE_KEY = 'pf:services:groups:comment:';
public static function key($gid, $pid)
public static function key($gid, $pid): string
{
return self::CACHE_KEY.$gid.':'.$pid;
}

@ -13,7 +13,7 @@ class GroupPostService
{
const CACHE_KEY = 'pf:services:groups:post:';
public static function key($gid, $pid)
public static function key($gid, $pid): string
{
return self::CACHE_KEY.$gid.':'.$pid;
}

@ -11,7 +11,7 @@ class SoftwareUpdateService
{
const CACHE_KEY = 'pf:services:software-update:';
public static function cacheKey()
public static function cacheKey(): string
{
return self::CACHE_KEY.'latest:v1.0.0';
}
@ -66,7 +66,7 @@ class SoftwareUpdateService
);
}
public static function normalizeVersion($version)
public static function normalizeVersion($version): string
{
return ltrim(trim((string) $version), 'vV');
}

@ -92,7 +92,7 @@ class RelationshipService
];
}
protected static function key($suffix)
protected static function key($suffix): string
{
return self::CACHE_KEY.$suffix;
}

@ -18,7 +18,7 @@ class SanitizeService
return $this->cleanHtmlWithSpacing($html);
}
public function cleanHtmlWithSpacing($html)
public function cleanHtmlWithSpacing($html): string
{
$blockTags = ['a', 'b', 'blockquote', 'br', 'code', 'del', 'div', 'em', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'i', 'img', 'li', 'ol', 'p', 'pre', 's', 'strike', 'strong', 'u', 'ul'];

@ -15,7 +15,7 @@ class StatusService
const MAX_PINNED = 3;
public static function key($id, $publicOnly = true)
public static function key($id, $publicOnly = true): string
{
$p = $publicOnly ? 'pub:' : 'all:';
@ -199,7 +199,7 @@ class StatusService
public static function clampReplyVisibility(
$replyVisibility,
$parentVisibility
) {
): string {
if ($parentVisibility === 'group') {
return 'group';
}

@ -11,7 +11,7 @@ class TrendingHashtagService
{
const CACHE_KEY = 'api:discover:v1.1:trending:hashtags';
public static function key($k = null)
public static function key($k = null): string
{
return self::CACHE_KEY.$k;
}

@ -41,7 +41,7 @@ class NotificationTransformer extends Fractal\TransformerAbstract
}
public function replaceTypeVerb($verb)
public function replaceTypeVerb($verb): string
{
$verbs = [
'dm' => 'direct',

@ -1068,7 +1068,7 @@ class Helpers
return self::statusFirstOrFetch($inReplyTo, false, $depth + 1)?->id;
}
public static function getScope($activity, $url)
public static function getScope($activity, $url): string
{
$id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($url);
$url = isset($activity['url']) ? self::pluckval($activity['url']) : self::pluckval($id);

@ -429,7 +429,7 @@ class Autolink extends Regex
*
* @since 1.1.0
*/
public function autoLinkEntities($tweet = null, $entities = null)
public function autoLinkEntities($tweet = null, $entities = null): string
{
if (is_null($tweet)) {
$tweet = $this->tweet;
@ -792,7 +792,7 @@ class Autolink extends Regex
*
* @since 1.1.0
*/
public function linkToText(array $entity, $text, $attributes = [])
public function linkToText(array $entity, $text, $attributes = []): string
{
$rel = [];
if ($this->external) {
@ -825,7 +825,7 @@ class Autolink extends Regex
* @param string $text
* @return string
*/
protected function escapeHTML($text)
protected function escapeHTML($text): string
{
return htmlspecialchars($text, ENT_QUOTES, 'UTF-8', false);
}

@ -194,7 +194,7 @@ class LooseAutolink extends Autolink
*
* @deprecated since version 1.1.0
*/
protected function wrap($url, $class, $element)
protected function wrap($url, $class, $element): string
{
$link = '<a';
if ($class) {
@ -229,7 +229,7 @@ class LooseAutolink extends Autolink
* @param string $element The tweet element to wrap.
* @return string The tweet element with a link applied.
*/
protected function wrapHash($url, $class, $element)
protected function wrapHash($url, $class, $element): string
{
$title = preg_replace('//u', '#', $element);
$link = '<a';

@ -24,7 +24,7 @@ class PrettyNumber
return $number;
}
public static function size($expression, $kb = false, $short = true)
public static function size($expression, $kb = false, $short = true): string
{
if ($kb) {
$expression *= 1024;

@ -26,7 +26,7 @@ class StringUtils
* @param string $encoding
* @return string
*/
public static function substr($str, $start, $length = null, $encoding = 'UTF-8')
public static function substr($str, $start, $length = null, $encoding = 'UTF-8'): string
{
if (is_null($length)) {
// for PHP <= 5.4.7

@ -9,7 +9,7 @@ class Blurhash
{
const DEFAULT_HASH = 'U4Rfzst8?bt7ogayj[j[~pfQ9Goe%Mj[WBay';
public static function generate(Media $media, $path = false)
public static function generate(Media $media, $path = false): string
{
if (! in_array($media->mime, ['image/png', 'image/jpeg', 'image/jpg', 'video/mp4'])) {
return self::DEFAULT_HASH;

@ -20,7 +20,7 @@ class WebfingerUrl
return 'https://'.$n['domain'].'/.well-known/webfinger?resource=acct:'.$n['username'].'@'.$n['domain'];
}
public static function generateWebfingerUrl($url)
public static function generateWebfingerUrl($url): string
{
$url = Nickname::normalizeProfileUrl($url);
$domain = $url['domain'];

Loading…
Cancel
Save