mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-10 19:01:05 +03:30
feat: upgrade laravel version from 8 to 9
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use Illuminate\Http\Request;
|
||||
use Fideloper\Proxy\TrustProxies as Middleware;
|
||||
use Symfony\Component\HttpFoundation\Request as RequestAlias;
|
||||
|
||||
class TrustProxies extends Middleware
|
||||
{
|
||||
@@ -19,5 +19,10 @@ class TrustProxies extends Middleware
|
||||
*
|
||||
* @var int
|
||||
*/
|
||||
protected $headers = Request::HEADER_X_FORWARDED_ALL;
|
||||
protected $headers =
|
||||
RequestAlias::HEADER_X_FORWARDED_FOR |
|
||||
RequestAlias::HEADER_X_FORWARDED_HOST |
|
||||
RequestAlias::HEADER_X_FORWARDED_PORT |
|
||||
RequestAlias::HEADER_X_FORWARDED_PROTO |
|
||||
RequestAlias::HEADER_X_FORWARDED_AWS_ELB;
|
||||
}
|
||||
|
||||
+8
-8
@@ -8,26 +8,26 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"require": {
|
||||
"php": "^7.4",
|
||||
"laravel/framework": "^8.0",
|
||||
"php": "^8.2",
|
||||
"laravel/framework": "^9.0",
|
||||
"laravel/passport": "^10.0",
|
||||
"coraxster/flysystem-aws-s3-v3-minio": "^1.0",
|
||||
"league/flysystem-aws-s3-v3": "^3.0",
|
||||
"fideloper/proxy": "^4.0",
|
||||
"spatie/laravel-medialibrary": "^7.0",
|
||||
"kalnoy/nestedset": "^5.0",
|
||||
"spatie/laravel-medialibrary": "^9.0",
|
||||
"kalnoy/nestedset": "^6.0",
|
||||
"laravel/tinker": "^2.0",
|
||||
"lcobucci/jwt": "^4.0",
|
||||
"maatwebsite/excel": "^3.1",
|
||||
"milon/barcode": "^8.0",
|
||||
"milon/barcode": "^9.0",
|
||||
"sentry/sentry-laravel": "^2.3",
|
||||
"spatie/laravel-permission": "^3.0"
|
||||
"spatie/laravel-permission": "^5.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"beyondcode/laravel-dump-server": "^1.0",
|
||||
"filp/whoops": "^2.0",
|
||||
"fzaninotto/faker": "^1.4",
|
||||
"mockery/mockery": "^1.0",
|
||||
"nunomaduro/collision": "^5.0",
|
||||
"nunomaduro/collision": "^6.1",
|
||||
"phpunit/phpunit": "^9"
|
||||
},
|
||||
"config": {
|
||||
|
||||
Generated
+1438
-1349
File diff suppressed because it is too large
Load Diff
@@ -63,8 +63,8 @@ return [
|
||||
'bucket' => env('AWS_BUCKET'),
|
||||
'url' => env('AWS_URL'),
|
||||
'endpoint' => env('AWS_ENDPOINT'),
|
||||
'root' => 'media',
|
||||
'use_path_style_endpoint' => true,
|
||||
'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
|
||||
'throw' => true,
|
||||
],
|
||||
|
||||
'media-dev' => [
|
||||
|
||||
+1
-1
@@ -166,7 +166,7 @@ return [
|
||||
|
|
||||
*/
|
||||
|
||||
'secure' => env('SESSION_SECURE_COOKIE', false),
|
||||
'secure' => env('SESSION_SECURE_COOKIE', null),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
||||
@@ -1,11 +1,22 @@
|
||||
<?php
|
||||
|
||||
namespace Packages\Messaging\src\Facades;
|
||||
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Support\Facades\Facade;
|
||||
use Packages\Messaging\src\Message;
|
||||
|
||||
class MessageResponse extends Facade {
|
||||
|
||||
protected static function getFacadeAccessor() { return Message::class; }
|
||||
/**
|
||||
* @method static JsonResponse success($message = null, $title = null, $data = null, $status = 'Success')
|
||||
* @method static JsonResponse error($message = null, $title = null, $status = 'Faild', $statusCode = 422)
|
||||
* @method static JsonResponse data($data = null, $status = 'Success')
|
||||
*
|
||||
*/
|
||||
class MessageResponse extends Facade
|
||||
{
|
||||
|
||||
protected static function getFacadeAccessor(): string
|
||||
{
|
||||
return Message::class;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,22 +2,47 @@
|
||||
|
||||
namespace Packages\Messaging\src;
|
||||
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Symfony\Component\HttpFoundation\Response as ResponseAlias;
|
||||
|
||||
class Message
|
||||
{
|
||||
public function success($message = null, $title = null, $data = null, $status = 'Success' )
|
||||
public function success($message = null, $title = null, $data = null, $status = 'Success'): JsonResponse
|
||||
{
|
||||
$message = isset($message) ? $message : trans('messages.success_message');
|
||||
$title = isset($title) ? $title : trans('messages.success');
|
||||
return response()->json(['status' => $status, 'message' => $message, 'title' => $title, 'data' => $data ], 200);
|
||||
$message = $message ?? trans('messages.success_message');
|
||||
$title = $title ?? trans('messages.success');
|
||||
|
||||
return response()->json([
|
||||
'status' => $status,
|
||||
'message' => $message,
|
||||
'title' => $title,
|
||||
'data' => $data
|
||||
],
|
||||
ResponseAlias::HTTP_OK
|
||||
);
|
||||
}
|
||||
public function data($data = null, $status = 'Success')
|
||||
|
||||
public function data($data = null, $status = 'Success'): JsonResponse
|
||||
{
|
||||
return response()->json(['status' => $status, 'data' => $data ], 200);
|
||||
return response()->json([
|
||||
'status' => $status,
|
||||
'data' => $data
|
||||
],
|
||||
ResponseAlias::HTTP_OK
|
||||
);
|
||||
}
|
||||
public function error($message = null, $title = null, $status = 'Faild', $statusCode = 422 )
|
||||
|
||||
public function error($message = null, $title = null, $status = 'Faild', $statusCode = 422): JsonResponse
|
||||
{
|
||||
$message = isset($message) ? $message : trans('messages.failed_message');
|
||||
$title = isset($title) ? $title : trans('messages.failed');
|
||||
return response()->json(['status' => $status, 'errors' => ['message' => [$message]],'title' => $title], $statusCode);
|
||||
$message = $message ?? trans('messages.failed_message');
|
||||
$title = $title ?? trans('messages.failed');
|
||||
return response()->json([
|
||||
'status' => $status,
|
||||
'errors' => [
|
||||
'message' => [$message]
|
||||
], 'title' => $title
|
||||
],
|
||||
$statusCode
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user