Merge branches 'MAGETWO-63084', 'MAGETWO-63381', 'MAGETWO-64223' and 'MAGETWO-64557' of https://github.com/magento-falcons/magento2ce into MAGETWO-65085

Author: shiftedreality

app/code/Magento/Backend/Block/System/Account/Edit/Form.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Backend\Block\System\Account\Edit;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Locale\Deployed\OptionInterface;
+
 /**
  * Adminhtml edit admin user account form
  *
@@ -29,6 +32,13 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      */
     protected $_localeLists;
 
+    /**
+     * Operates with deployed locales.
+     *
+     * @var OptionInterface
+     */
+    private $deployedLocales;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -37,6 +47,7 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      * @param \Magento\Backend\Model\Auth\Session $authSession
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
      * @param array $data
+     * @param OptionInterface $deployedLocales Operates with deployed locales
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
@@ -45,11 +56,14 @@ public function __construct(
         \Magento\User\Model\UserFactory $userFactory,
         \Magento\Backend\Model\Auth\Session $authSession,
         \Magento\Framework\Locale\ListsInterface $localeLists,
-        array $data = []
+        array $data = [],
+        OptionInterface $deployedLocales = null
     ) {
         $this->_userFactory = $userFactory;
         $this->_authSession = $authSession;
         $this->_localeLists = $localeLists;
+        $this->deployedLocales = $deployedLocales
+            ?: ObjectManager::getInstance()->get(OptionInterface::class);
         parent::__construct($context, $registry, $formFactory, $data);
     }
 
@@ -121,7 +135,7 @@ protected function _prepareForm()
                 'name' => 'interface_locale',
                 'label' => __('Interface Locale'),
                 'title' => __('Interface Locale'),
-                'values' => $this->_localeLists->getTranslatedOptionLocales(),
+                'values' => $this->deployedLocales->getTranslatedLocales(),
                 'class' => 'select'
             ]
         );

app/code/Magento/Config/Console/Command/ConfigSetCommand.php

@@ -6,6 +6,7 @@
 namespace Magento\Config\Console\Command;
 
 use Magento\Config\Console\Command\ConfigSet\ConfigSetProcessorFactory;
+use Magento\Config\Model\Config\PathValidatorFactory;
 use Magento\Framework\App\Area;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Scope\ValidatorInterface;
@@ -33,33 +34,49 @@ class ConfigSetCommand extends Command
     /**#@-*/
 
     /**
+     * The factory for config:set processors.
+     *
      * @var ConfigSetProcessorFactory
      */
     private $configSetProcessorFactory;
 
     /**
+     * Scope validator.
+     *
      * @var ValidatorInterface
      */
     private $validator;
 
     /**
+     * Scope manager.
+     *
      * @var ScopeInterface
      */
     private $scope;
 
     /**
-     * @param ConfigSetProcessorFactory $configSetProcessorFactory
-     * @param ValidatorInterface $validator
-     * @param ScopeInterface $scope
+     * The factory for path validator.
+     *
+     * @var PathValidatorFactory
+     */
+    private $pathValidatorFactory;
+
+    /**
+     * @param ConfigSetProcessorFactory $configSetProcessorFactory The factory for config:set processors
+     * @param ValidatorInterface $validator Scope validator
+     * @param ScopeInterface $scope Scope manager
+     * @param PathValidatorFactory $pathValidatorFactory The factory for path validator
      */
     public function __construct(
         ConfigSetProcessorFactory $configSetProcessorFactory,
         ValidatorInterface $validator,
-        ScopeInterface $scope
+        ScopeInterface $scope,
+        PathValidatorFactory $pathValidatorFactory
     ) {
         $this->configSetProcessorFactory = $configSetProcessorFactory;
         $this->validator = $validator;
         $this->scope = $scope;
+        $this->pathValidatorFactory = $pathValidatorFactory;
 
         parent::__construct();
     }
@@ -118,6 +135,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
             // Emulating adminhtml scope to be able to read configs.
             $this->scope->setCurrentScope(Area::AREA_ADMINHTML);
 
+            /**
+             * Validates the entered config path.
+             * Requires emulated area.
+             */
+            $this->pathValidatorFactory->create()->validate(
+                $input->getArgument(ConfigSetCommand::ARG_PATH)
+            );
+
             $processor = $input->getOption(static::OPTION_LOCK)
                 ? $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_LOCK)
                 : $this->configSetProcessorFactory->create(ConfigSetProcessorFactory::TYPE_DEFAULT);

app/code/Magento/Config/Console/Command/ConfigShow/ValueProcessor.php

@@ -12,12 +12,20 @@
 use Magento\Config\Model\Config\Structure\Element\Field;
 use Magento\Framework\Config\ScopeInterface;
 use Magento\Framework\App\Area;
+use Magento\Config\Model\Config\Backend\Encrypted;
 
 /**
  * Class processes values using backend model which declared in system.xml.
  */
 class ValueProcessor
 {
+    /**
+     * Placeholder for the output of sensitive data.
+     *
+     * @const
+     */
+    const SAFE_PLACEHOLDER = '******';
+
     /**
      * System configuration structure factory.
      *
@@ -84,6 +92,8 @@ public function process($scope, $scopeCode, $value, $path)
         $backendModel->setValue($value);
         $backendModel->afterLoad();
 
-        return $backendModel->getValue();
+        return ($backendModel instanceof Encrypted) && !empty($backendModel->getValue())
+            ? self::SAFE_PLACEHOLDER
+            : $backendModel->getValue();
     }
 }

app/code/Magento/Config/Console/Command/ConfigShowCommand.php

@@ -144,7 +144,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $this->scope = $input->getOption(self::INPUT_OPTION_SCOPE);
             $this->scopeCode = $input->getOption(self::INPUT_OPTION_SCOPE_CODE);
-            $this->inputPath = $input->getArgument(self::INPUT_ARGUMENT_PATH);
+            $this->inputPath = trim($input->getArgument(self::INPUT_ARGUMENT_PATH), "/");
 
             $this->scopeValidator->isValid($this->scope, $this->scopeCode);
             $configPath = $this->pathResolver->resolve($this->inputPath, $this->scope, $this->scopeCode);

app/code/Magento/Config/Model/Config/PathValidator.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Model\Config;
+
+use Magento\Framework\Exception\ValidatorException;
+
+/**
+ * Validates the config path by config structure schema.
+ */
+class PathValidator
+{
+    /**
+     * The config structure.
+     *
+     * @var Structure
+     */
+    private $structure;
+
+    /**
+     * @param Structure $structure The config structure
+     */
+    public function __construct(Structure $structure)
+    {
+        $this->structure = $structure;
+    }
+
+    /**
+     * Validates the config path by config structure schema.
+     *
+     * @param string $path The config path
+     * @return bool The result of validation
+     * @throws ValidatorException If provided path is not valid
+     */
+    public function validate($path)
+    {
+        $allPaths = $this->structure->getFieldPaths();
+
+        if (!array_key_exists($path, $allPaths)) {
+            throw new ValidatorException(__('The "%1" path does not exist', $path));
+        }
+
+        return true;
+    }
+}

app/code/Magento/Config/Model/Config/Structure.php

@@ -3,12 +3,11 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Config\Model\Config;
 
 /**
- * System configuration structure
+ * System configuration structure.
  */
-namespace Magento\Config\Model\Config;
-
 class Structure implements \Magento\Config\Model\Config\Structure\SearchInterface
 {
     /**
@@ -251,4 +250,57 @@ protected function _getGroupFieldPathsByAttribute(array $fields, $parentPath, $a
         }
         return $result;
     }
+
+    /**
+     * Collects config field paths recursively from config schema.
+     * Returns an array map of fields specification.
+     *
+     * ```php
+     *  [
+     *      'test_config/test_config/test_config' => [
+     *          'test_structure/test_structure/test_structure'
+     *      ]
+     * ```
+     *
+     * @return array An array of config path to config structure path map
+     */
+    public function getFieldPaths()
+    {
+        $sections = !empty($this->_data['sections']) ? $this->_data['sections'] : [];
+
+        return $this->getFieldsRecursively($sections);
+    }
+
+    /**
+     * Iteration that collects config field paths recursively from config schema.
+     *
+     * @param array $elements The elements to be parsed
+     * @return array An array of config path to config structure path map
+     */
+    private function getFieldsRecursively(array $elements = [])
+    {
+        $result = [];
+
+        foreach ($elements as $element) {
+            if (isset($element['children'])) {
+                $result = array_replace_recursive(
+                    $result,
+                    $this->getFieldsRecursively($element['children'])
+                );
+            } else {
+                if ($element['_elementType'] === 'field' && isset($element['label'])) {
+                    $structurePath = (isset($element['path']) ? $element['path'] . '/' : '') . $element['id'];
+                    $configPath = isset($element['config_path']) ? $element['config_path'] : $structurePath;
+
+                    if (!isset($result[$configPath])) {
+                        $result[$configPath] = [];
+                    }
+
+                    $result[$configPath][] = $structurePath;
+                }
+            }
+        }
+
+        return $result;
+    }
 }

app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php

@@ -8,10 +8,13 @@
 use Magento\Config\Console\Command\ConfigSet\ConfigSetProcessorFactory;
 use Magento\Config\Console\Command\ConfigSet\ConfigSetProcessorInterface;
 use Magento\Config\Console\Command\ConfigSetCommand;
+use Magento\Config\Model\Config\PathValidator;
+use Magento\Config\Model\Config\PathValidatorFactory;
 use Magento\Framework\App\Scope\ValidatorInterface;
 use Magento\Framework\Config\ScopeInterface;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\ValidatorException;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -48,6 +51,16 @@ class ConfigSetCommandTest extends \PHPUnit_Framework_TestCase
      */
     private $scopeMock;
 
+    /**
+     * @var PathValidatorFactory|Mock
+     */
+    private $pathValidatorFactoryMock;
+
+    /**
+     * @var PathValidator|Mock
+     */
+    private $pathValidator;
+
     /**
      * @inheritdoc
      */
@@ -63,11 +76,23 @@ protected function setUp()
             ->getMockForAbstractClass();
         $this->scopeMock = $this->getMockBuilder(ScopeInterface::class)
             ->getMockForAbstractClass();
+        $this->pathValidatorFactoryMock = $this->getMockBuilder(PathValidatorFactory::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['create'])
+            ->getMock();
+        $this->pathValidator = $this->getMockBuilder(PathValidator::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->pathValidatorFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->pathValidator);
 
         $this->command = new ConfigSetCommand(
             $this->configSetProcessorFactoryMock,
             $this->validatorMock,
-            $this->scopeMock
+            $this->scopeMock,
+            $this->pathValidatorFactoryMock
         );
     }
 
@@ -120,4 +145,28 @@ public function testExecuteNotValidScope()
 
         $this->assertSame(Cli::RETURN_FAILURE, $tester->getStatusCode());
     }
+
+    public function testExecuteWithException()
+    {
+        $this->validatorMock->expects($this->once())
+            ->method('isValid')
+            ->willReturn(true);
+        $this->pathValidator->expects($this->once())
+            ->method('validate')
+            ->willThrowException(new ValidatorException(__('The "test/test/test" path does not exists')));
+        $this->configSetProcessorFactoryMock->expects($this->never())
+            ->method('create');
+
+        $tester = new CommandTester($this->command);
+        $tester->execute([
+            ConfigSetCommand::ARG_PATH => 'test/test/test',
+            ConfigSetCommand::ARG_VALUE => 'value'
+        ]);
+
+        $this->assertContains(
+            __('The "test/test/test" path does not exists')->render(),
+            $tester->getDisplay()
+        );
+        $this->assertSame(Cli::RETURN_FAILURE, $tester->getStatusCode());
+    }
 }