Merge pull request #44 from magento-commerce/develop

MCLOUD-7868: Merge develop into 1.2

Author: oshmyheliuk

src/Test/Integration/_files/custom_cloud_base_native/docker-compose.exp.yml

@@ -102,7 +102,7 @@ services:
     image: 'magento/magento-cloud-docker-php:7.2-cli-1.2.0'
     env_file: ./.docker/config.env
     environment:
-      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl'
+      - 'PHP_EXTENSIONS=bcmath bz2 calendar exif gd gettext intl mysqli pcntl pdo_mysql soap sockets sysvmsg sysvsem sysvshm opcache zip xsl sodium'
   build:
     hostname: build.magento2.test
     image: 'magento/magento-cloud-docker-php:7.2-cli-1.2.0'

src/Test/Unit/Config/RelationshipTest.php

@@ -27,6 +27,9 @@ class RelationshipTest extends TestCase
      */
     private $configMock;
 
+    /**
+     * @var array
+     */
     public $defaultConfigs = [
         'database' => [
             [
@@ -93,9 +96,7 @@ public function testGet()
                 ['elasticsearch'],
                 ['rabbitmq']
             )
-            ->willReturnOnConsecutiveCalls(
-                true, false, false, true, true, true
-            );
+            ->willReturnOnConsecutiveCalls(true, false, false, true, true, true);
         $this->configMock->expects($this->exactly(4))
             ->method('getServiceVersion')
             ->withConsecutive(
@@ -105,7 +106,10 @@ public function testGet()
                 ['rabbitmq']
             )
             ->willReturnOnConsecutiveCalls(
-                $mysqlVersion, $redisVersion, $esVersion, $rmqVersion
+                $mysqlVersion,
+                $redisVersion,
+                $esVersion,
+                $rmqVersion
             );
 
         $this->assertEquals($configWithType, $this->relationship->get($this->configMock));