STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

codesniffer fixes

Browse Source
This commit is contained in:
James Collins
2023-10-20 11:10:33 +10:00
parent ba6f67798d
commit 8233afa825
67 changed files with 608 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/EventUsers.php
View File

@@ -5,6 +5,7 @@ namespace App\Models;
use App\Traits\Uuids;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
class EventUser extends Model
{
@@ -24,6 +25,8 @@ class EventUser extends Model
/**
* Get the event for this attachment.
*
* @return Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function event(): BelongsTo
{
@@ -32,6 +35,8 @@ class EventUser extends Model
/**
* Get the user for this attachment.
*
* @return Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function user(): BelongsTo
{

63
app/Models/Media.php
View File

@@ -21,6 +21,8 @@ use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use Intervention\Image\Facades\Image;
use Psr\Container\NotFoundExceptionInterface;
use Psr\Container\ContainerExceptionInterface;
use SplFileInfo;
use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -155,8 +157,8 @@ class Media extends Model
/**
* Variants Get Mutator.
*
* @param mixed $value The value to mutate.
* @param bool $raw Values are not run through urlencode.
* @param mixed $value The value to mutate.
* @param boolean $raw Values are not run through urlencode.
* @return array|null The mutated value.
*/
public function getVariantsAttribute(mixed $value, bool $raw = false): array|null
@@ -165,15 +167,15 @@ class Media extends Model
$decodedValue = json_decode($value, true);
// Check if the decoded value is an array
if ($raw == false && is_array($decodedValue)) {
if ($raw === false && is_array($decodedValue) === true) {
// Loop through the array and encode each value
foreach ($decodedValue as &$item) {
if (is_string($item)) {
if (is_string($item) === true) {
$item = rawurlencode($item);
}
}
}
return $decodedValue;
}
@@ -278,7 +280,10 @@ class Media extends Model
*/
public function deleteFile(): void
{
if (strlen($this->storage) > 0 && strlen($this->name) > 0 && Storage::disk($this->storage)->exists($this->name) === true) {
if (
strlen($this->storage) > 0 && strlen($this->name) > 0 &&
Storage::disk($this->storage)->exists($this->name) === true
) {
Storage::disk($this->storage)->delete($this->name);
}
@@ -322,19 +327,20 @@ class Media extends Model
/**
* Get URL path
*
* @param array $replacements Replace variables in URL.
* @return string
*/
public function getUrlPath(array $replacements = []): string
{
$url = config("filesystems.disks.$this->storage.url");
if (!empty($replacements)) {
if (empty($replacements) !== true) {
foreach ($replacements as $key => $value) {
$placeholder = '{' . $key . '}';
$url = str_replace($placeholder, $value, $url);
}
}
// Remove any remaining {x} placeholders
$url = preg_replace('/\{[^}]+\}/', '', $url);
@@ -992,12 +998,26 @@ class Media extends Model
$this->save();
}
public function jobs(): HasMany {
/**
* Get the associated job models
*
* @return HasMany
*/
public function jobs(): HasMany
{
return $this->hasMany(MediaJob::class, 'media_id');
}
public static function recommendedStorage(string $mime_type, string $security_type): string {
if($security_type === '') {
/**
* Get the recommended storage ID based on mime and security
*
* @param string $mime_type The file mime type.
* @param string $security_type The security requested.
* @return string
*/
public static function recommendedStorage(string $mime_type, string $security_type): string
{
if ($security_type === '') {
if (strpos($mime_type, 'image/') === 0) {
return('local');
} else {
@@ -1008,9 +1028,18 @@ class Media extends Model
return('private');
}
public static function verifyStorage($mime_type, $security_type, &$storage): int {
if($storage === '') {
if($security_type === '') {
/**
* Verify the storage exists. May change the storage value.
*
* @param mixed $mime_type File mime type.
* @param mixed $security_type Requested security type.
* @param mixed $storage Reference to the requested storage type.
* @return integer Error code.
*/
public static function verifyStorage(mixed $mime_type, mixed $security_type, mixed &$storage): int
{
if ($storage === '') {
if ($security_type === '') {
if (strpos($mime_type, 'image/') === 0) {
$storage = 'local';
} else {
@@ -1021,11 +1050,11 @@ class Media extends Model
}
} else {
$disks = config('filesystems.disks');
if(array_key_exists($storage, $disks) === false) {
if (array_key_exists($storage, $disks) === false) {
return Media::STORAGE_NOT_FOUND;
}
if($security_type !== '' && strcasecmp($storage, 'private') !== 0) {
if ($security_type !== '' && strcasecmp($storage, 'private') !== 0) {
return Media::STORAGE_INVALID_SECURITY;
}
}

22
app/Models/MediaJob.php
View File

@@ -102,9 +102,9 @@ class MediaJob extends Model
/**
* Set MediaJob status details.
*
* @param string $status The status string.
* @param string $text The status text.
* @param integer $progress The status progress value.
* @param string $status The status string.
* @param string $text The status text.
* @param integer $progress The status progress value.
* @param integer $progress_max The status progress maximum value.
* @return void
*/
@@ -180,12 +180,14 @@ class MediaJob extends Model
$data['size'] = filesize($newFile);
$data['mime_type'] = $mime;
if(array_key_exists('storage', $data) === true &&
array_key_exists('security_type', $data) === true &&
array_key_exists('mime_type', $data) === true &&
$data['mime_type'] !== "") {
if (
array_key_exists('storage', $data) === true &&
array_key_exists('security_type', $data) === true &&
array_key_exists('mime_type', $data) === true &&
$data['mime_type'] !== ""
) {
$error = Media::verifyStorage($data['mime_type'], $data['security_type'], $data['storage']);
switch($error) {
switch ($error) {
case Media::STORAGE_VALID:
break;
case Media::STORAGE_MIME_MISSING:
@@ -202,11 +204,11 @@ class MediaJob extends Model
return;
}
}
$this->data = json_encode($data);
$this->setStatusQueued();
MediaWorkerJob::dispatch($this)->onQueue('media');
}
}//end if
}//end if
} else {
$this->setStatusQueued();

3
app/Models/Permission.php
View File

@@ -5,6 +5,7 @@ namespace App\Models;
use App\Traits\Uuids;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
class Permission extends Model
{
@@ -24,6 +25,8 @@ class Permission extends Model
/**
* Get the User associated with this model
*
* @return Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function user(): BelongsTo
{

3
app/Models/UserLogins.php
View File

@@ -5,6 +5,7 @@ namespace App\Models;
use App\Traits\Uuids;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
class UserLogins extends Model
{
@@ -28,6 +29,8 @@ class UserLogins extends Model
/**
* Get the file user
*
* @return Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function user(): BelongsTo
{