Verified Commit e3b52e2f authored by Dave Long's avatar Dave Long
Browse files

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

parent ac88e9a4

core/lib/Drupal/Component/Utility/Color.php

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public static function rgbToHex($input) { 
      $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);

  }



  /**

core/lib/Drupal/Component/Utility/Number.php

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public static function validStep($value, $step, $offset = 0.0) { 
   * @see \Drupal\Component\Utility\Number::alphadecimalToInt

   */

  public static function intToAlphadecimal($i = 0) {

    $num = base_convert((int) $i, 10, 36);

    $num = base_convert((string) $i, 10, 36);

    $length = strlen($num);



    return chr($length + ord('0') - 1) . $num;

core/lib/Drupal/Core/EventSubscriber/FinalExceptionSubscriber.php

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ public function onException(ExceptionEvent $event) { 
   */

  public function on4xx(ExceptionEvent $event) {

    $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());

      // If the exception is cacheable, generate a cacheable response.

      if ($exception instanceof CacheableDependencyInterface) {

core/lib/Drupal/Core/EventSubscriber/HttpExceptionSubscriberBase.php

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public function onException(ExceptionEvent $event) { 
      $method = 'on' . $exception->getStatusCode();

      // Keep just the leading number of the status code to produce either a

      // 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

      // 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

core/lib/Drupal/Core/Lock/LockBackendAbstract.php

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public function wait($name, $delay = 30) { 
   */

  public function getLockId() {

    if (!isset($this->lockId)) {

      $this->lockId = uniqid(mt_rand(), TRUE);

      $this->lockId = uniqid((string) mt_rand(), TRUE);

    }

    return $this->lockId;

  }