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

Issue #3427178 by mondrake, longwave: Replace calls to ::expectWarning*() from Drupal\Tests\Core\Security\DoTrustedCallbackTraitTest

merge-requests/7433/head
catch 2024-04-10 21:58:24 +01:00
parent 26e9f32dfa
commit c8cfcf07a8
5 changed files with 0 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/.phpstan-baseline.php
View File

@ -2221,18 +2221,6 @@ $ignoreErrors[] = [
'count' => 1, 'count' => 1,
'path' => __DIR__ . '/tests/Drupal/Tests/Core/Plugin/TestPluginManager.php', 'path' => __DIR__ . '/tests/Drupal/Tests/Core/Plugin/TestPluginManager.php',
]; ];
$ignoreErrors[] = [
'message' => '#^Call to deprecated method expectWarning\\(\\) of class PHPUnit\\\\Framework\\\\TestCase\\:
https\\://github\\.com/sebastianbergmann/phpunit/issues/5062$#',
'count' => 1,
'path' => __DIR__ . '/tests/Drupal/Tests/Core/Security/DoTrustedCallbackTraitTest.php',
];
$ignoreErrors[] = [
'message' => '#^Call to deprecated method expectWarningMessage\\(\\) of class PHPUnit\\\\Framework\\\\TestCase\\:
https\\://github\\.com/sebastianbergmann/phpunit/issues/5062$#',
'count' => 1,
'path' => __DIR__ . '/tests/Drupal/Tests/Core/Security/DoTrustedCallbackTraitTest.php',
];
$ignoreErrors[] = [ $ignoreErrors[] = [
'message' => '#^Variable \\$value in isset\\(\\) always exists and is not nullable\\.$#', 'message' => '#^Variable \\$value in isset\\(\\) always exists and is not nullable\\.$#',
'count' => 1, 'count' => 1,

4
core/lib/Drupal/Core/Security/DoTrustedCallbackTrait.php
View File

@ -37,7 +37,6 @@ trait DoTrustedCallbackTrait {
* @param string $error_type * @param string $error_type
* (optional) The type of error to trigger. One of: * (optional) The type of error to trigger. One of:
* - TrustedCallbackInterface::THROW_EXCEPTION * - TrustedCallbackInterface::THROW_EXCEPTION
* - TrustedCallbackInterface::TRIGGER_WARNING
* - TrustedCallbackInterface::TRIGGER_SILENCED_DEPRECATION * - TrustedCallbackInterface::TRIGGER_SILENCED_DEPRECATION
* Defaults to TrustedCallbackInterface::THROW_EXCEPTION. * Defaults to TrustedCallbackInterface::THROW_EXCEPTION.
* @param string $extra_trusted_interface * @param string $extra_trusted_interface
@ -99,9 +98,6 @@ trait DoTrustedCallbackTrait {
if ($error_type === TrustedCallbackInterface::TRIGGER_SILENCED_DEPRECATION) { if ($error_type === TrustedCallbackInterface::TRIGGER_SILENCED_DEPRECATION) {
@trigger_error($message, E_USER_DEPRECATED); @trigger_error($message, E_USER_DEPRECATED);
} }
elseif ($error_type === TrustedCallbackInterface::TRIGGER_WARNING) {
trigger_error($message, E_USER_WARNING);
}
else { else {
throw new UntrustedCallbackException($message); throw new UntrustedCallbackException($message);
} }

1
core/lib/Drupal/Core/Security/StaticTrustedCallbackHelper.php
View File

@ -23,7 +23,6 @@ class StaticTrustedCallbackHelper {
* @param string $error_type * @param string $error_type
* (optional) The type of error to trigger. One of: * (optional) The type of error to trigger. One of:
* - TrustedCallbackInterface::THROW_EXCEPTION * - TrustedCallbackInterface::THROW_EXCEPTION
* - TrustedCallbackInterface::TRIGGER_WARNING
* - TrustedCallbackInterface::TRIGGER_SILENCED_DEPRECATION * - TrustedCallbackInterface::TRIGGER_SILENCED_DEPRECATION
* Defaults to TrustedCallbackInterface::THROW_EXCEPTION. * Defaults to TrustedCallbackInterface::THROW_EXCEPTION.
* @param string $extra_trusted_interface * @param string $extra_trusted_interface

5
core/lib/Drupal/Core/Security/TrustedCallbackInterface.php
View File

@ -14,11 +14,6 @@ interface TrustedCallbackInterface {
*/ */
const THROW_EXCEPTION = 'exception'; const THROW_EXCEPTION = 'exception';
/**
* Untrusted callbacks trigger E_USER_WARNING errors.
*/
const TRIGGER_WARNING = 'warning';
/** /**
* Untrusted callbacks trigger silenced E_USER_DEPRECATION errors. * Untrusted callbacks trigger silenced E_USER_DEPRECATION errors.
*/ */

9
core/tests/Drupal/Tests/Core/Security/DoTrustedCallbackTraitTest.php
View File

@ -87,15 +87,6 @@ class DoTrustedCallbackTraitTest extends UnitTestCase {
$this->doTrustedCallback($callback, [], '%s is not trusted', TrustedCallbackInterface::TRIGGER_SILENCED_DEPRECATION); $this->doTrustedCallback($callback, [], '%s is not trusted', TrustedCallbackInterface::TRIGGER_SILENCED_DEPRECATION);
} }
/**
* @dataProvider errorTypeProvider
*/
public function testWarning($callback) {
$this->expectWarning();
$this->expectWarningMessage('Drupal\Tests\Core\Security\UntrustedObject::callback is not trusted');
$this->doTrustedCallback($callback, [], '%s is not trusted', TrustedCallbackInterface::TRIGGER_WARNING);
}
/** /**
* Data provider for tests of ::doTrustedCallback $error_type argument. * Data provider for tests of ::doTrustedCallback $error_type argument.
*/ */