Simplify method verbs in LockInterface

Author: paveq

app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php

@@ -229,7 +229,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
             // Note: we acquire the lock here instead of above, as it should be taken by standalone (child) process,
             // not by the parent process.
-            if (!$this->lockManager->acquireLock(self::LOCK_PREFIX . $groupId, self::LOCK_TIMEOUT)) {
+            if (!$this->lockManager->lock(self::LOCK_PREFIX . $groupId, self::LOCK_TIMEOUT)) {
                 $this->logger->warning(
                     sprintf(
                         "Could not acquire lock for cron group: %s, skipping run",
@@ -279,7 +279,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 $schedule->save();
             }
 
-            $this->lockManager->releaseLock(self::LOCK_PREFIX . $groupId);
+            $this->lockManager->unlock(self::LOCK_PREFIX . $groupId);
         }
     }
 

app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php

@@ -143,8 +143,8 @@ protected function setUp()
         $this->lockManagerMock = $this->getMockBuilder(\Magento\Framework\Lock\LockManagerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->lockManagerMock->method('acquireLock')->willReturn(true);
-        $this->lockManagerMock->method('releaseLock')->willReturn(true);
+        $this->lockManagerMock->method('lock')->willReturn(true);
+        $this->lockManagerMock->method('unlock')->willReturn(true);
 
         $this->observer = $this->createMock(\Magento\Framework\Event\Observer::class);
 

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

@@ -27,24 +27,24 @@ protected function setUp()
         $this->model = $this->objectManager->create(\Magento\Framework\Lock\Backend\Database::class);
     }
 
-    public function testLockAndRelease()
+    public function testLockAndUnlock()
     {
         $name = 'test_lock';
 
         $this->assertFalse($this->model->isLocked($name));
 
-        $this->assertTrue($this->model->acquireLock($name));
+        $this->assertTrue($this->model->lock($name));
         $this->assertTrue($this->model->isLocked($name));
 
-        $this->assertTrue($this->model->releaseLock($name));
+        $this->assertTrue($this->model->unlock($name));
         $this->assertFalse($this->model->isLocked($name));
     }
 
-    public function testReleaseLockWithoutExistingLock()
+    public function testUnlockWithoutExistingLock()
     {
         $name = 'test_lock';
 
         $this->assertFalse($this->model->isLocked($name));
-        $this->assertFalse($this->model->releaseLock($name));
+        $this->assertFalse($this->model->unlock($name));
     }
 }

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

@@ -47,7 +47,7 @@ public function __construct(
      * @throws InputException
      * @throws AlreadyExistsException
      */
-    public function acquireLock(string $name, int $timeout = -1): bool
+    public function lock(string $name, int $timeout = -1): bool
     {
         $name = $this->addPrefix($name);
 
@@ -58,7 +58,10 @@ public function acquireLock(string $name, int $timeout = -1): bool
          */
         if ($this->currentLock) {
             throw new AlreadyExistsException(
-                new Phrase('This connection is already holding lock for $1', [$this->currentLock])
+                new Phrase(
+                    'Current connection is already holding lock for $1, only single lock allowed',
+                    [$this->currentLock]
+                )
             );
         }
 
@@ -81,7 +84,7 @@ public function acquireLock(string $name, int $timeout = -1): bool
      * @return bool
      * @throws InputException
      */
-    public function releaseLock(string $name): bool
+    public function unlock(string $name): bool
     {
         $name = $this->addPrefix($name);
 

lib/internal/Magento/Framework/Lock/LockManagerInterface.php

@@ -22,7 +22,7 @@ interface LockManagerInterface
      * @return bool
      * @api
      */
-    public function acquireLock(string $name, int $timeout = -1): bool;
+    public function lock(string $name, int $timeout = -1): bool;
 
     /**
      * Releases a lock
@@ -31,7 +31,7 @@ public function acquireLock(string $name, int $timeout = -1): bool;
      * @return bool
      * @api
      */
-    public function releaseLock(string $name): bool;
+    public function unlock(string $name): bool;
 
     /**
      * Tests if lock is set

lib/internal/Magento/Framework/Lock/README.md

@@ -3,6 +3,6 @@
 Lock library provides mechanism to acquire Magento system-wide lock. Default implementation is based on MySQL locks, where any locks are automatically released on connection close.
 
 The library provides interface *LockManagerInterface* which provides following methods:
-* *acquireLock* - Acquires a named lock
-* *releaseLock* - Releases a named lock
+* *lock* - Acquires a named lock
+* *unlock* - Releases a named lock
 * *isLocked* - Tests if a named lock exists

lib/internal/Magento/Framework/Lock/Test/Unit/Backend/DatabaseTest.php

@@ -61,33 +61,33 @@ protected function setUp()
         );
     }
 
-    public function testAcquireLock()
+    public function testLock()
     {
         $this->statement->expects($this->once())
             ->method('fetchColumn')
             ->willReturn(true);
 
-        $this->assertTrue($this->database->acquireLock('testLock'));
+        $this->assertTrue($this->database->lock('testLock'));
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\InputException
      */
-    public function testAcquireLockWithTooLongName()
+    public function testlockWithTooLongName()
     {
-        $this->database->acquireLock('BbXbyf9rIY5xuAVdviQJmh76FyoeeVHTDpcjmcImNtgpO4Hnz4xk76ZGEyYALvrQu');
+        $this->database->lock('BbXbyf9rIY5xuAVdviQJmh76FyoeeVHTDpcjmcImNtgpO4Hnz4xk76ZGEyYALvrQu');
     }
 
     /**
      * @expectedException \Magento\Framework\Exception\AlreadyExistsException
      */
-    public function testAcquireLockWithAlreadyAcquiredLockInSameSession()
+    public function testlockWithAlreadyAcquiredLockInSameSession()
     {
         $this->statement->expects($this->any())
             ->method('fetchColumn')
             ->willReturn(true);
 
-        $this->database->acquireLock('testLock');
-        $this->database->acquireLock('differentLock');
+        $this->database->lock('testLock');
+        $this->database->lock('differentLock');
     }
 }