From 3ff780b012af356347bd39702a827710aa31f902 Mon Sep 17 00:00:00 2001
From: Willem Mouwen <willem@mouwen.dev>
Date: Thu, 16 May 2024 19:03:46 +0200
Subject: [PATCH] Remove removed keywords from list

---
 src/Platforms/Keywords/MySQL84Keywords.php | 12 +++++++++-
 tests/Platforms/MySQL84PlatformTest.php    | 27 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 tests/Platforms/MySQL84PlatformTest.php

diff --git a/src/Platforms/Keywords/MySQL84Keywords.php b/src/Platforms/Keywords/MySQL84Keywords.php
index 1813f77abc2..b057e71fd5a 100644
--- a/src/Platforms/Keywords/MySQL84Keywords.php
+++ b/src/Platforms/Keywords/MySQL84Keywords.php
@@ -1,9 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Doctrine\DBAL\Platforms\Keywords;
 
 use Doctrine\Deprecations\Deprecation;
 
+use function array_diff;
 use function array_merge;
 
 /**
@@ -30,12 +33,19 @@ public function getName()
     /**
      * {@inheritDoc}
      *
-     * @link https://dev.mysql.com/doc/refman/8.4/en/keywords.html#keywords-new-in-current-series
+     * @link https://dev.mysql.com/doc/refman/8.4/en/keywords.html
      */
     protected function getKeywords()
     {
         $keywords = parent::getKeywords();
 
+        // Removed Keywords and Reserved Words
+        $keywords = array_diff($keywords, [
+            'MASTER_BIND',
+            'MASTER_SSL_VERIFY_SERVER_CERT',
+        ]);
+
+        // New Keywords and Reserved Words
         $keywords = array_merge($keywords, [
             'AUTO',
             'BERNOULLI',
diff --git a/tests/Platforms/MySQL84PlatformTest.php b/tests/Platforms/MySQL84PlatformTest.php
new file mode 100644
index 00000000000..dc78ae38905
--- /dev/null
+++ b/tests/Platforms/MySQL84PlatformTest.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Platforms;
+
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Platforms\Keywords\KeywordList;
+use Doctrine\DBAL\Platforms\MySQL84Platform;
+
+class MySQL84PlatformTest extends MySQL57PlatformTest
+{
+    public function createPlatform(): AbstractPlatform
+    {
+        return new MySQL84Platform();
+    }
+
+    public function testMySQL84KeywordList(): void
+    {
+        $keywordList = $this->platform->getReservedKeywordsList();
+        self::assertInstanceOf(KeywordList::class, $keywordList);
+
+        self::assertTrue($keywordList->isKeyword('persist'));
+        self::assertTrue($keywordList->isKeyword('manual'));
+        self::assertFalse($keywordList->isKeyword('master_bind'));
+    }
+}