Skip to content

Commit 2972e21

Browse files
committed
Fix failing tests
1 parent 7a88a9a commit 2972e21

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

dev/tests/integration/testsuite/Magento/Framework/Lock/Backend/DatabaseTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ class DatabaseTest extends \PHPUnit\Framework\TestCase
1414
/**
1515
* @var \Magento\Framework\Lock\Backend\Database
1616
*/
17-
protected $model;
17+
private $model;
1818

1919
/**
2020
* @var \Magento\Framework\ObjectManagerInterface
2121
*/
22-
protected $objectManager;
22+
private $objectManager;
2323

24-
public function setUp()
24+
protected function setUp()
2525
{
2626
$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
2727
$this->model = $this->objectManager->create(\Magento\Framework\Lock\Backend\Database::class);

lib/internal/Magento/Framework/Lock/Backend/Database.php

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
declare(strict_types=1);
8-
namespace Magento\Framework\lock\Backend;
8+
namespace Magento\Framework\Lock\Backend;
99

1010
use Magento\Framework\App\ResourceConnection;
1111
use Magento\Framework\Exception\InputException;
@@ -33,7 +33,7 @@ public function setLock(string $name, int $timeout = -1): bool
3333
{
3434
$this->checkLength($name);
3535

36-
return (bool)$this->resource->getConnection()->query("SELECT GET_LOCK(?, ?);", array((string)$name, (int)$timeout))
36+
return (bool)$this->resource->getConnection()->query("SELECT GET_LOCK(?, ?);", [(string)$name, (int)$timeout])
3737
->fetchColumn();
3838
}
3939

@@ -47,7 +47,7 @@ public function releaseLock(string $name): bool
4747
{
4848
$this->checkLength($name);
4949

50-
return (bool)$this->resource->getConnection()->query("SELECT RELEASE_LOCK(?);", array((string)$name))->fetchColumn();
50+
return (bool)$this->resource->getConnection()->query("SELECT RELEASE_LOCK(?);", [(string)$name])->fetchColumn();
5151
}
5252

5353
/**
@@ -60,9 +60,17 @@ public function isLocked(string $name): bool
6060
{
6161
$this->checkLength($name);
6262

63-
return (bool)$this->resource->getConnection()->query("SELECT IS_USED_LOCK(?);", array((string)$name))->fetchColumn();
63+
return (bool)$this->resource->getConnection()->query("SELECT IS_USED_LOCK(?);", [(string)$name])->fetchColumn();
6464
}
6565

66+
/**
67+
* Checks for max length of lock name
68+
*
69+
* Limited to 64 characters in MySQL.
70+
*
71+
* @param string $name
72+
* @throws InputException
73+
*/
6674
private function checkLength(string $name)
6775
{
6876
if (strlen($name) > 64) {

0 commit comments

Comments
 (0)