Merge branch 'develop' into MCLOUD-7197

Author: oshmyheliuk

src/Service/Validator.php

@@ -43,14 +43,17 @@ class Validator
             '>=2.3.3' => '^4.0 || ^5.0 || ^6.2',
         ],
         ServiceInterface::NAME_REDIS => [
-            '*' => '~3.2.0 || ~4.0.0 || ~5.0.0',
+            '*' => '~3.2.0 || ~4.0.0 || ~5.0.0 || ~6.0.0',
         ],
         ServiceInterface::NAME_ELASTICSEARCH => [
             '<2.2.0' => '~1.7.0 || ~2.4.0',
             '>=2.2.0 <2.2.8 || 2.3.0' => '~1.7.0 || ~2.4.0 || ~5.2.0',
             '>=2.2.8 <2.3.0 || >=2.3.1 <2.3.5' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0',
-            '>=2.3.5 <2.4.0' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0 || ~7.5.0 || ~7.6.0 || ~7.7.0',
-            '>=2.4.0' => '~7.5.0 || ~7.6.0 || ~7.7.0',
+            '>=2.3.5 <2.3.7' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0 || ~7.5.0 || ~7.6.0 || ~7.7.0',
+            '>=2.3.7 <2.4.0' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0 || ~7.5.0 || ~7.6.0 || ~7.7.0' .
+                ' || ~7.9.0',
+            '>=2.4.0 <2.4.2' => '~7.5.0 || ~7.6.0 || ~7.7.0',
+            '>=2.4.2' => '~7.5.0 || ~7.6.0 || ~7.7.0 || ~7.9.0',
         ],
         ServiceInterface::NAME_RABBITMQ => [
             '<2.3.0' => '~3.5.0',

src/Test/Unit/Service/ValidatorTest.php

@@ -107,6 +107,8 @@ public function testValidateNonexistentService()
 
     /**
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function validateVersionsDataProvider(): array
     {
@@ -180,6 +182,51 @@ public function validateVersionsDataProvider(): array
                 ],
                 0
             ],
+            [
+                '2.4.1',
+                [
+                    ServiceInterface::NAME_PHP => '7.4',
+                    ServiceInterface::NAME_DB => '10.4',
+                    ServiceInterface::NAME_NGINX => '1.9',
+                    ServiceInterface::NAME_VARNISH => '6.2',
+                    ServiceInterface::NAME_REDIS => '5.0',
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.9', // wrong
+                    ServiceInterface::NAME_RABBITMQ => '3.8'
+                ],
+                1
+            ],
+            [
+                '2.4.2',
+                [
+                    ServiceInterface::NAME_PHP => '7.4',
+                    ServiceInterface::NAME_DB => '10.4',
+                    ServiceInterface::NAME_NGINX => '1.9',
+                    ServiceInterface::NAME_VARNISH => '6.2',
+                    ServiceInterface::NAME_REDIS => '5.0',
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.9',
+                    ServiceInterface::NAME_RABBITMQ => '3.8'
+                ],
+                0
+            ],
+            [
+                '2.3.6',
+                [
+                    ServiceInterface::NAME_PHP => '7.4', // wrong
+                    ServiceInterface::NAME_DB => '10.2',
+                    ServiceInterface::NAME_NGINX => '1.19',
+                    ServiceInterface::NAME_VARNISH => '6.2',
+                    ServiceInterface::NAME_REDIS => '5.0',
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.9', //wrong
+                ],
+                2
+            ],
+            [
+                '2.3.7',
+                [
+                    ServiceInterface::NAME_ELASTICSEARCH => '7.9',
+                ],
+                0
+            ],
             [
                 '2.1.4',
                 [ServiceInterface::NAME_PHP => '5.6'],