Skip to content

Commit e39cc96

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into 4.3
Conflicts: system/Database/SQLSRV/Connection.php
2 parents 0a6f974 + a031b9d commit e39cc96

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

system/HTTP/CURLRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ protected function setResponseHeaders(array $headers = [])
478478
}
479479

480480
if (isset($matches[2])) {
481-
$this->response->setStatusCode($matches[2], $matches[3] ?? null);
481+
$this->response->setStatusCode((int) $matches[2], $matches[3] ?? null);
482482
}
483483
}
484484
}

system/Helpers/text_helper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ function increment_string(string $str, string $separator = '_', int $first = 1):
598598
{
599599
preg_match('/(.+)' . preg_quote($separator, '/') . '([0-9]+)$/', $str, $match);
600600

601-
return isset($match[2]) ? $match[1] . $separator . ($match[2] + 1) : $str . $separator . $first;
601+
return isset($match[2]) ? $match[1] . $separator . ((int) $match[2] + 1) : $str . $separator . $first;
602602
}
603603
}
604604

system/Session/Handlers/MemcachedHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function open($path, $name): bool
103103
continue;
104104
}
105105

106-
if (! $this->memcached->addServer($match[1], $match[2], $match[3] ?? 0)) {
106+
if (! $this->memcached->addServer($match[1], (int) $match[2], $match[3] ?? 0)) {
107107
$this->logger->error('Could not add ' . $match[1] . ':' . $match[2] . ' to Memcached server pool.');
108108
} else {
109109
$serverList[] = $match[1] . ':' . $match[2];

0 commit comments

Comments
 (0)