From b845552c37d6bb6870e1dccedfb9df2af9339e15 Mon Sep 17 00:00:00 2001 From: Shift Date: Wed, 24 May 2023 21:32:56 +0000 Subject: [PATCH] Apply code style --- app/Enum/CurlErrorCodes.php | 4 +- app/Enum/Enum.php | 6 +-- .../Controllers/Api/AttachmentController.php | 16 ++++---- app/Http/Controllers/Api/OCRController.php | 38 ++++++++++--------- .../Api/SubscriptionController.php | 3 +- app/Models/Permission.php | 1 + tests/Feature/ContactFormTest.php | 2 + 7 files changed, 38 insertions(+), 32 deletions(-) diff --git a/app/Enum/CurlErrorCodes.php b/app/Enum/CurlErrorCodes.php index 64316ee..9429f13 100644 --- a/app/Enum/CurlErrorCodes.php +++ b/app/Enum/CurlErrorCodes.php @@ -80,7 +80,7 @@ class CurlErrorCodes extends Enum public const CURLE_RTSP_SESSION_ERROR = 86; public const CURLE_FTP_BAD_FILE_LIST = 87; public const CURLE_CHUNK_FAILED = 88; - + /** * Curl Error messages @@ -163,7 +163,7 @@ class CurlErrorCodes extends Enum 86 => 'CURLE_RTSP_SESSION_ERROR.', 87 => 'CURLE_FTP_BAD_FILE_LIST.', 88 => 'CURLE_CHUNK_FAILED.', - + ]; } diff --git a/app/Enum/Enum.php b/app/Enum/Enum.php index 6bf900b..5596e01 100644 --- a/app/Enum/Enum.php +++ b/app/Enum/Enum.php @@ -8,7 +8,7 @@ class Enum { /** * Message list - * + * * @var array> */ public static $messages = []; @@ -57,12 +57,12 @@ class Enum /** * Returns a message from the enum subclass - * + * * @return string */ public static function getMessage(int $messageIndex, string $defaultMessage = 'Unknown'): string { - if(array_key_exists($messageIndex, self::$messages) === true) { + if (array_key_exists($messageIndex, self::$messages) === true) { return self::$messages[$messageIndex]; } diff --git a/app/Http/Controllers/Api/AttachmentController.php b/app/Http/Controllers/Api/AttachmentController.php index 36a5acc..6586734 100644 --- a/app/Http/Controllers/Api/AttachmentController.php +++ b/app/Http/Controllers/Api/AttachmentController.php @@ -29,7 +29,7 @@ class AttachmentController extends ApiController /** * Store a newly created resource in storage. * - * @param \Illuminate\Http\Request $request + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function store(Request $request) @@ -40,7 +40,7 @@ class AttachmentController extends ApiController /** * Display the specified resource. * - * @param \App\Models\Attachment $attachment + * @param \App\Models\Attachment $attachment * @return \Illuminate\Http\Response */ public function show(Attachment $attachment) @@ -51,7 +51,7 @@ class AttachmentController extends ApiController /** * Show the form for editing the specified resource. * - * @param \App\Models\Attachment $attachment + * @param \App\Models\Attachment $attachment * @return \Illuminate\Http\Response */ public function edit(Attachment $attachment) @@ -62,11 +62,11 @@ class AttachmentController extends ApiController /** * Update the specified resource in storage. * - * @param \Illuminate\Http\Request $request - * @param \App\Models\Attachment $attachment + * @param \Illuminate\Http\Request $request + * @param \App\Models\Attachment $attachment * @return \Illuminate\Http\Response */ - public function update(Request $request, Attachment $attachment) + public function update(Request $request, Attachment $attachment) { // } @@ -74,10 +74,10 @@ class AttachmentController extends ApiController /** * Remove the specified resource from storage. * - * @param \App\Models\Attachment $attachment + * @param \App\Models\Attachment $attachment * @return \Illuminate\Http\Response */ - public function destroy(Attachment $attachment) + public function destroy(Attachment $attachment) { // } diff --git a/app/Http/Controllers/Api/OCRController.php b/app/Http/Controllers/Api/OCRController.php index cc02fd1..045f18d 100644 --- a/app/Http/Controllers/Api/OCRController.php +++ b/app/Http/Controllers/Api/OCRController.php @@ -32,7 +32,7 @@ class OCRController extends ApiController $data = ['ocr' => []]; $filters = $request->get('filters', ['tesseract']); - if(is_array($filters) === false) { + if (is_array($filters) === false) { $filters = explode(',', $filters); } @@ -52,9 +52,12 @@ class OCRController extends ApiController // We need progress updates to break the connection mid-way curl_setopt($ch, CURLOPT_BUFFERSIZE, 128); // more progress info curl_setopt($ch, CURLOPT_NOPROGRESS, false); - curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function( - $downloadSize, $downloaded, $uploadSize, $uploaded - ) use($maxDownloadSize) { + curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, function ( + $downloadSize, + $downloaded, + $uploadSize, + $uploaded + ) use ($maxDownloadSize) { return ($downloaded > $maxDownloadSize) ? 1 : 0; }); @@ -62,9 +65,9 @@ class OCRController extends ApiController $curlError = curl_errno($ch); $curlSize = curl_getinfo($ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD); curl_close($ch); - if($curlError !== 0) { + if ($curlError !== 0) { $error = 'File size is larger then allowed'; - if($curlError !== CurlErrorCodes::CURLE_ABORTED_BY_CALLBACK) { + if ($curlError !== CurlErrorCodes::CURLE_ABORTED_BY_CALLBACK) { $error = CurlErrorCodes::getMessage($curlError); } @@ -77,8 +80,8 @@ class OCRController extends ApiController // tesseract (overall) $ocr = null; - foreach($filters as $filterItem) { - if(str_starts_with($filterItem, 'tesseract') === true) { + foreach ($filters as $filterItem) { + if (str_starts_with($filterItem, 'tesseract') === true) { $ocr = new TesseractOCR(); $ocr->image($urlDownloadFilePath); if ($tesseractOEM !== null) { @@ -95,11 +98,10 @@ class OCRController extends ApiController } // Image Filter Function - $tesseractImageFilterFunc = function($filter, $options = null) use($curlResult, $curlSize, $ocr) { + $tesseractImageFilterFunc = function ($filter, $options = null) use ($curlResult, $curlSize, $ocr) { $result = ''; $img = imagecreatefromstring($curlResult); if ($img !== false && (($options !== null && imagefilter($img, $filter, $options) === true) || ($options === null && imagefilter($img, $filter) === true))) { - ob_start(); imagepng($img); $imgData = ob_get_contents(); @@ -108,7 +110,7 @@ class OCRController extends ApiController $ocr->imageData($imgData, $imgDataSize); imagedestroy($img); - + $result = $ocr->run(500); } @@ -116,7 +118,7 @@ class OCRController extends ApiController }; // Image Scale Function - $tesseractImageScaleFunc = function($scaleFunc) use ($curlResult, $ocr) { + $tesseractImageScaleFunc = function ($scaleFunc) use ($curlResult, $ocr) { $result = ''; $srcImage = imagecreatefromstring($curlResult); $srcWidth = imagesx($srcImage); @@ -133,7 +135,7 @@ class OCRController extends ApiController $imgData = ob_get_contents(); ob_end_clean(); $imgDataSize = strlen($imgData); - + imagedestroy($srcImage); imagedestroy($dstImage); @@ -143,7 +145,7 @@ class OCRController extends ApiController }; // filter: tesseract - if(in_array('tesseract', $filters) === true) { + if (in_array('tesseract', $filters) === true) { $data['ocr']['tesseract'] = $ocr->run(500); } @@ -154,14 +156,14 @@ class OCRController extends ApiController // filter: tesseract.double_scale if (in_array('tesseract.double_scale', $filters) === true) { - $data['ocr']['tesseract.double_scale'] = $tesseractImageScaleFunc(function($size) { + $data['ocr']['tesseract.double_scale'] = $tesseractImageScaleFunc(function ($size) { return $size * 2; }); } // filter: tesseract.half_scale if (in_array('tesseract.half_scale', $filters) === true) { - $data['ocr']['tesseract.half_scale'] = $tesseractImageScaleFunc(function($size) { + $data['ocr']['tesseract.half_scale'] = $tesseractImageScaleFunc(function ($size) { return $size / 2; }); } @@ -187,12 +189,12 @@ class OCRController extends ApiController } // filter: keras - if(in_array('keras', $filters) === true) { + if (in_array('keras', $filters) === true) { $cmd = '/usr/bin/python3 ' . base_path() . '/scripts/keras_oc.py ' . urlencode($url); $command = escapeshellcmd($cmd); $output = shell_exec($cmd); if ($output !== null && strlen($output) > 0) { - $output = substr($output, strpos($output, '----------START----------') + 25); + $output = substr($output, (strpos($output, '----------START----------') + 25)); } else { $output = ''; } diff --git a/app/Http/Controllers/Api/SubscriptionController.php b/app/Http/Controllers/Api/SubscriptionController.php index 3b5bfc2..4ff80c6 100644 --- a/app/Http/Controllers/Api/SubscriptionController.php +++ b/app/Http/Controllers/Api/SubscriptionController.php @@ -35,7 +35,8 @@ class SubscriptionController extends ApiController return $this->respondAsResource( $collection, ['isCollection' => true, - 'appendData' => ['total' => $total]] + 'appendData' => ['total' => $total] + ] ); } diff --git a/app/Models/Permission.php b/app/Models/Permission.php index 4b392e2..5c35923 100644 --- a/app/Models/Permission.php +++ b/app/Models/Permission.php @@ -21,6 +21,7 @@ class Permission extends Model 'user', ]; + /** * Get the User associated with this model * diff --git a/tests/Feature/ContactFormTest.php b/tests/Feature/ContactFormTest.php index 736bcf2..3bb7f94 100644 --- a/tests/Feature/ContactFormTest.php +++ b/tests/Feature/ContactFormTest.php @@ -1,4 +1,5 @@