diff --git a/core/.phpstan-baseline.php b/core/.phpstan-baseline.php index db57ef7a9c5b9cc5a3ebdebab20f0464c3ac4328..2cd5515acb710f6e62e3e054a7a32f2a20c9fafe 100644 --- a/core/.phpstan-baseline.php +++ b/core/.phpstan-baseline.php @@ -2578,12 +2578,6 @@ 'count' => 1, 'path' => __DIR__ . '/tests/Drupal/Tests/Core/Http/ClientFactoryTest.php', ]; -$ignoreErrors[] = [ - // identifier: method.deprecated - 'message' => '#^Call to deprecated method getMockForAbstractClass\\(\\) of class PHPUnit\\\\Framework\\\\TestCase\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php', -]; $ignoreErrors[] = [ // identifier: class.notFound 'message' => '#^Call to method getDefinitions\\(\\) on an unknown class Drupal\\\\Core\\\\Plugin\\\\CategorizingPluginManagerTrait\\.$#', diff --git a/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php b/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php index 8796ed8b6a11a1bd23bdbf1855fd0f167b328022..bdf7084e78ec4b6c0a4e2163535a9b207eb802c8 100644 --- a/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php +++ b/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php @@ -4,7 +4,9 @@ namespace Drupal\Tests\Core\Lock; +use Drupal\Core\Lock\LockBackendAbstract; use Drupal\Tests\UnitTestCase; +use PHPUnit\Framework\MockObject\MockObject; /** * @coversDefaultClass \Drupal\Tests\Core\Lock\LockBackendAbstractTest @@ -14,10 +16,8 @@ class LockBackendAbstractTest extends UnitTestCase { /** * The Mocked LockBackendAbstract object. - * - * @var \Drupal\Core\Lock\LockBackendAbstract|\PHPUnit\Framework\MockObject\MockObject */ - protected $lock; + protected LockBackendAbstract&MockObject $lock; /** * {@inheritdoc} @@ -25,7 +25,9 @@ class LockBackendAbstractTest extends UnitTestCase { protected function setUp(): void { parent::setUp(); - $this->lock = $this->getMockForAbstractClass('Drupal\Core\Lock\LockBackendAbstract'); + $this->lock = $this->getMockBuilder(StubLockBackendAbstract::class) + ->onlyMethods(['lockMayBeAvailable']) + ->getMock(); } /** diff --git a/core/tests/Drupal/Tests/Core/Lock/StubLockBackendAbstract.php b/core/tests/Drupal/Tests/Core/Lock/StubLockBackendAbstract.php new file mode 100644 index 0000000000000000000000000000000000000000..3dc7cdb1efe7a1026dd3d93204998f1172f0aa3a --- /dev/null +++ b/core/tests/Drupal/Tests/Core/Lock/StubLockBackendAbstract.php @@ -0,0 +1,40 @@ +<?php + +declare(strict_types=1); + +namespace Drupal\Tests\Core\Lock; + +use Drupal\Core\Lock\LockBackendAbstract; + +/** + * A stub of the abstract LockBackendAbstract class for testing purposes. + */ +class StubLockBackendAbstract extends LockBackendAbstract { + + /** + * {@inheritdoc} + */ + public function acquire($name, $timeout = 30.0): bool { + return TRUE; + } + + /** + * {@inheritdoc} + */ + public function lockMayBeAvailable($name): bool { + throw new \LogicException(__METHOD__ . '() is not implemented.'); + } + + /** + * {@inheritdoc} + */ + public function release($name): void { + } + + /** + * {@inheritdoc} + */ + public function releaseAll($lockId = NULL): void { + } + +}