cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-10 19:31:07 +03:30
Code Issues Packages Projects Releases Wiki Activity

feat: install phpstan and resolving reported errors in PHPStan

Browse Source
This commit is contained in:
amir-ys
2024-11-07 01:41:19 +03:30
parent b7efa6b24a
commit 865d565a91
27 changed files with 1023 additions and 642 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/FakeModel.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace App;
use App\Services\Media\HasMediaTrait;
use Illuminate\Database\Eloquent\Model;
use Spatie\MediaLibrary\HasMedia\HasMedia;
use Spatie\MediaLibrary\HasMedia;
class FakeModel extends Model implements HasMedia
{
app/Http/Controllers/Api/Auth/RegisterController.php
+3 -3
View File
@@ -3,9 +3,9 @@
namespace App\Http\Controllers\Api\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use App\User;
use Illuminate\Http\Request;
use Packages\Messaging\src\Facades\MessageResponse;
class RegisterController extends Controller
{
@@ -18,7 +18,7 @@ class RegisterController extends Controller
public function register(Request $request)
{
if (auth('api')->user()->cant('store', User::class)) {
return \MessageResponse::error(trans('messages.failed'));
return MessageResponse::error(trans('messages.failed'));
}
$this->validate($request, $this->rules(), $this->validationErrorMessages());
app/Http/Controllers/Api/Auth/ResetPasswordController.php
+10 -7
View File
@@ -3,7 +3,10 @@
namespace App\Http\Controllers\Api\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Packages\Messaging\src\Facades\MessageResponse;
class ResetPasswordController extends Controller
{
@@ -16,8 +19,8 @@ class ResetPasswordController extends Controller
/**
* Reset the given user's password.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
* @param Request $request
* @return JsonResponse
*/
public function reset(Request $request)
{
@@ -25,20 +28,20 @@ class ResetPasswordController extends Controller
if (auth('api')->check()) {
$user = auth('api')->user();
$user->password = \Hash::make($request->password);
$user->password = Hash::make($request->password);
$user->save();
return \MessageResponse::success('Success Change Password');
return MessageResponse::success('Success Change Password');
}
return \MessageResponse::success('You Are Not Login');
return MessageResponse::success('You Are Not Login');
}
/**
* Validate the email for the given request.
*
* @param \Illuminate\Http\Request $request
* @param Request $request
* @return void
*/
protected function validatePassword(Request $request)
protected function validatePassword(Request $request): void
{
$request->validate(['password' => 'required|confirmed|min:8',]);
}
app/Http/Controllers/BarCodeController.php
+8 -7
View File
@@ -2,10 +2,11 @@
namespace App\Http\Controllers;
use \Milon\Barcode\Facades\DNS1DFacade;
use \Milon\Barcode\Facades\DNS2DFacade;
use App\TestResult;
use App\Package;
use App\TestResult;
use Milon\Barcode\Facades\DNS1DFacade;
use Milon\Barcode\Facades\DNS2DFacade;
use Packages\Messaging\src\Facades\MessageResponse;
class BarCodeController extends Controller
{
@@ -20,7 +21,7 @@
$QRCode = DNS2DFacade::getBarcodePNG($Number, "QRCODE");
}
return \MessageResponse::data( [ 'Barcode' => 'data:image/png;base64,' . $Barcode , 'QRCode' => 'data:image/png;base64,' . $QRCode , 'ShowLink' => $ShowLink ] );
return MessageResponse::data(['Barcode' => 'data:image/png;base64,' . $Barcode, 'QRCode' => 'data:image/png;base64,' . $QRCode, 'ShowLink' => $ShowLink]);
}
}
@@ -29,7 +30,7 @@
if ($TestResult) {
$URL = 'https://www.cssd-doc.com/ShowTestResult/' . $TestResult->id;
$QRCode = DNS2DFacade::getBarcodePNG($URL, "QRCODE");
return \MessageResponse::data( [ 'QRCode' => 'data:image/png;base64,' . $QRCode ] );
return MessageResponse::data(['QRCode' => 'data:image/png;base64,' . $QRCode]);
}
}
@@ -42,7 +43,7 @@
$Barcode = DNS1DFacade::getBarcodePNG($Number, "C128");
$QRCode = DNS2DFacade::getBarcodePNG($Number, "QRCODE");
$Package = Package::where('unique_id', $Number)->first();
return \MessageResponse::data( [ 'Barcode' => $Barcode , 'QRCode' => $QRCode , 'ShowLink' => 'Show/Package/' . $Package->id ] );
return MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode, 'ShowLink' => 'Show/Package/' . $Package->id]);
}
}
@@ -50,6 +51,6 @@
{
$URL = 'https://www.cssd-doc.com/Show/Package/' . $Package->id;
$QRCode = DNS2DFacade::getBarcodePNG($URL, "QRCODE");
return \MessageResponse::data( [ 'QRCode' => 'data:image/png;base64,' . $QRCode ] );
return MessageResponse::data(['QRCode' => 'data:image/png;base64,' . $QRCode]);
}
}
app/Http/Controllers/Media/DestroyMedia.php
+3 -2
View File
@@ -3,12 +3,13 @@
namespace App\Http\Controllers\Media;
use App\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
use Packages\Messaging\src\Facades\MessageResponse;
use Spatie\MediaLibrary\Models\Media;
use Spatie\MediaLibrary\MediaCollections\Models\Media;
class DestroyMedia extends Controller
{
public function __invoke(Media $media)
public function __invoke(Media $media): JsonResponse
{
$media->delete();
return MessageResponse::success(null, trans('messages.success'));
app/Http/Controllers/MessageController.php
+23 -19
View File
@@ -2,10 +2,11 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Http\Requests\StoreMessageRequest;
use App\Message;
use App\User;
use Illuminate\Http\Request;
use Packages\Messaging\src\Facades\MessageResponse;
class MessageController extends Controller
{
@@ -53,27 +54,27 @@ class MessageController extends Controller
// return $value['id'] != $remove;
// });
return \MessageResponse::data($Users);
return MessageResponse::data($Users);
}
public function create()
{
}
public function show($UserID)
{
// if (!auth('api')->user()->can('show', $Message)) {
// return \MessageResponse::error(trans('messages.access_denied'));
// return MessageResponse::error(trans('messages.access_denied'));
// }
$User = User::findOrFail($UserID);
// $SendMessages = Message::where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID)->get();
$ReceivedMessages = Message::where('sender_user_id', $UserID)->where('recipient_user_id', auth('api')->user()->id)->get();
$Messages = Message::where(function ($query) use ($UserID)
{
$Messages = Message::where(function ($query) use ($UserID) {
$query->where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID);
})->orWhere(function ($query) use ($UserID)
{
})->orWhere(function ($query) use ($UserID) {
$query->where('sender_user_id', $UserID)->where('recipient_user_id', auth('api')->user()->id);
})->get();
@@ -82,8 +83,9 @@ class MessageController extends Controller
$ReceivedMessage->save();
}
return \MessageResponse::data($Messages);
return MessageResponse::data($Messages);
}
public function store(StoreMessageRequest $request)
{
$MessageData = [
@@ -94,37 +96,39 @@ class MessageController extends Controller
'status' => 'UnRead',
];
Message::create($MessageData);
return \MessageResponse::success(trans('messages.success'));
return MessageResponse::success(trans('messages.success'));
}
public function edit(Message $Message)
{
// return \MessageResponse::data($Message);
// return MessageResponse::data($Message);
}
public function update(StoreMessageRequest $request, Message $Message)
{
// $Message->update($request->all());
// return \MessageResponse::success(trans('messages.success'));
// return MessageResponse::success(trans('messages.success'));
}
public function destroy(Message $Message)
{
if (auth('api')->user()->cant('delete', $Message)) {
return \MessageResponse::error(trans('messages.access_denied'));
return MessageResponse::error(trans('messages.access_denied'));
}
$Message->delete();
return \MessageResponse::success(trans('messages.success'));
return MessageResponse::success(trans('messages.success'));
}
public function destroyUserMessages(User $User)
{
// if (auth('api')->user()->cant('deleteUserMessage', Message::class)) {
// return \MessageResponse::error(trans('messages.access_denied'));
// return MessageResponse::error(trans('messages.access_denied'));
// }
Message::where(function ($query) use ($User)
{
Message::where(function ($query) use ($User) {
$query->where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $User->id);
})->orWhere(function ($query) use ($User)
{
})->orWhere(function ($query) use ($User) {
$query->where('sender_user_id', $User->id)->where('recipient_user_id', auth('api')->user()->id);
})->get()->each->delete();
return \MessageResponse::success(trans('messages.success'));
return MessageResponse::success(trans('messages.success'));
}
}
app/Http/Controllers/TestResultController.php
+2 -1
View File
@@ -12,6 +12,7 @@ use App\TestResult;
use App\TestType;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
use Packages\Messaging\src\Facades\MessageResponse;
class TestResultController extends Controller
@@ -236,7 +237,7 @@ class TestResultController extends Controller
public static function storage_path($path)
{
if ( starts_with( $path , 'media/' ) ) {
if (Str::startsWith($path, 'media/')) {
$path = substr($path, 6);
}
return $path;
app/Http/Controllers/TestTypeController.php
+29 -36
View File
@@ -2,33 +2,29 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\TestType;
use App\TestResult;
use App\Http\Requests\StoreTestTypeRequest;
use App\Input;
use App\Option;
use App\Http\Requests\StoreTestTypeRequest;
use \Milon\Barcode\DNS1D;
use \Milon\Barcode\DNS2D;
use App\TestResult;
use App\TestType;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Milon\Barcode\Facades\DNS1DFacade;
use Milon\Barcode\Facades\DNS2DFacade;
use Packages\Messaging\src\Facades\MessageResponse;
use App\InputValue;
use App\Gallery;
use App\Uploadable;
use Illuminate\Support\Facades\Storage;
class TestTypeController extends Controller
{
public function index(Request $request)
{
if (!auth('api')->user()->can('list', TestType::class)) {
return \MessageResponse::error(trans('messages.access_denied'));
return MessageResponse::error(trans('messages.access_denied'));
}
$TestTypes = TestType::when($request->has('name') && $request->name, function ($query) use ($request) {
$query->where('name', 'LIKE', '%' . $request->name . '%');
})
->when(($request->has('fromPicker') && $request->fromPicker) || ($request->has('upToPicker') && $request->upToPicker), function ($query) use ($request)
{
->when(($request->has('fromPicker') && $request->fromPicker) || ($request->has('upToPicker') && $request->upToPicker), function ($query) use ($request) {
$from = ($request->fromPicker) ? date($request->fromPicker . ' 00:00:00') : date('2010-01-01' . ' 00:00:00');
$upTo = ($request->upToPicker) ? date($request->upToPicker . ' 23:59:59') : date('Y-m-d' . ' 23:59:59');
return $query->whereBetween('created_at', [$from, $upTo]);
@@ -49,20 +45,20 @@ class TestTypeController extends Controller
$query->select('id', 'name');
}])->orderByDesc('id')->paginate(10);
return \MessageResponse::data($TestTypes);
return MessageResponse::data($TestTypes);
}
public function generateBarcode(TestType $TestType)
{
if (!auth('api')->user()->can('generateBarcode', $TestType)) {
return \MessageResponse::error(trans('messages.access_denied'));
return MessageResponse::error(trans('messages.access_denied'));
}
$Number = $TestType->unique_code;
$Barcode = DNS1D::getBarcodePNGUri($Number, "C128");
$QRCode = DNS2D::getBarcodePNGUri($Number, "QRCODE");
$Barcode = DNS1DFacade::getBarcodePNGUri($Number, "C128");
$QRCode = DNS2DFacade::getBarcodePNGUri($Number, "QRCODE");
$TestType->update(['bar_code' => $Barcode]);
return \MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode]);
return MessageResponse::data(['Barcode' => $Barcode, 'QRCode' => $QRCode]);
}
public function create()
@@ -116,7 +112,7 @@ class TestTypeController extends Controller
public function store(StoreTestTypeRequest $request)
{
try {
$return_value = \DB::transaction(function () use ($request) {
$return_value = DB::transaction(function () use ($request) {
$TestType = [
'name' => $request['name'],
@@ -140,7 +136,7 @@ class TestTypeController extends Controller
} catch (\Exception $e) {
return response()->json($e->getMessage(), 441);
}
return \MessageResponse::success(null,trans('messages.create'));
return MessageResponse::success(null, trans('messages.create'));
}
public function show($id)
@@ -202,7 +198,7 @@ class TestTypeController extends Controller
public function edit(TestType $TestType)
{
if (count($TestType->test_results) > 0) {
return \MessageResponse::error(trans('messages.access_denied'));
return MessageResponse::error(trans('messages.access_denied'));
}
$Inputs = Input::with('children', 'options', 'children.options')->where('test_type_id', $TestType->id)->where('parent_id', null)->get();
@@ -227,7 +223,7 @@ class TestTypeController extends Controller
'device_label' => $TestType->device_label,
'info' => $Info,
];
return \MessageResponse::data($TestTypeInfo);
return MessageResponse::data($TestTypeInfo);
}
//////////////////////////////////////////////////////////////////////////////////////////////////
@@ -263,8 +259,7 @@ class TestTypeController extends Controller
foreach ($Input['options'] as $Option) {
if ($Option['id'] == 0) {//--new
$Option = Option::create(['title' => $Option['title'], 'input_id' => $Input['id']]);
}
else {
} else {
//**************************
if (in_array($Option['id'], $DeletedOptionIDs)) {
foreach ($DeletedOptionIDs as $index => $DeletedOptionID) {
@@ -304,8 +299,7 @@ class TestTypeController extends Controller
if (isset($InputChild['children'])) {
$this->CreateChildForm($InputChild, $TestType, $InputChildObj);
}
}
else {
} else {
//******************************
if (in_array($InputChild['id'], $DeletedChildIDs)) {
foreach ($DeletedChildIDs as $index => $DeletedChildID) {
@@ -351,8 +345,7 @@ class TestTypeController extends Controller
foreach ($TestTypeInfo as $Input) {
if ($Input['id'] == 0) {//--new
$InputObj = $this->CreateInput($Input, $TestType);
}
else {
} else {
//**************************
if (in_array($Input['id'], $DeletedInputIDs)) {
foreach ($DeletedInputIDs as $index => $DeletedInputID) {
@@ -382,7 +375,7 @@ class TestTypeController extends Controller
}
//******************************
return \MessageResponse::success(null,trans('messages.update'));
return MessageResponse::success(null, trans('messages.update'));
}
/////////////////////////////////////////////////////////////////////////////////////
@@ -390,7 +383,7 @@ class TestTypeController extends Controller
public function getInputs(Request $request)
{
if (auth('api')->user()->can('getInputs')) {
return \MessageResponse::error(trans('messages.failed'));
return MessageResponse::error(trans('messages.failed'));
}
if ($request->test_result_id !== '') {
$testTypeId = TestResult::find($request->test_result_id);
@@ -414,27 +407,27 @@ class TestTypeController extends Controller
}]
)->whereNull('parent_id')->where('test_type_id', $testType->id)->get();
return \MessageResponse::data(['testType' => $testType, 'inputs' => $inputs]);
return MessageResponse::data(['testType' => $testType, 'inputs' => $inputs]);
}
return \MessageResponse::error();
return MessageResponse::error();
}
public function listNames()
{
$testType = TestType::pluck('name');
return \MessageResponse::data($testType);
return MessageResponse::data($testType);
}
public function destroy(TestType $TestType)
{
if (!auth('api')->user()->can('delete', $TestType)) {
return \MessageResponse::error(trans('messages.access_denied'));
return MessageResponse::error(trans('messages.access_denied'));
}
$UniqueID = substr(base_convert(sha1(uniqid(mt_rand())), 16, 36), 0, 10);
$TestType->unique_code = $TestType->unique_code . '--' . $UniqueID;
$TestType->save();
$TestType->delete();
return \MessageResponse::success(trans('messages.success'));
return MessageResponse::success(trans('messages.success'));
}
}
app/Http/Middleware/Authenticate.php
+3 -7
View File
@@ -3,19 +3,15 @@
namespace App\Http\Middleware;
use Illuminate\Auth\Middleware\Authenticate as Middleware;
use Illuminate\Http\Request;
class Authenticate extends Middleware
{
/**
* Get the path the user should be redirected to when they are not authenticated.
*
* @param \Illuminate\Http\Request $request
* @return string
*/
protected function redirectTo($request)
protected function redirectTo(Request $request): ?string
{
if (! $request->expectsJson()) {
return route('login');
}
return $request->expectsJson() ? null : route('login');
}
}
app/Http/Middleware/TrustProxies.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace App\Http\Middleware;
use Fideloper\Proxy\TrustProxies as Middleware;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Symfony\Component\HttpFoundation\Request as RequestAlias;
class TrustProxies extends Middleware
app/Item.php
+8 -4
View File
@@ -3,10 +3,11 @@
namespace App;
use App\Constants\StatusTypeEnum;
use Illuminate\Database\Eloquent\Model;
use Spatie\MediaLibrary\HasMedia\HasMedia;
use App\Services\Media\HasMediaTrait;
use Spatie\MediaLibrary\Models\Media;
use Illuminate\Database\Eloquent\Model;
use Spatie\Image\Exceptions\InvalidManipulation;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\MediaCollections\Models\Media;
class Item extends Model implements HasMedia
{
@@ -61,7 +62,10 @@ class Item extends Model implements HasMedia
->useFallbackPath(public_path('/files/default_pastry.jpg'));
}
public function registerMediaConversions( Media $media = null )
/**
* @throws InvalidManipulation
*/
public function registerMediaConversions(Media $media = null): void
{
$this->addMediaConversion('thumbnail')
->width(480)
app/Services/Media/HasMediaTrait.php
+3 -2
View File
@@ -2,11 +2,12 @@
namespace App\Services\Media;
use Spatie\MediaLibrary\HasMedia\HasMediaTrait as BasicHasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;
trait HasMediaTrait
{
use BasicHasMedia;
use InteractsWithMedia;
public function main_image()
{
app/Services/Media/Media.php
+2 -2
View File
@@ -2,11 +2,11 @@
namespace App\Services\Media;
use Spatie\MediaLibrary\Models\Media as BaseMedia;
use Spatie\MediaLibrary\MediaCollections\Models\Media as BaseMedia;
class Media extends BaseMedia
{
public function getTable()
public function getTable(): string
{
return 'media';
}
app/Services/Media/PathGenerator.php
+7 -3
View File
@@ -2,15 +2,19 @@
namespace App\Services\Media;
use Spatie\MediaLibrary\Models\Media;
use Spatie\MediaLibrary\PathGenerator\PathGenerator as BasePathGenerator;
use Spatie\MediaLibrary\MediaCollections\Models\Media;
use Spatie\MediaLibrary\Support\PathGenerator\DefaultPathGenerator;
class PathGenerator implements BasePathGenerator
class PathGenerator extends DefaultPathGenerator
{
/*
* Get the path for the given media, relative to the root storage path.
*/
/**
* @param Media $media
* @return string
*/
public function getPath(Media $media): string
{
return md5($media->id) . '/';
app/Services/Media/UrlGenerator/FtpUrlGenerator.php
+5 -7
View File
@@ -3,8 +3,8 @@
namespace App\Services\Media\UrlGenerator;
use DateTimeInterface;
use Spatie\MediaLibrary\UrlGenerator\BaseUrlGenerator;
use Spatie\MediaLibrary\Exceptions\UrlCannotBeDetermined;
use Spatie\MediaLibrary\MediaCollections\Exceptions\InvalidUrlGenerator;
use Spatie\MediaLibrary\Support\UrlGenerator\BaseUrlGenerator;
class FtpUrlGenerator extends BaseUrlGenerator
{
@@ -23,13 +23,11 @@ class FtpUrlGenerator extends BaseUrlGenerator
* @param array $options
*
* @return string
*
* @throws UrlCannotBeDetermined
* @throws InvalidUrlGenerator
*/
public function getTemporaryUrl(DateTimeInterface $expiration, array $options = []): string
{
throw UrlCannotBeDetermined::filesystemDoesNotSupportTemporaryUrls();
return 'done';
throw new InvalidUrlGenerator();
}
/**
@@ -38,7 +36,7 @@ class FtpUrlGenerator extends BaseUrlGenerator
* @return string
*
*/
public function getPath()
public function getPath(): string
{
return $this->getPathRelativeToRoot();
}
app/Services/Media/UrlGenerator/S3UrlGenerator.php
+1 -1
View File
@@ -3,7 +3,7 @@
namespace App\Services\Media\UrlGenerator;
use DateTimeInterface;
use Spatie\MediaLibrary\UrlGenerator\BaseUrlGenerator;
use Spatie\MediaLibrary\Support\UrlGenerator\BaseUrlGenerator;
class S3UrlGenerator extends BaseUrlGenerator
{
app/TestResult.php
+8 -4
View File
@@ -2,10 +2,11 @@
namespace App;
use Illuminate\Database\Eloquent\Model;
use Spatie\MediaLibrary\HasMedia\HasMedia;
use App\Services\Media\HasMediaTrait;
use Spatie\MediaLibrary\Models\Media;
use Illuminate\Database\Eloquent\Model;
use Spatie\Image\Exceptions\InvalidManipulation;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\MediaCollections\Models\Media;
class TestResult extends Model implements HasMedia
{
@@ -28,13 +29,16 @@ class TestResult extends Model implements HasMedia
return $this->hasMany('App\InputValue');
}
public function registerMediaCollections()
public function registerMediaCollections(): void
{
$this->addMediaCollection('files')
->useFallbackUrl('/files/default_pastry.jpg')
->useFallbackPath(public_path('/files/default_pastry.jpg'));
}
/**
* @throws InvalidManipulation
*/
public function registerMediaConversions(Media $media = null): void
{
$this->addMediaConversion('thumbnail')
composer.json
+2
View File
@@ -27,6 +27,8 @@
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^7.0",
"nunomaduro/larastan": "^2.9",
"phpstan/phpstan": "^1.12",
"phpunit/phpunit": "^10.0"
},
"config": {
composer.lock
Generated
+250 -1
View File
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "e2748582c5a2c41a9931dc128d1bf8cb",
"content-hash": "d40968ccde886735623454e5620cb78b",
"packages": [
{
"name": "aws/aws-crt-php",
@@ -9579,6 +9579,110 @@
],
"time": "2024-10-15T15:12:40+00:00"
},
{
"name": "nunomaduro/larastan",
"version": "v2.9.10",
"source": {
"type": "git",
"url": "https://github.com/larastan/larastan.git",
"reference": "9e7233d88f4f10796fadb8a2d85c5f2b55277c76"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/larastan/larastan/zipball/9e7233d88f4f10796fadb8a2d85c5f2b55277c76",
"reference": "9e7233d88f4f10796fadb8a2d85c5f2b55277c76",
"shasum": ""
},
"require": {
"ext-json": "*",
"illuminate/console": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/container": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/contracts": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/database": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/http": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/pipeline": "^9.52.16 || ^10.28.0 || ^11.16",
"illuminate/support": "^9.52.16 || ^10.28.0 || ^11.16",
"php": "^8.0.2",
"phpmyadmin/sql-parser": "^5.9.0",
"phpstan/phpstan": "^1.12.5"
},
"require-dev": {
"doctrine/coding-standard": "^12.0",
"nikic/php-parser": "^4.19.1",
"orchestra/canvas": "^7.11.1 || ^8.11.0 || ^9.0.2",
"orchestra/testbench": "^7.33.0 || ^8.13.0 || ^9.0.3",
"phpstan/phpstan-deprecation-rules": "^1.2",
"phpunit/phpunit": "^9.6.13 || ^10.5.16"
},
"suggest": {
"orchestra/testbench": "Using Larastan for analysing a package needs Testbench"
},
"type": "phpstan-extension",
"extra": {
"branch-alias": {
"dev-master": "2.0-dev"
},
"phpstan": {
"includes": [
"extension.neon"
]
}
},
"autoload": {
"psr-4": {
"Larastan\\Larastan\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Can Vural",
"email": "can9119@gmail.com"
},
{
"name": "Nuno Maduro",
"email": "enunomaduro@gmail.com"
}
],
"description": "Larastan - Discover bugs in your code without running it. A phpstan/phpstan wrapper for Laravel",
"keywords": [
"PHPStan",
"code analyse",
"code analysis",
"larastan",
"laravel",
"package",
"php",
"static analysis"
],
"support": {
"issues": "https://github.com/larastan/larastan/issues",
"source": "https://github.com/larastan/larastan/tree/v2.9.10"
},
"funding": [
{
"url": "https://www.paypal.com/paypalme/enunomaduro",
"type": "custom"
},
{
"url": "https://github.com/canvural",
"type": "github"
},
{
"url": "https://github.com/nunomaduro",
"type": "github"
},
{
"url": "https://www.patreon.com/nunomaduro",
"type": "patreon"
}
],
"abandoned": "larastan/larastan",
"time": "2024-10-19T23:04:40+00:00"
},
{
"name": "phar-io/manifest",
"version": "2.0.4",
@@ -9697,6 +9801,151 @@
},
"time": "2022-02-21T01:04:05+00:00"
},
{
"name": "phpmyadmin/sql-parser",
"version": "5.10.0",
"source": {
"type": "git",
"url": "https://github.com/phpmyadmin/sql-parser.git",
"reference": "91d980ab76c3f152481e367f62b921adc38af451"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/91d980ab76c3f152481e367f62b921adc38af451",
"reference": "91d980ab76c3f152481e367f62b921adc38af451",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0",
"symfony/polyfill-mbstring": "^1.3",
"symfony/polyfill-php80": "^1.16"
},
"conflict": {
"phpmyadmin/motranslator": "<3.0"
},
"require-dev": {
"phpbench/phpbench": "^1.1",
"phpmyadmin/coding-standard": "^3.0",
"phpmyadmin/motranslator": "^4.0 || ^5.0",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.9.12",
"phpstan/phpstan-phpunit": "^1.3.3",
"phpunit/phpunit": "^8.5 || ^9.6",
"psalm/plugin-phpunit": "^0.16.1",
"vimeo/psalm": "^4.11",
"zumba/json-serializer": "~3.0.2"
},
"suggest": {
"ext-mbstring": "For best performance",
"phpmyadmin/motranslator": "Translate messages to your favorite locale"
},
"bin": [
"bin/highlight-query",
"bin/lint-query",
"bin/sql-parser",
"bin/tokenize-query"
],
"type": "library",
"autoload": {
"psr-4": {
"PhpMyAdmin\\SqlParser\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0-or-later"
],
"authors": [
{
"name": "The phpMyAdmin Team",
"email": "developers@phpmyadmin.net",
"homepage": "https://www.phpmyadmin.net/team/"
}
],
"description": "A validating SQL lexer and parser with a focus on MySQL dialect.",
"homepage": "https://github.com/phpmyadmin/sql-parser",
"keywords": [
"analysis",
"lexer",
"parser",
"query linter",
"sql",
"sql lexer",
"sql linter",
"sql parser",
"sql syntax highlighter",
"sql tokenizer"
],
"support": {
"issues": "https://github.com/phpmyadmin/sql-parser/issues",
"source": "https://github.com/phpmyadmin/sql-parser"
},
"funding": [
{
"url": "https://www.phpmyadmin.net/donate/",
"type": "other"
}
],
"time": "2024-08-29T20:56:34+00:00"
},
{
"name": "phpstan/phpstan",
"version": "1.12.8",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "f6a60a4d66142b8156c9da923f1972657bc4748c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/f6a60a4d66142b8156c9da923f1972657bc4748c",
"reference": "f6a60a4d66142b8156c9da923f1972657bc4748c",
"shasum": ""
},
"require": {
"php": "^7.2|^8.0"
},
"conflict": {
"phpstan/phpstan-shim": "*"
},
"bin": [
"phpstan",
"phpstan.phar"
],
"type": "library",
"autoload": {
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "PHPStan - PHP Static Analysis Tool",
"keywords": [
"dev",
"static analysis"
],
"support": {
"docs": "https://phpstan.org/user-guide/getting-started",
"forum": "https://github.com/phpstan/phpstan/discussions",
"issues": "https://github.com/phpstan/phpstan/issues",
"security": "https://github.com/phpstan/phpstan/security/policy",
"source": "https://github.com/phpstan/phpstan-src"
},
"funding": [
{
"url": "https://github.com/ondrejmirtes",
"type": "github"
},
{
"url": "https://github.com/phpstan",
"type": "github"
}
],
"time": "2024-11-06T19:06:49+00:00"
},
{
"name": "phpunit/php-code-coverage",
"version": "10.1.16",
config/medialibrary.php
+158 -53
View File
@@ -12,7 +12,13 @@ return [
* The maximum file size of an item in bytes.
* Adding a larger file will result in an exception.
*/
'max_file_size' => 1024 * 1024 * 10,
'max_file_size' => 1024 * 1024 * 10, // 10MB
/*
* This queue connection will be used to generate derived and responsive images.
* Leave empty to use the default queue connection.
*/
'queue_connection_name' => env('QUEUE_CONNECTION', 'sync'),
/*
* This queue will be used to generate derived and responsive images.
@@ -20,61 +26,78 @@ return [
*/
'queue_name' => '',
/*
* By default all conversions will be performed on a queue.
*/
'queue_conversions_by_default' => env('QUEUE_CONVERSIONS_BY_DEFAULT', true),
/*
* The fully qualified class name of the media model.
*/
'media_model' => Spatie\MediaLibrary\Models\Media::class,
'media_model' => Spatie\MediaLibrary\MediaCollections\Models\Media::class,
's3' => [
/*
* The domain that should be prepended when generating urls.
*/
'domain' => env('AWS_URL'),
],
'remote' => [
/*
* Any extra headers that should be included when uploading media to
* a remote disk. Even though supported headers may vary between
* different drivers, a sensible default has been provided.
* When enabled, media collections will be serialised using the default
* laravel model serialization behaviour.
*
* Supported by S3: CacheControl, Expires, StorageClass,
* ServerSideEncryption, Metadata, ACL, ContentEncoding
* Keep this option disabled if using Media Library Pro components (https://medialibrary.pro)
*/
'extra_headers' => [
'CacheControl' => 'max-age=604800',
],
],
'responsive_images' => [
'use_default_collection_serialization' => false,
/*
* This class is responsible for calculating the target widths of the responsive
* images. By default we optimize for filesize and create variations that each are 20%
* smaller than the previous one. More info in the documentation.
* The fully qualified class name of the model used for temporary uploads.
*
* https://docs.spatie.be/laravel-medialibrary/v7/advanced-usage/generating-responsive-images
* This model is only used in Media Library Pro (https://medialibrary.pro)
*/
'width_calculator' => Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\FileSizeOptimizedWidthCalculator::class,
'temporary_upload_model' => Spatie\MediaLibraryPro\Models\TemporaryUpload::class,
/*
* By default rendering media to a responsive image will add some javascript and a tiny placeholder.
* This ensures that the browser can already determine the correct layout.
* When enabled, Media Library Pro will only process temporary uploads that were uploaded
* in the same session. You can opt to disable this for stateless usage of
* the pro components.
*/
'use_tiny_placeholders' => true,
'enable_temporary_uploads_session_affinity' => true,
/*
* This class will generate the tiny placeholder used for progressive image loading. By default
* the medialibrary will use a tiny blurred jpg image.
* When enabled, Media Library pro will generate thumbnails for uploaded file.
*/
'tiny_placeholder_generator' => Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
'generate_thumbnails_for_temporary_uploads' => true,
/*
* This is the class that is responsible for naming generated files.
*/
'file_namer' => Spatie\MediaLibrary\Support\FileNamer\DefaultFileNamer::class,
/*
* The class that contains the strategy for determining a media file's path.
*/
'path_generator' => Spatie\MediaLibrary\Support\PathGenerator\DefaultPathGenerator::class,
/*
* The class that contains the strategy for determining how to remove files.
*/
'file_remover_class' => Spatie\MediaLibrary\Support\FileRemover\DefaultFileRemover::class,
/*
* Here you can specify which path generator should be used for the given class.
*/
'custom_path_generators' => [
// Model::class => PathGenerator::class
// or
// 'model_morph_alias' => PathGenerator::class
],
/*
* When urls to files get generated, this class will be called. Leave empty
* When urls to files get generated, this class will be called. Use the default
* if your files are stored locally above the site root or on s3.
*/
'url_generator' => null,
'url_generator' => Spatie\MediaLibrary\Support\UrlGenerator\DefaultUrlGenerator::class,
/*
* Moves media on updating to keep path consistent. Enable it only with a custom
* PathGenerator that uses, for example, the media UUID.
*/
'moves_media_on_update' => false,
/*
* Whether to activate versioning when urls to files get generated.
@@ -83,17 +106,14 @@ return [
'version_urls' => false,
/*
* The class that contains the strategy for determining a media file's path.
*/
'path_generator' => null,
/*
* Medialibrary will try to optimize all converted images by removing
* The media library will try to optimize all converted images by removing
* metadata and applying a little bit of compression. These are
* the optimizers that will be used by default.
*/
'image_optimizers' => [
Spatie\ImageOptimizer\Optimizers\Jpegoptim::class => [
'-m85', // set maximum quality to 85%
'--force', // ensure that progressive generation is always done also if a little bigger
'--strip-all', // this strips out all text information such as comments and EXIF data
'--all-progressive', // this will make sure the resulting image is a progressive one
],
@@ -112,19 +132,42 @@ return [
'-b', // required parameter for this package
'-O3', // this produces the slowest but best results
],
Spatie\ImageOptimizer\Optimizers\Cwebp::class => [
'-m 6', // for the slowest compression method in order to get the best compression.
'-pass 10', // for maximizing the amount of analysis pass.
'-mt', // multithreading for some speed improvements.
'-q 90', //quality factor that brings the least noticeable changes.
],
Spatie\ImageOptimizer\Optimizers\Avifenc::class => [
'-a cq-level=23', // constant quality level, lower values mean better quality and greater file size (0-63).
'-j all', // number of jobs (worker threads, "all" uses all available cores).
'--min 0', // min quantizer for color (0-63).
'--max 63', // max quantizer for color (0-63).
'--minalpha 0', // min quantizer for alpha (0-63).
'--maxalpha 63', // max quantizer for alpha (0-63).
'-a end-usage=q', // rate control mode set to Constant Quality mode.
'-a tune=ssim', // SSIM as tune the encoder for distortion metric.
],
],
/*
* These generators will be used to create an image of media files.
*/
'image_generators' => [
Spatie\MediaLibrary\ImageGenerators\FileTypes\Image::class,
Spatie\MediaLibrary\ImageGenerators\FileTypes\Webp::class,
Spatie\MediaLibrary\ImageGenerators\FileTypes\Pdf::class,
Spatie\MediaLibrary\ImageGenerators\FileTypes\Svg::class,
Spatie\MediaLibrary\ImageGenerators\FileTypes\Video::class,
Spatie\MediaLibrary\Conversions\ImageGenerators\Image::class,
Spatie\MediaLibrary\Conversions\ImageGenerators\Webp::class,
Spatie\MediaLibrary\Conversions\ImageGenerators\Avif::class,
Spatie\MediaLibrary\Conversions\ImageGenerators\Pdf::class,
Spatie\MediaLibrary\Conversions\ImageGenerators\Svg::class,
Spatie\MediaLibrary\Conversions\ImageGenerators\Video::class,
],
/*
* The path where to store temporary files while performing image conversions.
* If set to null, storage_path('media-library/temp') will be used.
*/
'temporary_directory_path' => null,
/*
* The engine that should perform the image conversions.
* Should be either `gd` or `imagick`.
@@ -139,18 +182,80 @@ return [
'ffmpeg_path' => env('FFMPEG_PATH', '/usr/bin/ffmpeg'),
'ffprobe_path' => env('FFPROBE_PATH', '/usr/bin/ffprobe'),
/*
* The path where to store temporary files while performing image conversions.
* If set to null, storage_path('medialibrary/temp') will be used.
*/
'temporary_directory_path' => null,
/*
* Here you can override the class names of the jobs used by this package. Make sure
* your custom jobs extend the ones provided by the package.
*/
'jobs' => [
'perform_conversions' => Spatie\MediaLibrary\Jobs\PerformConversions::class,
'generate_responsive_images' => Spatie\MediaLibrary\Jobs\GenerateResponsiveImages::class,
'perform_conversions' => Spatie\MediaLibrary\Conversions\Jobs\PerformConversionsJob::class,
'generate_responsive_images' => Spatie\MediaLibrary\ResponsiveImages\Jobs\GenerateResponsiveImagesJob::class,
],
/*
* When using the addMediaFromUrl method you may want to replace the default downloader.
* This is particularly useful when the url of the image is behind a firewall and
* need to add additional flags, possibly using curl.
*/
'media_downloader' => Spatie\MediaLibrary\Downloaders\DefaultDownloader::class,
'remote' => [
/*
* Any extra headers that should be included when uploading media to
* a remote disk. Even though supported headers may vary between
* different drivers, a sensible default has been provided.
*
* Supported by S3: CacheControl, Expires, StorageClass,
* ServerSideEncryption, Metadata, ACL, ContentEncoding
*/
'extra_headers' => [
'CacheControl' => 'max-age=604800',
],
],
'responsive_images' => [
/*
* This class is responsible for calculating the target widths of the responsive
* images. By default we optimize for filesize and create variations that each are 30%
* smaller than the previous one. More info in the documentation.
*
* https://docs.spatie.be/laravel-medialibrary/v9/advanced-usage/generating-responsive-images
*/
'width_calculator' => Spatie\MediaLibrary\ResponsiveImages\WidthCalculator\FileSizeOptimizedWidthCalculator::class,
/*
* By default rendering media to a responsive image will add some javascript and a tiny placeholder.
* This ensures that the browser can already determine the correct layout.
*/
'use_tiny_placeholders' => true,
/*
* This class will generate the tiny placeholder used for progressive image loading. By default
* the media library will use a tiny blurred jpg image.
*/
'tiny_placeholder_generator' => Spatie\MediaLibrary\ResponsiveImages\TinyPlaceholderGenerator\Blurred::class,
],
/*
* When enabling this option, a route will be registered that will enable
* the Media Library Pro Vue and React components to move uploaded files
* in a S3 bucket to their right place.
*/
'enable_vapor_uploads' => env('ENABLE_MEDIA_LIBRARY_VAPOR_UPLOADS', false),
/*
* When converting Media instances to response the media library will add
* a `loading` attribute to the `img` tag. Here you can set the default
* value of that attribute.
*
* Possible values: 'lazy', 'eager', 'auto' or null if you don't want to set any loading instruction.
*
* More info: https://css-tricks.com/native-lazy-loading/
*/
'default_loading_attribute_value' => null,
/*
* You can specify a prefix for that is used for storing all media.
* If you set this to `/my-subdir`, all your media will be stored in a `/my-subdir` directory.
*/
'prefix' => env('MEDIA_PREFIX', ''),
];
packages/Auth/SendsPasswordResetEmails.php
+6 -5
View File
@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
use App\User;
use Carbon\Carbon;
use App\Http\Controllers\Api\Auth\LoginController;
use Packages\Messaging\src\Facades\MessageResponse;
use Packages\SMSSender\SMSSender;
trait SendsPasswordResetEmails
@@ -32,7 +33,7 @@ trait SendsPasswordResetEmails
* Check Disposable Password And Login
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
* @return \Symfony\Component\HttpFoundation\Response
*/
public function checkDisposablePassword(Request $request)
{
@@ -48,9 +49,9 @@ trait SendsPasswordResetEmails
$request->merge([ 'cell_number' => $user->cell_number, 'password' => $password ]);
return (new LoginController())->login($request);
}
return \MessageResponse::error('User Not Found');
return MessageResponse::error('User Not Found');
}
return \MessageResponse::error('Error');
return MessageResponse::error('Error');
}
@@ -61,9 +62,9 @@ trait SendsPasswordResetEmails
$code = rand(100000, 999999);
\Cache::put($code, $user->id, Carbon::now()->addMinutes(30));
SMSSender::instance()->patternSend($request->cell_number, 'jqomyn42wo', ["verification-code" => $code]);
return \MessageResponse::success('Send Disposable Password');
return MessageResponse::success('Send Disposable Password');
}
return \MessageResponse::error('User Not Found');
return MessageResponse::error('User Not Found');
}
/**
packages/SMSSender/SMSSender.php
+6 -3
View File
@@ -10,11 +10,14 @@ class SMSSender
private $fromNumber = null;
private static $panel = null;
private function __construct() { }
private function __construct()
{
}
public static function instance() {
public static function instance()
{
if (static::$panel === null) {
static::$panel = new static();
static::$panel = new self();
}
return static::$panel;
}
routes/api.php
+2
View File
@@ -1,5 +1,6 @@
<?php
use Illuminate\Support\Facades\Route;
/*
|--------------------------------------------------------------------------
| API Routes
@@ -11,6 +12,7 @@
|
*/
Route::group(['namespace' => 'Api'],function () {
Route::post('/login', 'Auth\LoginController@login')->name('login');
routes/channels.php
+2
View File
@@ -11,6 +11,8 @@
|
*/
use Illuminate\Support\Facades\Broadcast;
Broadcast::channel('App.User.{id}', function ($user, $id) {
return (int) $user->id === (int) $id;
});
routes/console.php
+3 -1
View File
@@ -1,6 +1,7 @@
<?php
use Illuminate\Foundation\Inspiring;
use Illuminate\Support\Facades\Artisan;
/*
|--------------------------------------------------------------------------
@@ -15,4 +16,5 @@ use Illuminate\Foundation\Inspiring;
Artisan::command('inspire', function () {
$this->comment(Inspiring::quote());
})->describe('Display an inspiring quote');
})->purpose('Display an inspiring quote');
routes/routes.php
+6 -1
View File
@@ -12,4 +12,9 @@
*/
Route::post('oauth/token', '\Laravel\Passport\Http\Controllers\AccessTokenController@issueToken')->middleware('throttle');
use Illuminate\Support\Facades\Route;
Route::post(
'oauth/token',
'\Laravel\Passport\Http\Controllers\AccessTokenController@issueToken')
->middleware('throttle');
routes/web.php
+4 -4
View File
@@ -1,5 +1,7 @@
<?php
use Illuminate\Support\Facades\Route;
/*
|--------------------------------------------------------------------------
| Web Routes
@@ -10,11 +12,8 @@
| contains the "web" middleware group. Now create something great!
|
*/
//
// app()->bind('messages', function() {
// return new \App\Appended\Classes\Common\Response\MessageResponse;
// });
#todo move passport routes to own file
/*
|--------------------------------------------------------------------------
| Laravel Passport Routes
@@ -26,6 +25,7 @@
| This will use "auth:api" guard instead of "auth"
|
*/
Route::get('oauth/authorize', '\Laravel\Passport\Http\Controllers\AuthorizationController@authorize')->middleware('auth:api');
Route::delete('oauth/authorize', '\Laravel\Passport\Http\Controllers\DenyAuthorizationController@deny')->middleware('auth:api');
Route::post('oauth/authorize', '\Laravel\Passport\Http\Controllers\ApproveAuthorizationController@approve')->middleware('auth:api');