Merge pull request #21 from spotlibs/feature/exploration

Feature/exploration

Author: m45adiwinata

bootstrap/app.php

@@ -25,6 +25,11 @@
 
 $app->withFacades();
 
+$app->singleton(
+    Illuminate\Contracts\Debug\ExceptionHandler::class,
+    Spotlibs\PhpLib\Exceptions\Handler::class
+);
+
 // $app->withEloquent();
 
 /*

config/logging.php

@@ -0,0 +1,34 @@
+<?php
+
+return [
+	'default' => env('LOG_CHANNEL', 'stack'),
+	'channels' => [
+		'runtime' => [
+            'driver' => 'single',
+            'formatter' => Monolog\Formatter\LineFormatter::class,
+		    'formatter_with' => [
+		        'format' => "[%datetime%] ::".getenv('APP_NAME').".".getenv('APP_ENV').".%level_name%:: %message%\n",
+		    ],
+            'path' => storage_path('logs/runtime.log'),
+            'level' => 'debug'
+        ],
+		'activity' => [
+			'driver' => 'single',
+			'formatter' => Monolog\Formatter\LineFormatter::class,
+		    'formatter_with' => [
+		        'format' => "[%datetime%] ::".getenv('APP_NAME').".".getenv('APP_ENV').".%level_name%:: %message%\n",
+		    ],
+            'path' => storage_path('logs/activity.log'),
+            'level' => 'debug'
+		],
+		'worker' => [
+			'driver' => 'single',
+			'formatter' => Monolog\Formatter\LineFormatter::class,
+		    'formatter_with' => [
+		        'format' => "[%datetime%] ::".getenv('APP_NAME').".".getenv('APP_ENV').".%level_name%:: %message%\n",
+		    ],
+            'path' => storage_path('logs/worker.log'),
+            'level' => 'debug'
+		]
+	]
+];

phpcs.xml

@@ -19,8 +19,9 @@
   <rule ref="Generic.PHP.RequireStrictTypes" />
   <file>src/</file>
   <exclude-pattern>tests/</exclude-pattern>
-  <exclude-pattern>vendor</exclude-pattern>
-  <exclude-pattern>resources</exclude-pattern>
+  <exclude-pattern>config/</exclude-pattern>
+  <exclude-pattern>vendor/</exclude-pattern>
+  <exclude-pattern>resources/</exclude-pattern>
   <exclude-pattern>database/</exclude-pattern>
   <exclude-pattern>storage/</exclude-pattern>
   <exclude-pattern>bootstrap/</exclude-pattern>

phpunit.xml

@@ -17,6 +17,10 @@
             <directory>tests</directory>
         </testsuite>
     </testsuites>
+    <php>
+        <env name="APP_NAME" value="SPOTLIBS_MICROSERVICE"/>
+        <env name="APP_ENV" value="local"/>
+    </php>
 
     <coverage cacheDirectory=".phpunit.cache/code-coverage"
               processUncoveredFiles="true">

src/Exceptions/Handler.php

@@ -17,7 +17,7 @@
 
 use Exception;
 use Laravel\Lumen\Exceptions\Handler as ExceptionHandler;
-use Illuminate\Support\Facades\Log;
+use Spotlibs\PhpLib\Logs\Log;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\QueryException;
@@ -28,6 +28,7 @@
 use Spotlibs\PhpLib\Exceptions\DataNotFoundException;
 use Spotlibs\PhpLib\Responses\StdResponse;
 use Throwable;
+use TypeError;
 
 /**
  * Class Handler
@@ -64,12 +65,16 @@ class Handler extends ExceptionHandler
      */
     public function report(Throwable $exception)
     {
-        // parent::report($exception);
+        $logData = [
+            'exception_code' => $exception->getCode(),
+            'message' => $exception->getMessage(),
+            'line' => $exception->getLine(),
+            'file' => $exception->getFile(),
+            'requestID' => app()->request->header('X-Request-ID') ?? null
+        ];
         if (!$exception instanceof ExceptionInterface && !$exception instanceof NotFoundHttpException && !$exception instanceof ValidationException) {
             if (!config('app.debug')) {
-                $message = '[' . $exception->getCode() . '] "' . $exception->getMessage() . '" on line ';
-                $message .= $exception->getLine() . ' of file ' . $exception->getFile() . ' [requestID:' . (app()->request->header('X-Request-ID') ?? null) . ']';
-                Log::channel('runtime')->error($message);
+                Log::runtime()->error($logData);
             } else {
                 parent::report($exception);
             }

src/Libraries/RestClient.php

@@ -18,7 +18,7 @@
 use GuzzleHttp\Client;
 use GuzzleHttp\Promise\PromiseInterface;
 use GuzzleHttp\Psr7\Response;
-use Spotlibs\PhpLib\Services\ContextService;
+use Spotlibs\PhpLib\Services\Context;
 use StdClass;
 
 /**
@@ -30,26 +30,25 @@
  * @license  https://mit-license.org/ MIT License
  * @link     https://github.com/spotlibs
  */
-
 class RestClient extends Client
 {
     private array $header;
     private string $method;
     private int $timeout;
     private bool $verify;
     private ?Response $response;
-    private ContextService $contextService;
+    private Context $contextService;
 
     /**
-     * Create a new controller instance.
+     * Create a new RestClient instance.
      *
      * @return self
      */
     public function __construct()
     {
         parent::__construct();
 
-        $this->contextService = app(ContextService::class);
+        $this->contextService = app(Context::class);
 
         $this->header = [];
         $this->method = $this->contextService->get('method') ?? 'POST';
@@ -191,7 +190,7 @@ public function setTimeout(int $timeout): void
      * @param string $uri      URI to request
      * @param string $method   request method (POST, GET, etc)
      *
-     * @return void
+     * @return StdClass
      */
     public function call(mixed $jsonBody, string $base_uri, string $uri = '/', string $method = ''): StdClass
     {