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

refactor: #3565604 Remove an unnecessary isset() from Renderer::doRender() 

By: catch
(cherry picked from commit 3af56067)
parent 929caa86

core/.phpstan-baseline.php

+0 −6
Original line number Diff line number Diff line
@@ -9791,12 +9791,6 @@ 
	'count' => 1,

	'path' => __DIR__ . '/lib/Drupal/Core/Render/Renderer.php',

];

$ignoreErrors[] = [

	'message' => '#^Variable \\$elements in isset\\(\\) always exists and is not nullable\\.$#',

	'identifier' => 'isset.variable',

	'count' => 1,

	'path' => __DIR__ . '/lib/Drupal/Core/Render/Renderer.php',

];

$ignoreErrors[] = [

	'message' => '#^Variable \\$render_start might not be defined\\.$#',

	'identifier' => 'variable.undefined',

core/lib/Drupal/Core/Render/Renderer.php

+8 −10
Original line number Diff line number Diff line
@@ -479,7 +479,6 @@ protected function doRender(array &$elements, RenderContext $context): string|Ma 
    // Assume that if #theme is set it represents an implemented hook.

    $theme_is_implemented = isset($elements['#theme']);

    // Check the elements for insecure HTML and pass through sanitization.

    if (isset($elements)) {

    $markup_keys = [

      '#description',

      '#field_prefix',
@@ -490,7 +489,6 @@ protected function doRender(array &$elements, RenderContext $context): string|Ma 
        $elements[$key] = $this->xssFilterAdminIfUnsafe($elements[$key]);

      }

    }

    }



    // Call the element's #theme function if it is set. Then any children of the

    // element have to be rendered there. If the internal #render_children