Merge remote-tracking branch 'remotes/mainline-ce/2.3-develop' into MAGETWO-89470-Media-Gallery-Dynamic-Config

Author: danmooney2

.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:

README.md

@@ -3,16 +3,15 @@
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.png)](https://crowdin.com/project/magento-2)
 <h2>Welcome</h2>
-Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
+Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
-[Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html)
+[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html)
 
 ## Install Magento
 To install Magento, see either:
 
-*	[Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
-*	[Installation guide](http://devdocs.magento.com/guides/v2.2/install-gde/bk-install-guide.html)
+*	[Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html)
 
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -23,11 +22,24 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html>
-[2]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#report>
+[1]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
+[2]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
 [3]: <https://github.com/magento/magento2/issues>
 [4]: <http://devdocs.magento.com>
 
+<h3>Community Maintainers</h3>
+The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
+
+<a href="https://magento.com/magento-contributors#maintainers">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
+</a>
+
+<h3>Top Contributors</h3>
+Magento team thanks for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, your contributions are the foundation of the Magento open source platform.
+<a href="https://magento.com/magento-contributors">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
+</a>
+
 <h3>Labels applied by the Magento team</h3>
 
 | Label        | Description           | 

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": "*",