Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit ef385e2259e9 · 2023-02-01T22:04:27.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
@@ -890,7 +890,7 @@ private function getMessageForNoRowsReturned(
         StatementInfo $statementInfo,
         $numRows
     ): Message {
-        if ($statementInfo->queryType === 'DELETE"') {
+        if ($statementInfo->queryType === 'DELETE') {
             $message = Message::getMessageForDeletedRows($numRows);
         } elseif ($statementInfo->isInsert) {
             if ($statementInfo->queryType === 'REPLACE') {
diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php
@@ -501,7 +501,7 @@ public function testCheckConfigSource(): void
         $this->assertFalse($this->object->checkConfigSource());
         $this->assertEquals(0, $this->object->sourceMtime);
 
-        $this->object->setSource(ROOT_PATH . 'test/test_data/config.inc.php');
+        $this->object->setSource(TEST_PATH . 'test/test_data/config.inc.php');
 
         $this->assertNotEmpty($this->object->getSource());
         $this->assertTrue($this->object->checkConfigSource());
diff --git a/test/classes/RoutingTest.php b/test/classes/RoutingTest.php
@@ -12,7 +12,7 @@
 use function unlink;
 
 use const CACHE_DIR;
-use const ROOT_PATH;
+use const TEST_PATH;
 
 /**
  * @covers \PhpMyAdmin\Routing
@@ -26,8 +26,8 @@ public function testGetDispatcher(): void
     {
         $expected = [Dispatcher::FOUND, HomeController::class, []];
         $cacheFilename = CACHE_DIR . 'routes.cache.php';
-        $validCacheFilename = ROOT_PATH . 'test/test_data/routes/routes-valid.cache.txt';
-        $invalidCacheFilename = ROOT_PATH . 'test/test_data/routes/routes-invalid.cache.txt';
+        $validCacheFilename = TEST_PATH . 'test/test_data/routes/routes-valid.cache.txt';
+        $invalidCacheFilename = TEST_PATH . 'test/test_data/routes/routes-invalid.cache.txt';
         $GLOBALS['cfg']['environment'] = null;
 
         $this->assertDirectoryIsWritable(CACHE_DIR);
diff --git a/yarn.lock b/yarn.lock
