Merge remote-tracking branch 'origin/MAGETWO-71620-Null-input-not-allowed-for-config-sensitive-set' into BundledPR-Sep7b

Author: pdohogne-magento

app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/AddressTest.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Test\Unit\Model\Config\Backend\Email;
+
+use Magento\Config\Model\Config\Backend\Email\Address;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class AddressTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Address
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->model = $objectManager->getObject(Address::class);
+    }
+
+    /**
+     * @dataProvider beforeSaveDataProvider
+     * @param string|null $value
+     * @param string|bool $expectedValue false if exception to be thrown
+     * @return void
+     */
+    public function testBeforeSave($value, $expectedValue)
+    {
+        $this->model->setValue($value);
+
+        if ($expectedValue === false) {
+            $this->expectException(LocalizedException::class);
+        }
+
+        $this->model->beforeSave();
+        $this->assertEquals($expectedValue, $this->model->getValue());
+    }
+
+    public function beforeSaveDataProvider()
+    {
+        return [
+            ['[email protected]', '[email protected]'],
+            ['[email protected]', '[email protected]'],
+            ['not.a.real.email', false],
+            [null, false],
+            ['', false]
+        ];
+    }
+}

app/code/Magento/Config/Test/Unit/Model/Config/Backend/Email/SenderTest.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Test\Unit\Model\Config\Backend\Email;
+
+use Magento\Config\Model\Config\Backend\Email\Sender;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+
+class SenderTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Sender
+     */
+    private $model;
+
+    protected function setUp()
+    {
+        $objectManager = new ObjectManager($this);
+        $this->model = $objectManager->getObject(Sender::class);
+    }
+
+    /**
+     * @dataProvider beforeSaveDataProvider
+     * @param string|null $value
+     * @param string|bool $expectedValue false if exception to be thrown
+     * @return void
+     */
+    public function testBeforeSave($value, $expectedValue)
+    {
+        $this->model->setValue($value);
+
+        if ($expectedValue === false) {
+            $this->expectException(LocalizedException::class);
+        }
+
+        $this->model->beforeSave();
+
+        $this->assertEquals($expectedValue, $this->model->getValue());
+    }
+
+    public function beforeSaveDataProvider()
+    {
+        return [
+            ['Mr. Real Name', 'Mr. Real Name'],
+            [str_repeat('a', 256), false],
+            [null, false],
+            ['', false],
+        ];
+    }
+}

app/code/Magento/Deploy/Model/ConfigWriter.php

@@ -63,6 +63,14 @@ public function save(array $values, $scope = ScopeConfigInterface::SCOPE_TYPE_DE
     {
         $config = [];
         $pathPrefix = $this->getPathPrefix($scope, $scopeCode);
+
+        $values = array_filter(
+            $values,
+            function ($value) {
+                return $value !== null;
+            }
+        );
+
         foreach ($values as $configPath => $configValue) {
             $fullConfigPath = $pathPrefix . $configPath;
             $backendModel = $this->preparedValueFactory->create($configPath, $configValue, $scope, $scopeCode);

app/code/Magento/Deploy/Test/Unit/Model/ConfigWriterTest.php

@@ -168,4 +168,23 @@ public function testSaveDefaultScope()
 
         $this->model->save($values);
     }
+
+    /**
+     * Save null (empty input) through CLI and assert it does not create backend model for validation
+     * @return void
+     */
+    public function testSavingNullValues()
+    {
+        $values = [
+            'some1/config1/path1' => null,
+        ];
+
+        $this->preparedValueFactoryMock->expects($this->never())->method('create');
+
+        $this->writerMock->expects($this->once())
+            ->method('saveConfig')
+            ->with([ConfigFilePool::APP_ENV => []]);
+
+        $this->model->save($values);
+    }
 }