fix: php84 null

Author: krissss

src/DataCollector/LaravelQueryCollector.php

@@ -34,7 +34,7 @@ class LaravelQueryCollector extends QueryCollector
         'slow_threshold' => false, // 仅显示慢sql，设置毫秒时间来启用
     ];
 
-    public function __construct(array $config = [], DebugBarTimeDataCollector $timeCollector = null)
+    public function __construct(array $config = [], ?DebugBarTimeDataCollector $timeCollector = null)
     {
         $this->config = ArrayHelper::merge($this->config, $config);
 

src/DataCollector/LaravelRedisCollector.php

@@ -24,7 +24,7 @@ class LaravelRedisCollector extends LaravelQueryCollector
         'slow_threshold' => false, // 仅显示慢执行，设置毫秒时间来启用
     ];
 
-    public function __construct(array $config = [], DebugBarTimeDataCollector $timeCollector = null)
+    public function __construct(array $config = [], ?DebugBarTimeDataCollector $timeCollector = null)
     {
         parent::__construct($config, $timeCollector);
 

src/DataCollector/PDO/PDOCollector.php

@@ -10,7 +10,7 @@ class PDOCollector extends \DebugBar\DataCollector\PDO\PDOCollector
     /**
      * @inheritDoc
      */
-    protected function collectPDO(DebugbarTraceablePDO $pdo, TimeDataCollector $timeCollector = null, $connectionName = null)
+    protected function collectPDO(DebugbarTraceablePDO $pdo, ?TimeDataCollector $timeCollector = null, $connectionName = null)
     {
         $data = parent::collectPDO($pdo, $timeCollector, $connectionName);
 

src/DataCollector/ThinkPdoCollector.php

@@ -10,7 +10,7 @@
 
 class ThinkPdoCollector extends PDOCollector
 {
-    public function __construct(array $thinkOrmConfig = [], TimeDataCollector $timeCollector = null)
+    public function __construct(array $thinkOrmConfig = [], ?TimeDataCollector $timeCollector = null)
     {
         $config = array_merge([
             'default' => '',

src/Laravel/DataCollector/QueryCollector.php

@@ -33,9 +33,9 @@ class QueryCollector extends PDOCollector
     ];
 
     /**
-     * @param TimeDataCollector $timeCollector
+     * @param TimeDataCollector|null $timeCollector
      */
-    public function __construct(TimeDataCollector $timeCollector = null)
+    public function __construct(?TimeDataCollector $timeCollector = null)
     {
         $this->timeCollector = $timeCollector;
     }
@@ -79,7 +79,7 @@ public function setShowCopyButton($enabled = true)
      */
     public function setFindSource($value, array $middleware)
     {
-        $this->findSource = (bool) $value;
+        $this->findSource = (bool)$value;
         $this->middleware = $middleware;
     }
 
@@ -96,7 +96,7 @@ public function mergeBacktraceExcludePaths(array $excludePaths)
     /**
      * Enable/disable the shaded duration background on queries
      *
-     * @param  bool $enabled
+     * @param bool $enabled
      */
     public function setDurationBackground($enabled)
     {
@@ -106,8 +106,8 @@ public function setDurationBackground($enabled)
     /**
      * Enable/disable the EXPLAIN queries
      *
-     * @param  bool $enabled
-     * @param  array|null $types Array of types to explain queries (select/insert/update/delete)
+     * @param bool $enabled
+     * @param array|null $types Array of types to explain queries (select/insert/update/delete)
      */
     public function setExplainSource($enabled, $types)
     {
@@ -162,7 +162,7 @@ public function addQuery($query, $bindings, $time, $connection)
                 if (!is_int($binding) && !is_float($binding)) {
                     if ($pdo) {
                         try {
-                            $binding = $pdo->quote((string) $binding);
+                            $binding = $pdo->quote((string)$binding);
                         } catch (\Exception) {
                             $binding = $this->emulateQuote($binding);
                         }
@@ -171,7 +171,7 @@ public function addQuery($query, $bindings, $time, $connection)
                     }
                 }
 
-                $query = preg_replace($regex, addcslashes($binding, '$'), (string) $query, 1);
+                $query = preg_replace($regex, addcslashes($binding, '$'), (string)$query, 1);
             }
         }
 
@@ -210,10 +210,10 @@ public function addQuery($query, $bindings, $time, $connection)
      */
     protected function emulateQuote($value)
     {
-        $search = ["\\",  "\x00", "\n",  "\r",  "'",  '"', "\x1a"];
-        $replace = ["\\\\","\\0","\\n", "\\r", "\'", '\"', "\\Z"];
+        $search = ["\\", "\x00", "\n", "\r", "'", '"', "\x1a"];
+        $replace = ["\\\\", "\\0", "\\n", "\\r", "\'", '\"', "\\Z"];
 
-        return "'" . str_replace($search, $replace, (string) $value) . "'";
+        return "'" . str_replace($search, $replace, (string)$value) . "'";
     }
 
     /**
@@ -280,13 +280,13 @@ protected function findSource()
     /**
      * Parse a trace element from the backtrace stack.
      *
-     * @param  int    $index
-     * @param  array  $trace
+     * @param int $index
+     * @param array $trace
      * @return object|bool
      */
     protected function parseTrace($index, array $trace)
     {
-        $frame = (object) [
+        $frame = (object)[
             'index' => $index,
             'namespace' => null,
             'name' => null,
@@ -311,7 +311,7 @@ protected function parseTrace($index, array $trace)
             } elseif (str_contains($file, base_path() . '/storage')) {
                 $hash = pathinfo($file, PATHINFO_FILENAME);
 
-                if (! $frame->name = $this->findViewFromHash($hash)) {
+                if (!$frame->name = $this->findViewFromHash($hash)) {
                     $frame->name = $hash;
                 }
 
@@ -350,7 +350,7 @@ protected function fileIsInExcludedPath($file)
         $normalizedPath = str_replace('\\', '/', $file);
 
         foreach ($this->backtraceExcludePaths as $excludedPath) {
-            if (str_contains($normalizedPath, (string) $excludedPath)) {
+            if (str_contains($normalizedPath, (string)$excludedPath)) {
                 return true;
             }
         }
@@ -361,15 +361,15 @@ protected function fileIsInExcludedPath($file)
     /**
      * Find the middleware alias from the file.
      *
-     * @param  string $file
+     * @param string $file
      * @return string|null
      */
     protected function findMiddlewareFromFile($file)
     {
         $filename = pathinfo($file, PATHINFO_FILENAME);
 
         foreach ($this->middleware as $alias => $class) {
-            if (str_contains((string) $class, $filename)) {
+            if (str_contains((string)$class, $filename)) {
                 return $alias;
             }
         }
@@ -378,7 +378,7 @@ protected function findMiddlewareFromFile($file)
     /**
      * Find the template name from the hash.
      *
-     * @param  string $hash
+     * @param string $hash
      * @return null|string
      */
     protected function findViewFromHash($hash)
@@ -397,7 +397,7 @@ protected function findViewFromHash($hash)
         }
 
         foreach ($property->getValue($finder) as $name => $path) {
-            if (sha1((string) $path) == $hash || md5((string) $path) == $hash) {
+            if (sha1((string)$path) == $hash || md5((string)$path) == $hash) {
                 return $name;
             }
         }
@@ -440,7 +440,7 @@ protected function normalizeFilename($path)
 
     /**
      * Collect a database transaction event.
-     * @param  string $event
+     * @param string $event
      * @param \Illuminate\Database\Connection $connection
      * @return array
      */
@@ -586,4 +586,4 @@ public function getWidgets()
             ]
         ];
     }
-}
+}