Skip to content

Commit c970fd7

Browse files
paulbalandanpaulbalandan
committed
Merge branch 'develop' into 4.7
2 parents b1f2bee + 38c1c79 commit c970fd7

File tree

28 files changed

+183
-129
lines changed

28 files changed

+183
-129
lines changed

‎admin/css/debug-toolbar/toolbar.scss

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,31 @@
457457
}
458458
}
459459

460+
@media screen and (max-width: 768px) {
461+
#debug-bar {
462+
table {
463+
display: block;
464+
overflow-x: auto;
465+
font-size: 12px;
466+
margin: 5px 5px 10px 5px;
467+
468+
td,
469+
th {
470+
padding: 4px 6px;
471+
}
472+
}
473+
474+
.timeline {
475+
display: block;
476+
white-space: nowrap;
477+
font-size: 12px;
478+
}
479+
480+
.toolbar {
481+
overflow-x: auto;
482+
}
483+
}
484+
}
460485

461486
// THEMES
462487
// ========================================================================== */

‎app/Views/errors/html/debug.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--main-text-color: #555;
44
--dark-text-color: #222;
55
--light-text-color: #c7c7c7;
6-
--brand-primary-color: #E06E3F;
6+
--brand-primary-color: #DC4814;
77
--light-bg-color: #ededee;
88
--dark-bg-color: #404040;
99
}
@@ -71,7 +71,7 @@ p.lead {
7171
text-align: center;
7272
padding: calc(4px + 0.2083vw);
7373
width: 100%;
74-
margin-top: -2.14rem;
74+
top: 0;
7575
position: fixed;
7676
}
7777

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"phpunit/phpcov": "^9.0.2 || ^10.0",
2929
"phpunit/phpunit": "^10.5.16 || ^11.2",
3030
"predis/predis": "^1.1 || ^2.3",
31-
"rector/rector": "2.0.9",
31+
"rector/rector": "2.0.10",
3232
"shipmonk/phpstan-baseline-per-identifier": "^2.0"
3333
},
3434
"replace": {

‎system/Cache/Handlers/RedisHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public function deleteMatching(string $pattern)
181181
$iterator = null;
182182

183183
do {
184-
/** @var false|list<string>|Redis $keys */
184+
/** @var false|list<string> $keys */
185185
$keys = $this->redis->scan($iterator, $pattern);
186186

187187
if (is_array($keys)) {

‎system/Commands/Generators/MigrationGenerator.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,7 @@ protected function prepare(string $class): string
112112
$data['DBGroup'] = is_string($DBGroup) ? $DBGroup : 'default';
113113
$data['DBDriver'] = config(Database::class)->{$data['DBGroup']}['DBDriver'];
114114

115-
/** @var SessionConfig|null $session */
116-
$session = config(SessionConfig::class);
117-
118-
$data['matchIP'] = $session->matchIP;
115+
$data['matchIP'] = config(SessionConfig::class)->matchIP;
119116
}
120117

121118
return $this->parseTemplate($class, [], [], $data);

‎system/Common.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,9 @@ function db_connect($db = null, bool $getShared = true)
371371
* retrieving values set from the .env file for
372372
* use in config files.
373373
*
374-
* @param string|null $default
374+
* @param array<int|string, mixed>|bool|float|int|object|string|null $default
375375
*
376-
* @return bool|string|null
376+
* @return array<int|string, mixed>|bool|float|int|object|string|null
377377
*/
378378
function env(string $key, $default = null)
379379
{

‎system/Database/Postgre/Builder.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,9 +469,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
469469
return ($index->type === 'UNIQUE' || $index->type === 'PRIMARY') && $hasAllFields;
470470
});
471471

472-
foreach (array_map(static fn ($index) => $index->fields, $allIndexes) as $index) {
473-
$constraints[] = current($index);
474-
// only one index can be used?
472+
foreach ($allIndexes as $index) {
473+
$constraints = $index->fields;
475474
break;
476475
}
477476

‎system/Database/SQLite3/Builder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ protected function _upsertBatch(string $table, array $keys, array $values): stri
151151
return ($index->type === 'PRIMARY' || $index->type === 'UNIQUE') && $hasAllFields;
152152
});
153153

154-
foreach (array_map(static fn ($index) => $index->fields, $allIndexes) as $index) {
155-
$constraints[] = current($index);
154+
foreach ($allIndexes as $index) {
155+
$constraints = $index->fields;
156156
break;
157157
}
158158

‎system/Debug/Toolbar/Views/toolbar.css

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,26 @@
332332
display: none !important;
333333
}
334334
}
335+
@media screen and (max-width: 768px) {
336+
#debug-bar table {
337+
display: block;
338+
overflow-x: auto;
339+
font-size: 12px;
340+
margin: 5px 5px 10px 5px;
341+
}
342+
#debug-bar table td,
343+
#debug-bar table th {
344+
padding: 4px 6px;
345+
}
346+
#debug-bar .timeline {
347+
display: block;
348+
white-space: nowrap;
349+
font-size: 12px;
350+
}
351+
#debug-bar .toolbar {
352+
overflow-x: auto;
353+
}
354+
}
335355
#debug-icon {
336356
background-color: #FFFFFF;
337357
box-shadow: 0 0 4px #DFDFDF;

‎system/HTTP/CURLRequest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,7 @@ public function __construct(App $config, URI $uri, ?ResponseInterface $response
125125
$this->baseURI = $uri->useRawQueryString();
126126
$this->defaultOptions = $options;
127127

128-
/** @var ConfigCURLRequest|null $configCURLRequest */
129-
$configCURLRequest = config(ConfigCURLRequest::class);
130-
$this->shareOptions = $configCURLRequest->shareOptions ?? true;
128+
$this->shareOptions = config(ConfigCURLRequest::class)->shareOptions ?? true;
131129

132130
$this->config = $this->defaultConfig;
133131
$this->parseOptions($options);

0 commit comments

Comments
 (0)