Merge branch 'develop' into 4.7

Author: paulbalandan

admin/css/debug-toolbar/toolbar.scss

@@ -457,6 +457,31 @@
     }
 }
 
+@media screen and (max-width: 768px) {
+    #debug-bar {
+      table {
+        display: block;
+        overflow-x: auto;
+        font-size: 12px;
+        margin: 5px 5px 10px 5px;
+  
+        td,
+        th {
+          padding: 4px 6px;
+        }
+      }
+  
+      .timeline {
+        display: block;
+        white-space: nowrap;
+        font-size: 12px;
+      }
+  
+      .toolbar {
+        overflow-x: auto;
+      }
+    }
+  }
 
 // THEMES
 // ========================================================================== */

app/Views/errors/html/debug.css

@@ -3,7 +3,7 @@
     --main-text-color: #555;
     --dark-text-color: #222;
     --light-text-color: #c7c7c7;
-    --brand-primary-color: #E06E3F;
+    --brand-primary-color: #DC4814;
     --light-bg-color: #ededee;
     --dark-bg-color: #404040;
 }
@@ -71,7 +71,7 @@ p.lead {
     text-align: center;
     padding: calc(4px + 0.2083vw);
     width: 100%;
-    margin-top: -2.14rem;
+    top: 0;
     position: fixed;
 }
 

composer.json

@@ -28,7 +28,7 @@
         "phpunit/phpcov": "^9.0.2 || ^10.0",
         "phpunit/phpunit": "^10.5.16 || ^11.2",
         "predis/predis": "^1.1 || ^2.3",
-        "rector/rector": "2.0.9",
+        "rector/rector": "2.0.10",
         "shipmonk/phpstan-baseline-per-identifier": "^2.0"
     },
     "replace": {

system/Cache/Handlers/RedisHandler.php

@@ -181,7 +181,7 @@ public function deleteMatching(string $pattern)
         $iterator    = null;
 
         do {
-            /** @var false|list<string>|Redis $keys */
+            /** @var false|list<string> $keys */
             $keys = $this->redis->scan($iterator, $pattern);
 
             if (is_array($keys)) {

system/Commands/Generators/MigrationGenerator.php

@@ -112,10 +112,7 @@ protected function prepare(string $class): string
             $data['DBGroup']  = is_string($DBGroup) ? $DBGroup : 'default';
             $data['DBDriver'] = config(Database::class)->{$data['DBGroup']}['DBDriver'];
 
-            /** @var SessionConfig|null $session */
-            $session = config(SessionConfig::class);
-
-            $data['matchIP'] = $session->matchIP;
+            $data['matchIP'] = config(SessionConfig::class)->matchIP;
         }
 
         return $this->parseTemplate($class, [], [], $data);

system/Common.php

@@ -371,9 +371,9 @@ function db_connect($db = null, bool $getShared = true)
      * retrieving values set from the .env file for
      * use in config files.
      *
-     * @param string|null $default
+     * @param array<int|string, mixed>|bool|float|int|object|string|null $default
      *
-     * @return bool|string|null
+     * @return array<int|string, mixed>|bool|float|int|object|string|null
      */
     function env(string $key, $default = null)
     {

system/Database/Postgre/Builder.php

@@ -469,9 +469,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
                     return ($index->type === 'UNIQUE' || $index->type === 'PRIMARY') && $hasAllFields;
                 });
 
-                foreach (array_map(static fn ($index) => $index->fields, $allIndexes) as $index) {
-                    $constraints[] = current($index);
-                    // only one index can be used?
+                foreach ($allIndexes as $index) {
+                    $constraints = $index->fields;
                     break;
                 }
 

system/Database/SQLite3/Builder.php

@@ -151,8 +151,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
                     return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
                 });
 
-                foreach (array_map(static fn ($index) => $index->fields, $allIndexes) as $index) {
-                    $constraints[] = current($index);
+                foreach ($allIndexes as $index) {
+                    $constraints = $index->fields;
                     break;
                 }
 

system/Debug/Toolbar/Views/toolbar.css

@@ -332,6 +332,26 @@
     display: none !important;
   }
 }
+@media screen and (max-width: 768px) {
+  #debug-bar table {
+    display: block;
+    overflow-x: auto;
+    font-size: 12px;
+    margin: 5px 5px 10px 5px;
+  }
+  #debug-bar table td,
+  #debug-bar table th {
+    padding: 4px 6px;
+  }
+  #debug-bar .timeline {
+    display: block;
+    white-space: nowrap;
+    font-size: 12px;
+  }
+  #debug-bar .toolbar {
+    overflow-x: auto;
+  }
+}
 #debug-icon {
   background-color: #FFFFFF;
   box-shadow: 0 0 4px #DFDFDF;

system/HTTP/CURLRequest.php

@@ -125,9 +125,7 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
         $this->baseURI        = $uri->useRawQueryString();
         $this->defaultOptions = $options;
 
-        /** @var ConfigCURLRequest|null $configCURLRequest */
-        $configCURLRequest  = config(ConfigCURLRequest::class);
-        $this->shareOptions = $configCURLRequest->shareOptions ?? true;
+        $this->shareOptions = config(ConfigCURLRequest::class)->shareOptions ?? true;
 
         $this->config = $this->defaultConfig;
         $this->parseOptions($options);