Verified Commit b59e63e9 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3427177 by longwave, quietone, dineshkumarbollu, samit.310@gmail.com,... 

Issue #3427177 by longwave, quietone, dineshkumarbollu, samit.310@gmail.com, mondrake, alexpott: Replace calls to ::expectError*() from Drupal\Tests\Core\Render\ElementTest
parent 8e7d3e0f

core/.phpstan-baseline.php

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

	'path' => __DIR__ . '/tests/Drupal/Tests/Core/Plugin/TestPluginManager.php',

];

$ignoreErrors[] = [

	'message' => '#^Call to deprecated method expectError\\(\\) of class PHPUnit\\\\Framework\\\\TestCase\\:

https\\://github\\.com/sebastianbergmann/phpunit/issues/5062$#',

	'count' => 1,

	'path' => __DIR__ . '/tests/Drupal/Tests/Core/Render/ElementTest.php',

];

$ignoreErrors[] = [

	'message' => '#^Call to deprecated method expectErrorMessage\\(\\) of class PHPUnit\\\\Framework\\\\TestCase\\:

https\\://github\\.com/sebastianbergmann/phpunit/issues/5062$#',

	'count' => 1,

	'path' => __DIR__ . '/tests/Drupal/Tests/Core/Render/ElementTest.php',

];

$ignoreErrors[] = [

	'message' => '#^Call to deprecated method expectWarning\\(\\) of class PHPUnit\\\\Framework\\\\TestCase\\:

https\\://github\\.com/sebastianbergmann/phpunit/issues/5062$#',

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

+2 −9
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


namespace Drupal\Core\Render;



use Drupal\Component\Render\FormattableMarkup;

use Drupal\Core\Access\AccessResultInterface;



/**
@@ -92,16 +91,10 @@ public static function children(array &$elements, $sort = FALSE) { 
          // the insertion order.

          $child_weights[$key] = floor($weight * 1000) + $i / $count;

        }

        // Only trigger an error if the value is not null.

        // Only trigger an exception if the value is not null.

        // @see https://www.drupal.org/node/1283892

        elseif (isset($value)) {

          trigger_error(new FormattableMarkup(

            '"@key" is an invalid render array key. Value should be an array but got a @type',

            [

              '@key' => $key,

              '@type' => gettype($value),

            ]

          ), E_USER_ERROR);

          throw new \InvalidArgumentException(sprintf('"%s" is an invalid render array key. Value should be an array but got a %s.', $key, gettype($value)));

        }

      }

      $i++;

core/tests/Drupal/Tests/Core/Render/ElementTest.php

+2 −2
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ public function testInvalidChildren() { 
    $element = [

      'foo' => 'bar',

    ];

    $this->expectError();

    $this->expectErrorMessage('"foo" is an invalid render array key. Value should be an array but got a string');

    $this->expectException(\InvalidArgumentException::class);

    $this->expectExceptionMessage('"foo" is an invalid render array key. Value should be an array but got a string.');

    Element::children($element);

  }