Merge pull request #16 from amirhshokri/improve-code-styling

Improve readability with line breaks

Author: mbpcoder

src/SendJob.php

@@ -9,7 +9,6 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-
 class SendJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;

src/TelegramBotHandler.php

@@ -142,5 +142,4 @@ protected function send(string $message, $token = null, $chatId = null, $topicId
             dispatch(new SendJob($url, $message, $chatId, $topicId, $this->proxy, $this->timeout))->onQueue($this->queue);
         }
     }
-
 }

src/TelegramFormatter.php

@@ -53,9 +53,11 @@ public function __construct($html = true, $format = null, $dateFormat = null, $s
         $this->format = $format ?: self::MESSAGE_FORMAT;
         $this->dateFormat = $dateFormat ?: self::DATE_FORMAT;
         $this->separator = $separator;
+
         if (is_null($tags)) {
             $tags = '';
         }
+
         $this->tags = explode(',', $tags);
     }
 
@@ -65,18 +67,20 @@ public function __construct($html = true, $format = null, $dateFormat = null, $s
     public function format($record)
     {
         $message = '';
+
         if (isset($record['context']) && isset($record['context']['exception'])) {
             $exception = $record['context']['exception'];
+
             try {
                 $message = $this->getMessageForException($exception);
             } catch (\Exception $e) {
                 //
             }
+
             return $message;
         }
 
         return $this->getMessageForLog($record);
-
     }
 
     /**
@@ -85,6 +89,7 @@ public function format($record)
     public function formatBatch(array $records)
     {
         $message = '';
+
         foreach ($records as $record) {
             if (!empty($message)) {
                 $message .= str_repeat($this->separator, 15) . "\n";
@@ -100,11 +105,13 @@ protected function getMessageForException($exception)
     {
         $severity = '';
         $request = app('request');
+
         if (method_exists($exception, 'getSeverity')) {
             $severity = $this->getSeverityName($exception->getSeverity());
         }
 
         $code = $exception->getCode();
+
         if (method_exists($exception, 'getStatusCode')) {
             $code = $exception->getStatusCode();
         }
@@ -128,7 +135,6 @@ protected function getMessageForException($exception)
             // do noting
         }
 
-
         if (!is_null($request->user())) {
             $message .= PHP_EOL . '<b>User:</b> ' . $request->user()->id . ' / <b>Name:</b> ' . $request->user()->fullName;
         }
@@ -139,6 +145,7 @@ protected function getMessageForException($exception)
 
         if (!empty($request->getMethod())) {
             $message .= PHP_EOL . '<b>Request Method:</b> ' . $request->getMethod();
+
             if ($request->ajax()) {
                 $message .= ' <b>(Ajax)</b> ';
             }
@@ -156,6 +163,7 @@ protected function getMessageForException($exception)
     protected function getTags()
     {
         $message = '';
+
         foreach ($this->tags as $tag) {
             if (!empty($tag)) {
                 $message .= '#' . $tag . ' ';
@@ -224,9 +232,11 @@ protected function getSeverityName($key)
             8192 => 'DEPRECATED',
             16384 => 'USER_DEPRECATED',
         ];
+
         if (isset($severities[$key])) {
             return $severities[$key];
         }
+
         return '';
     }
 
@@ -245,6 +255,7 @@ protected function maskSensitiveData($request): array
         $data = $request->except($sensitiveFields);
 
         $maskedData = $request->only($sensitiveFields);
+
         foreach ($maskedData as $key => &$value) {
             $value = '*';
         }

src/TopicDetector.php

@@ -40,7 +40,6 @@ public function getTopicByAttribute(mixed $record): string|null
         return null;
     }
 
-
     // Route Function
     private function appRunningWithRequest(): bool
     {
@@ -64,12 +63,12 @@ private function getTopicByRoute(): string|null
 
         if ($controller !== null) {
             $topicId = $this->getTopicIdByReflection($controller, $method);
+
             if ($topicId === false) {
                 $topicId = $this->getTopicIdByRegex($controller, $method);
             }
         }
 
-
         return $topicId;
     }
 
@@ -79,6 +78,7 @@ private function appRunningWithJob(): bool
         if (isset($e->job) || app()->bound('queue.worker')) {
             return true;
         }
+
         return false;
     }
 
@@ -101,12 +101,15 @@ private function getTopicIdByJob(): string|int|null
     {
         $topicId = null;
         $jobClass = $this->getJobClass();
+
         if ($jobClass !== null) {
             $topicId = $this->getTopicIdByReflection($jobClass, 'handle');
+
             if ($topicId === false) {
                 $topicId = $this->getTopicIdByRegex($jobClass, 'handle');
             }
         }
+
         return $topicId;
     }
 
@@ -122,6 +125,7 @@ private function getCommandClass(): string|null
 
         if (str_contains($filePath, 'Console\Commands')) {
             $appPosition = strpos($filePath, 'app');
+
             if ($appPosition !== false) {
                 $appPath = substr($filePath, $appPosition);
                 return str_replace(['/', 'app', '.php'], ['\\', 'App', ''], $appPath);
@@ -141,12 +145,15 @@ private function getTopicIdByCommand(): string|int|null
     {
         $topicId = null;
         $commandClass = $this->getCommandClass();
+
         if ($commandClass !== null) {
             $topicId = $this->getTopicIdByReflection($commandClass, 'handle');
+
             if ($topicId === false) {
                 $topicId = $this->getTopicIdByRegex($commandClass, 'handle');
             }
         }
+
         return $topicId;
     }
 
@@ -167,25 +174,27 @@ private function getTopicIdByReflection(string $class, string $method): string|i
         } catch (\Throwable $e) {
 
         }
+
         return false;
     }
 
     private function getTopicIdByRegex(string $class, string $method): string|int|null
     {
         try {
-
             $filePath = base_path(str_replace('App', 'app', $class) . '.php');
             $fileContent = file_get_contents($filePath);
             $allAttributes = [];
 
             // Regex to match attributes and methods
             $regex = '/\#\[\s*(.*?)\s*\]\s*public\s*function\s*(\w+)/';
+
             if (preg_match_all($regex, $fileContent, $matches, PREG_SET_ORDER)) {
                 foreach ($matches as $match) {
                     $attributeString = $match[1];
                     $methodName = $match[2];
 
                     $attributes = array_map('trim', explode(',', $attributeString));
+
                     foreach ($attributes as $attribute) {
                         $attributeName = preg_replace('/\(.*/', '', $attribute);
                         $allAttributes[$methodName][] = $attributeName;
@@ -207,6 +216,7 @@ private function getTopicIdByRegex(string $class, string $method): string|int|nu
 
         } catch (\Throwable $e) {
         }
+
         return null;
     }
 
@@ -238,14 +248,11 @@ protected function getMainLivewireClass(): array
                 if (!empty($rootNamespace)) {
                     $class = '\\' . $rootNamespace . '\\' . $class;
                 }
-
             }
         } catch (\Throwable $exception) {
             //report($exception);
         }
 
         return [$class, $method];
-
     }
-
 }