Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3459170 by mstrelan: Fix instances of ints passed to functions expecting strings

merge-requests/8806/merge
Dave Long 2024-07-23 14:00:25 +01:00
parent ac88e9a4d8
commit e3b52e2f3f
No known key found for this signature in database
GPG Key ID: ED52AE211E142771
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Component/Utility/Color.php
View File

@ -84,7 +84,7 @@ class Color {
$out |= $v << (16 - $k * 8); $out |= $v << (16 - $k * 8);
} }
return '#' . str_pad(dechex($out), 6, 0, STR_PAD_LEFT); return '#' . str_pad(dechex($out), 6, '0', STR_PAD_LEFT);
} }
/** /**

2
core/lib/Drupal/Component/Utility/Number.php
View File

@ -77,7 +77,7 @@ class Number {
* @see \Drupal\Component\Utility\Number::alphadecimalToInt * @see \Drupal\Component\Utility\Number::alphadecimalToInt
*/ */
public static function intToAlphadecimal($i = 0) { public static function intToAlphadecimal($i = 0) {
$num = base_convert((int) $i, 10, 36); $num = base_convert((string) $i, 10, 36);
$length = strlen($num); $length = strlen($num);
return chr($length + ord('0') - 1) . $num; return chr($length + ord('0') - 1) . $num;

2
core/lib/Drupal/Core/EventSubscriber/FinalExceptionSubscriber.php
View File

@ -152,7 +152,7 @@ class FinalExceptionSubscriber implements EventSubscriberInterface {
*/ */
public function on4xx(ExceptionEvent $event) { public function on4xx(ExceptionEvent $event) {
$exception = $event->getThrowable(); $exception = $event->getThrowable();
if ($exception && $exception instanceof HttpExceptionInterface && str_starts_with($exception->getStatusCode(), '4')) { if ($exception && $exception instanceof HttpExceptionInterface && str_starts_with((string) $exception->getStatusCode(), '4')) {
$message = PlainTextOutput::renderFromHtml($exception->getMessage()); $message = PlainTextOutput::renderFromHtml($exception->getMessage());
// If the exception is cacheable, generate a cacheable response. // If the exception is cacheable, generate a cacheable response.
if ($exception instanceof CacheableDependencyInterface) { if ($exception instanceof CacheableDependencyInterface) {

2
core/lib/Drupal/Core/EventSubscriber/HttpExceptionSubscriberBase.php
View File

@ -100,7 +100,7 @@ abstract class HttpExceptionSubscriberBase implements EventSubscriberInterface {
$method = 'on' . $exception->getStatusCode(); $method = 'on' . $exception->getStatusCode();
// Keep just the leading number of the status code to produce either a // Keep just the leading number of the status code to produce either a
// 400 or a 500 method callback. // 400 or a 500 method callback.
$method_fallback = 'on' . substr($exception->getStatusCode(), 0, 1) . 'xx'; $method_fallback = 'on' . substr((string) $exception->getStatusCode(), 0, 1) . 'xx';
// We want to allow the method to be called and still not set a response // We want to allow the method to be called and still not set a response
// if it has additional filtering logic to determine when it will apply. // if it has additional filtering logic to determine when it will apply.
// It is therefore the method's responsibility to set the response on the // It is therefore the method's responsibility to set the response on the

2
core/lib/Drupal/Core/Lock/LockBackendAbstract.php
View File

@ -67,7 +67,7 @@ abstract class LockBackendAbstract implements LockBackendInterface {
*/ */
public function getLockId() { public function getLockId() {
if (!isset($this->lockId)) { if (!isset($this->lockId)) {
$this->lockId = uniqid(mt_rand(), TRUE); $this->lockId = uniqid((string) mt_rand(), TRUE);
} }
return $this->lockId; return $this->lockId;
} }

2
core/lib/Drupal/Core/Lock/NullLockBackend.php
View File

@ -53,7 +53,7 @@ class NullLockBackend implements LockBackendInterface {
*/ */
public function getLockId() { public function getLockId() {
if (!isset($this->lockId)) { if (!isset($this->lockId)) {
$this->lockId = uniqid(mt_rand(), TRUE); $this->lockId = uniqid((string) mt_rand(), TRUE);
} }
return $this->lockId; return $this->lockId;
} }