Merge remote-tracking branch 'origin/MQE-920-MSI-MFTF-Test-Cases-2' into MQE-920-MSI-MFTF-Test-Cases-2

Author: ivy00johns

.travis.yml

@@ -17,6 +17,7 @@ services:
 language: php
 php:
   - 7.1
+  - 7.2
 env:
   global:
     - COMPOSER_BIN_DIR=~/bin
@@ -32,6 +33,16 @@ env:
     - TEST_SUITE=integration INTEGRATION_INDEX=2
     - TEST_SUITE=integration INTEGRATION_INDEX=3
     - TEST_SUITE=functional
+matrix:
+  exclude:
+    - php: 7.1
+      env: TEST_SUITE=static
+    - php: 7.1
+      env: TEST_SUITE=js GRUNT_COMMAND=spec
+    - php: 7.1
+      env: TEST_SUITE=js GRUNT_COMMAND=static
+    - php: 7.1
+      env: TEST_SUITE=functional
 cache:
   apt: true
   directories:

app/code/Magento/AdminNotification/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "lib-libxml": "*",
         "magento/framework": "*",
         "magento/module-backend": "*",

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "magento/framework": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-import-export": "*",

app/code/Magento/AdvancedSearch/composer.json

@@ -13,7 +13,7 @@
         "magento/module-customer": "*",
         "magento/module-search": "*",
         "magento/module-store": "*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "php": "~7.1.3||~7.2.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Amqp/Setup/ConfigOptionsList.php

@@ -25,6 +25,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface
     const INPUT_KEY_QUEUE_AMQP_PASSWORD = 'amqp-password';
     const INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST = 'amqp-virtualhost';
     const INPUT_KEY_QUEUE_AMQP_SSL = 'amqp-ssl';
+    const INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS = 'amqp-ssl-options';
 
     /**
      * Path to the values in the deployment config
@@ -35,6 +36,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface
     const CONFIG_PATH_QUEUE_AMQP_PASSWORD = 'queue/amqp/password';
     const CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST = 'queue/amqp/virtualhost';
     const CONFIG_PATH_QUEUE_AMQP_SSL = 'queue/amqp/ssl';
+    const CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS = 'queue/amqp/ssl_options';
 
     /**
      * Default values
@@ -109,6 +111,13 @@ public function getOptions()
                 'Amqp SSL',
                 self::DEFAULT_AMQP_SSL
             ),
+            new TextConfigOption(
+                self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS,
+                TextConfigOption::FRONTEND_WIZARD_TEXTAREA,
+                self::CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS,
+                'Amqp SSL Options (JSON)',
+                self::DEFAULT_AMQP_SSL
+            ),
         ];
     }
 
@@ -140,6 +149,21 @@ public function createConfig(array $data, DeploymentConfig $deploymentConfig)
             if (!$this->isDataEmpty($data, self::INPUT_KEY_QUEUE_AMQP_SSL)) {
                 $configData->set(self::CONFIG_PATH_QUEUE_AMQP_SSL, $data[self::INPUT_KEY_QUEUE_AMQP_SSL]);
             }
+            if (!$this->isDataEmpty(
+                $data,
+                self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS
+            )) {
+                $options = json_decode(
+                    $data[self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS],
+                    true
+                );
+                if ($options !== null) {
+                    $configData->set(
+                        self::CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS,
+                        $options
+                    );
+                }
+            }
         }
 
         return [$configData];
@@ -154,12 +178,28 @@ public function validate(array $options, DeploymentConfig $deploymentConfig)
 
         if (isset($options[self::INPUT_KEY_QUEUE_AMQP_HOST])
             && $options[self::INPUT_KEY_QUEUE_AMQP_HOST] !== '') {
+            if (!$this->isDataEmpty(
+                $options,
+                self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS
+            )) {
+                $sslOptions = json_decode(
+                    $options[self::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS],
+                    true
+                );
+            } else {
+                $sslOptions = null;
+            }
+            $isSslEnabled = !empty($options[self::INPUT_KEY_QUEUE_AMQP_SSL])
+                && $options[self::INPUT_KEY_QUEUE_AMQP_SSL] !== 'false';
+
             $result = $this->connectionValidator->isConnectionValid(
                 $options[self::INPUT_KEY_QUEUE_AMQP_HOST],
                 $options[self::INPUT_KEY_QUEUE_AMQP_PORT],
                 $options[self::INPUT_KEY_QUEUE_AMQP_USER],
                 $options[self::INPUT_KEY_QUEUE_AMQP_PASSWORD],
-                $options[self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST]
+                $options[self::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST],
+                $isSslEnabled,
+                $sslOptions
             );
 
             if (!$result) {

app/code/Magento/Amqp/Setup/ConnectionValidator.php

@@ -5,13 +5,27 @@
  */
 namespace Magento\Amqp\Setup;
 
-use PhpAmqpLib\Connection\AMQPStreamConnection;
+use Magento\Framework\Amqp\Connection\Factory as ConnectionFactory;
+use Magento\Framework\Amqp\Connection\FactoryOptions;
 
 /**
  * Class ConnectionValidator - validates Amqp related settings
  */
 class ConnectionValidator
 {
+    /**
+     * @var ConnectionFactory
+     */
+    private $connectionFactory;
+
+    /**
+     * @param ConnectionFactory $connectionFactory
+     */
+    public function __construct(ConnectionFactory $connectionFactory)
+    {
+        $this->connectionFactory = $connectionFactory;
+    }
+
     /**
      * Checks Amqp Connection
      *
@@ -20,18 +34,33 @@ class ConnectionValidator
      * @param string $user
      * @param string $password
      * @param string $virtualHost
+     * @param bool $ssl
+     * @param string[]|null $sslOptions
      * @return bool true if the connection succeeded, false otherwise
      */
-    public function isConnectionValid($host, $port, $user, $password = '', $virtualHost = '')
-    {
+    public function isConnectionValid(
+        $host,
+        $port,
+        $user,
+        $password = '',
+        $virtualHost = '',
+        bool $ssl = false,
+        array $sslOptions = null
+    ) {
         try {
-            $connection = new AMQPStreamConnection(
-                $host,
-                $port,
-                $user,
-                $password,
-                $virtualHost
-            );
+            $options = new FactoryOptions();
+            $options->setHost($host);
+            $options->setPort($port);
+            $options->setUsername($user);
+            $options->setPassword($password);
+            $options->setVirtualHost($virtualHost);
+            $options->setSslEnabled($ssl);
+
+            if ($sslOptions) {
+                $options->setSslOptions($sslOptions);
+            }
+
+            $connection = $this->connectionFactory->create($options);
 
             $connection->close();
         } catch (\Exception $e) {

app/code/Magento/Amqp/Test/Unit/Setup/ConfigOptionsListTest.php

@@ -47,7 +47,7 @@ protected function setUp()
             ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password',
             ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host',
             ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl',
-
+            ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS => '{"ssl_option":"test"}',
         ];
 
         $this->objectManager = new ObjectManager($this);
@@ -113,7 +113,14 @@ public function testGetOptions()
                 ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_SSL,
                 'Amqp SSL',
                 ConfigOptionsList::DEFAULT_AMQP_SSL
-            )
+            ),
+            new TextConfigOption(
+                ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS,
+                TextConfigOption::FRONTEND_WIZARD_TEXTAREA,
+                ConfigOptionsList::CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS,
+                'Amqp SSL Options (JSON)',
+                ConfigOptionsList::DEFAULT_AMQP_SSL
+            ),
         ];
         $this->assertEquals($expectedOptions, $this->model->getOptions());
     }
@@ -167,6 +174,7 @@ public function getCreateConfigDataProvider()
                     ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password',
                     ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host',
                     ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS => '{"ssl_option":"test"}',
                 ],
                 ['queue' =>
                     ['amqp' =>
@@ -177,6 +185,7 @@ public function getCreateConfigDataProvider()
                             'password' => 'password',
                             'virtualhost' => 'virtual host',
                             'ssl' => 'ssl',
+                            'ssl_options' => ['ssl_option' => 'test'],
                          ]
                     ]
                 ],
@@ -189,6 +198,7 @@ public function getCreateConfigDataProvider()
                     ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_PASSWORD => 'password',
                     ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST => 'virtual host',
                     ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL => 'ssl',
+                    ConfigOptionsList::INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS => '{"ssl_option":"test"}',
                 ],
                 ['queue' =>
                     ['amqp' =>
@@ -199,6 +209,7 @@ public function getCreateConfigDataProvider()
                             'password' => 'password',
                             'virtualhost' => 'virtual host',
                             'ssl' => 'ssl',
+                            'ssl_options' => ['ssl_option' => 'test'],
                          ]
                     ]
                 ],

app/code/Magento/Amqp/composer.json

@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/framework-amqp": "*",
         "magento/framework-message-queue": "*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "php": "~7.1.3||~7.2.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Analytics/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-analytics",
     "description": "N/A",
     "require": {
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+        "php": "~7.1.3||~7.2.0",
         "magento/module-backend": "*",
         "magento/module-config": "*",
         "magento/module-integration": "*",

app/code/Magento/AsynchronousOperations/composer.json

@@ -11,7 +11,7 @@
         "magento/module-backend": "*",
         "magento/module-ui": "*",
         "magento/module-user": "*",
-        "php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
+        "php": "~7.1.3||~7.2.0"
     },
     "suggest": {
         "magento/module-admin-notification": "*",