Fixes rakutentech#7

Read query log from source package

Author: kitloong

composer.json

@@ -17,8 +17,9 @@
  ],
  "require": {
  "php": "^7.3|^7.4|^8.0",
- "spatie/laravel-package-tools": "^1.4.3",
- "illuminate/contracts": "^8.37"
+ "illuminate/contracts": "^8.37",
+ "kitloong/laravel-app-logger": "^1.0",
+ "spatie/laravel-package-tools": "^1.4.3"
  },
  "require-dev": {
  "brianium/paratest": "^6.2",

src/LaravelRequestDocsMiddleware.php

@@ -2,20 +2,16 @@
 
 namespace Rakutentech\LaravelRequestDocs;
 
-use Illuminate\Auth\Middleware\Authenticate as Middleware;
-use Illuminate\Http\Response;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Resources\Json\JsonResource;
 use Closure;
-
 use Illuminate\Database\Events\QueryExecuted;
 use Illuminate\Support\Facades\DB;
+use KitLoong\AppLogger\QueryLog\LogWriter as QueryLogger;
 
-class LaravelRequestDocsMiddleware extends Middleware
+class LaravelRequestDocsMiddleware extends QueryLogger
 {
  private array $queries = [];
 
- public function handle($request, Closure $next, ...$guards)
+ public function handle($request, Closure $next)
  {
  if (!$request->headers->has('X-Request-LRD') || !config('app.debug')) {
  return $next($request);
@@ -50,45 +46,4 @@ public function listenDB()
  $this->queries[] = $this->getMessages($query);
  });
  }
-
- protected function getMessages(QueryExecuted $query): array
- {
- $sql = $query->sql;
-
- foreach ($query->bindings as $key => $binding) {
- // https://github.com/barryvdh/laravel-debugbar/blob/master/src/DataCollector/QueryCollector.php#L138
- // This regex matches placeholders only, not the question marks,
- // nested in quotes, while we iterate through the bindings
- // and substitute placeholders by suitable values.
- $regex = is_numeric($key)
- ? "/(?<!\?)\?(?=(?:[^'\\\']*'[^'\\']*')*[^'\\\']*$)(?!\?)/"
- : "/:{$key}(?=(?:[^'\\\']*'[^'\\\']*')*[^'\\\']*$)/";
-
- // Mimic bindValue and only string data types
- if (is_string($binding)) {
- $binding = $this->quote($binding);
- }
-
- $sql = preg_replace($regex, $binding, $sql, 1);
- }
-
- return [
- 'time' => $query->time,
- 'sql' => $sql,
- ];
- }
-
- /**
- * Mimic mysql_real_escape_string
- *
- * @param string $value
- * @return string
- */
- protected function quote(string $value): string
- {
- $search = ['\\', "\x00", "\n", "\r", "'", '"', "\x1a"];
- $replace = ['\\\\', '\\0', '\\n', '\\r', "\'", '\"', '\\Z'];
-
- return "'".str_replace($search, $replace, $value)."'";
- }
 }