MCLOUD-7416: Fix validator for MariaDB (#30)

Author: oshmyheliuk

src/Service/Validator.php

@@ -31,13 +31,14 @@ class Validator
             '>=2.4.0' => '>=7.3 <7.5', // '~7.3.0||~7.4.0'
         ],
         ServiceInterface::NAME_DB_MARIA => [
-            '<2.4.0' => '>=10.0 <10.3',
+            '<2.3.6-p1' => '>=10.0 <10.3',
+            '>=2.3.6-p1 <2.4.0' => '>=10.0 <10.4',
             '>=2.4.0' => '>=10.2 <10.5',
         ],
         ServiceInterface::NAME_DB_MYSQL => [
             '<2.3.0' => '~5.6.0 || ~5.7.0',
             '>=2.3.0 <2.4.0' => '~5.7.0',
-            '>=2.4.0' => '~8.0.0',
+            '>=2.4.0' => '~5.7.0 || ~8.0.0',
         ],
         ServiceInterface::NAME_DB_AURORA => [
             '<2.3.0' => '~1.0.0 || ~2.0.0',

src/Test/Unit/Service/ValidatorTest.php

@@ -7,10 +7,10 @@
 
 namespace Magento\MagentoCloud\Test\Unit\Service;
 
-use Magento\MagentoCloud\Filesystem\Flag\ConfigurationMismatchException;
 use Magento\MagentoCloud\Package\MagentoVersion;
 use Magento\MagentoCloud\Package\UndefinedPackageException;
 use Magento\MagentoCloud\Service\ServiceInterface;
+use Magento\MagentoCloud\Service\ServiceMismatchException;
 use Magento\MagentoCloud\Service\Validator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -44,8 +44,8 @@ protected function setUp()
      * @param string $magentoVersion
      * @param array $versions
      * @param int $errorsNumber
-     * @throws ConfigurationMismatchException
      * @throws UndefinedPackageException
+     * @throws ServiceMismatchException
      *
      * @dataProvider validateVersionsDataProvider
      */
@@ -58,8 +58,8 @@ public function testValidateVersions(string $magentoVersion, array $versions, in
     }
 
     /**
-     * @throws ConfigurationMismatchException
      * @throws UndefinedPackageException
+     * @throws \Magento\MagentoCloud\Service\ServiceMismatchException
      */
     public function testValidateFailMessage()
     {
@@ -83,8 +83,8 @@ public function testValidateFailMessage()
     }
 
     /**
-     * @throws ConfigurationMismatchException
      * @throws UndefinedPackageException
+     * @throws ServiceMismatchException
      */
     public function testValidateNonexistentService()
     {
@@ -195,6 +195,27 @@ public function validateVersionsDataProvider(): array
                 ],
                 1
             ],
+            [
+                '2.4.1',
+                [
+                    ServiceInterface::NAME_DB_MYSQL => '5.6',
+                ],
+                1
+            ],
+            [
+                '2.4.1',
+                [
+                    ServiceInterface::NAME_DB_MYSQL => '5.7',
+                ],
+                0
+            ],
+            [
+                '2.4.1',
+                [
+                    ServiceInterface::NAME_DB_MYSQL => '8.0',
+                ],
+                0
+            ],
             [
                 '2.4.2',
                 [
@@ -212,13 +233,27 @@ public function validateVersionsDataProvider(): array
                 '2.3.6',
                 [
                     ServiceInterface::NAME_PHP => '7.4', // wrong
-                    ServiceInterface::NAME_DB_MARIA => '10.2',
+                    ServiceInterface::NAME_DB_MARIA => '10.3', // wrong
                     ServiceInterface::NAME_NGINX => '1.19',
                     ServiceInterface::NAME_VARNISH => '6.2',
                     ServiceInterface::NAME_REDIS => '5.0',
                     ServiceInterface::NAME_ELASTICSEARCH => '7.9', //wrong
                 ],
-                2
+                3
+            ],
+            [
+                '2.3.6-p1',
+                [
+                    ServiceInterface::NAME_DB_MARIA => '10.3',
+                ],
+                0
+            ],
+            [
+                '2.3.6-p1',
+                [
+                    ServiceInterface::NAME_DB_MARIA => '10.4', // wrong
+                ],
+                1
             ],
             [
                 '2.3.7',