Merge branch '2.4-develop' into feature/cms-block

Author: lbajsarowicz

app/code/Magento/Config/etc/di.xml

@@ -96,7 +96,7 @@
 
     <virtualType name="systemConfigQueryLocker" type="Magento\Framework\Cache\LockGuardedCacheLoader">
         <arguments>
-            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
+            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Database</argument>
         </arguments>
     </virtualType>
 

app/etc/di.xml

@@ -1786,7 +1786,7 @@
     </type>
     <type name="Magento\Framework\Cache\LockGuardedCacheLoader">
         <arguments>
-            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Cache</argument>
+            <argument name="locker" xsi:type="object">Magento\Framework\Lock\Backend\Database</argument>
         </arguments>
     </type>
     <preference for="Magento\Framework\HTTP\AsyncClientInterface" type="Magento\Framework\HTTP\AsyncClient\GuzzleAsyncClient" />

dev/tests/integration/etc/di/preferences/ce.php

@@ -27,7 +27,7 @@
     \Magento\Framework\App\Config\ScopeConfigInterface::class => \Magento\TestFramework\App\Config::class,
     \Magento\Framework\App\ResourceConnection\ConfigInterface::class =>
         \Magento\Framework\App\ResourceConnection\Config::class,
-    \Magento\Framework\Lock\Backend\Cache::class =>
+    \Magento\Framework\Lock\Backend\Database::class =>
         \Magento\TestFramework\Lock\Backend\DummyLocker::class,
     \Magento\Framework\Session\SessionStartChecker::class => \Magento\TestFramework\Session\SessionStartChecker::class,
     \Magento\Framework\HTTP\AsyncClientInterface::class => \Magento\TestFramework\HTTP\AsyncClientInterfaceMock::class,

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

@@ -7,6 +7,9 @@
 
 namespace Magento\Framework\Lock\Backend;
 
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\DeploymentConfig;
+
 /**
  * \Magento\Framework\Lock\Backend\Database test case
  */
@@ -25,7 +28,10 @@ class DatabaseTest extends \PHPUnit\Framework\TestCase
     protected function setUp(): void
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->model = $this->objectManager->create(\Magento\Framework\Lock\Backend\Database::class);
+        $resourceConnection = $this->objectManager->create(ResourceConnection::class);
+        $deploymentConfig = $this->objectManager->create(DeploymentConfig::class);
+        // create object with new otherwise dummy locker is created because of di.xml preference for integration tests
+        $this->model = new Database($resourceConnection, $deploymentConfig);
     }
 
     public function testLockAndUnlock()

dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\MessageQueue\Model\Cron;
 
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\Lock\Backend\Database;
 use Magento\Framework\MessageQueue\Consumer\ConfigInterface as ConsumerConfigInterface;
 use Magento\Framework\Lock\LockManagerInterface;
 use Magento\Framework\App\DeploymentConfig\FileReader;
@@ -83,7 +86,10 @@ protected function setUp(): void
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->shellMock = $this->getMockBuilder(ShellInterface::class)
             ->getMockForAbstractClass();
-        $this->lockManager = $this->objectManager->get(LockManagerInterface::class);
+        $resourceConnection = $this->objectManager->create(ResourceConnection::class);
+        $deploymentConfig = $this->objectManager->create(DeploymentConfig::class);
+        // create object with new otherwise dummy locker is created because of di.xml preference for integration tests
+        $this->lockManager = new Database($resourceConnection, $deploymentConfig);
         $this->consumerConfig = $this->objectManager->get(ConsumerConfigInterface::class);
         $this->reader = $this->objectManager->get(FileReader::class);
         $this->filesystem = $this->objectManager->get(Filesystem::class);

dev/tests/static/testsuite/Magento/Test/Integrity/Phrase/ArgumentsTest.php

@@ -99,9 +99,20 @@ private function checkArgumentMismatch($phrase, &$incorrectNumberOfArgumentsErro
     {
         if (preg_match_all('/%(\w+)/', $phrase['phrase'], $matches) || $phrase['arguments']) {
             $placeholderCount = count(array_unique($matches[1]));
+            // count all occurrences of sprintf placeholders
+            preg_match_all('/%\b([sducoxXbgGeEfF])\b/', $phrase['phrase'], $sprintfMatches);
+            if (count($sprintfMatches[0]) > count(array_unique($sprintfMatches[0]))) {
+                $placeholderCount = $placeholderCount +
+                    count($sprintfMatches[0]) - count(array_unique($sprintfMatches[0]));
+            }
 
-            // Check for zend placeholders %placeholder% and sprintf placeholder %s
-            if (preg_match_all('/%((s)|([A-Za-z]+)%)/', $phrase['phrase'], $placeHolders, PREG_OFFSET_CAPTURE)) {
+            // Check for zend placeholders %placeholder% and sprintf placeholders and remove from the count
+            if (preg_match_all(
+                '/%\b(([sducoxXbgGeEfF])\b|([A-Za-z]+)%)/',
+                $phrase['phrase'],
+                $placeHolders,
+                PREG_OFFSET_CAPTURE
+            )) {
                 foreach ($placeHolders[0] as $ph) {
                     // Check if char after placeholder is not a digit or letter
                     $charAfterPh = $phrase['phrase'][$ph[1] + strlen($ph[0])];

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

@@ -10,9 +10,9 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Config\ConfigOptionsListConstants;
-use Magento\Framework\Exception\AlreadyExistsException;
-use Magento\Framework\Phrase;
 use Magento\Framework\DB\ExpressionConverter;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\RuntimeException;
 
 /**
  * Implementation of the lock manager on the basis of MySQL.
@@ -68,7 +68,8 @@ public function __construct(
      * @param string $name lock name
      * @param int $timeout How long to wait lock acquisition in seconds, negative value means infinite timeout
      * @return bool
-     * @throws AlreadyExistsException
+     * @throws FileSystemException
+     * @throws RuntimeException
      * @throws \Zend_Db_Statement_Exception
      */
     public function lock(string $name, int $timeout = -1): bool
@@ -78,20 +79,6 @@ public function lock(string $name, int $timeout = -1): bool
         }
         $name = $this->addPrefix($name);
 
-        /**
-         * Before MySQL 5.7.5, only a single simultaneous lock per connection can be acquired.
-         * This limitation can be removed once MySQL minimum requirement has been raised,
-         * currently we support MySQL 5.6 way only.
-         */
-        if ($this->currentLock) {
-            throw new AlreadyExistsException(
-                new Phrase(
-                    'Current connection is already holding lock for %1, only single lock allowed',
-                    [$this->currentLock]
-                )
-            );
-        }
-
         $result = (bool)$this->resource->getConnection()->query(
             "SELECT GET_LOCK(?, ?);",
             [$name, $timeout < 0 ? self::MAX_LOCK_TIME : $timeout]

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

@@ -10,7 +10,6 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\Exception\AlreadyExistsException;
 use Magento\Framework\Lock\Backend\Database;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -90,7 +89,6 @@ protected function setUp(): void
     }
 
     /**
-     * @throws AlreadyExistsException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testLock()
@@ -107,7 +105,6 @@ public function testLock()
     }
 
     /**
-     * @throws AlreadyExistsException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testlockWithTooLongName()
@@ -124,12 +121,10 @@ public function testlockWithTooLongName()
     }
 
     /**
-     * @throws AlreadyExistsException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testlockWithAlreadyAcquiredLockInSameSession()
     {
-        $this->expectException('Magento\Framework\Exception\AlreadyExistsException');
         $this->deploymentConfig
             ->method('isDbAvailable')
             ->with()
@@ -138,12 +133,11 @@ public function testlockWithAlreadyAcquiredLockInSameSession()
             ->method('fetchColumn')
             ->willReturn(true);
 
-        $this->database->lock('testLock');
-        $this->database->lock('differentLock');
+        $this->assertTrue($this->database->lock('testLock'));
+        $this->assertTrue($this->database->lock('differentLock'));
     }
 
     /**
-     * @throws AlreadyExistsException
      * @throws \Zend_Db_Statement_Exception
      */
     public function testLockWithUnavailableDeploymentConfig()