Merge remote-tracking branch 'mainline/develop' into MAGETWO-59184

Author: Serhiy Shkolyarenko

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -141,4 +141,12 @@
     <type name="Magento\Backend\Model\Menu\Builder">
         <plugin name="SetupMenuBuilder" type="Magento\Backend\Model\Setup\MenuBuilder" />
     </type>
+    <type name="Magento\Config\Model\Config\Structure\ConcealInProductionConfigList">
+        <arguments>
+            <argument name="configs" xsi:type="array">
+                <item name="dev" xsi:type="const">Magento\Config\Model\Config\Structure\ElementVisibilityInterface::HIDDEN</item>
+                <item name="general/locale/code" xsi:type="const">Magento\Config\Model\Config\Structure\ElementVisibilityInterface::DISABLED</item>
+            </argument>
+        </arguments>
+    </type>
 </config>

app/code/Magento/Backup/Controller/Adminhtml/Index/Grid.php

@@ -6,16 +6,17 @@
  */
 namespace Magento\Backup\Controller\Adminhtml\Index;
 
+use Magento\Framework\Controller\ResultFactory;
+
 class Grid extends \Magento\Backup\Controller\Adminhtml\Index
 {
     /**
      * Backup list action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        $this->_view->loadLayout();
-        $this->_view->renderLayout();
+        return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
     }
 }

app/code/Magento/Catalog/view/frontend/templates/product/view/attributes.phtml

@@ -14,7 +14,7 @@
 ?>
 <?php
     $_helper = $this->helper('Magento\Catalog\Helper\Output');
-    $_product = $block->getProduct()
+    $_product = $block->getProduct();
 ?>
 <?php if ($_additional = $block->getAdditionalData()): ?>
     <div class="additional-attributes-wrapper table-wrapper">

app/code/Magento/CatalogSearch/Controller/Advanced/Index.php

@@ -6,14 +6,15 @@
  */
 namespace Magento\CatalogSearch\Controller\Advanced;
 
+use Magento\Framework\Controller\ResultFactory;
+
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        $this->_view->loadLayout();
-        $this->_view->renderLayout();
+        return $this->resultFactory->create(ResultFactory::TYPE_PAGE);
     }
 }

app/code/Magento/Cms/Model/ResourceModel/Block/Grid/Collection.php

@@ -84,19 +84,6 @@ public function setAggregations($aggregations)
         $this->aggregations = $aggregations;
     }
 
-    /**
-     * Retrieve all ids for collection
-     * Backward compatibility with EAV collection
-     *
-     * @param int $limit
-     * @param int $offset
-     * @return array
-     */
-    public function getAllIds($limit = null, $offset = null)
-    {
-        return $this->getConnection()->fetchCol($this->_getAllIdsSelect($limit, $offset), $this->_bindParams);
-    }
-
     /**
      * Get search criteria.
      *

app/code/Magento/Config/App/Config/Source/EnvironmentConfigSource.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\App\Config\Source;
+
+use Magento\Framework\App\Config\ConfigSourceInterface;
+use Magento\Framework\DataObject;
+use Magento\Config\Model\Placeholder\PlaceholderFactory;
+use Magento\Config\Model\Placeholder\PlaceholderInterface;
+use Magento\Framework\Stdlib\ArrayManager;
+
+/**
+ * Class for retrieving configurations from environment variables.
+ */
+class EnvironmentConfigSource implements ConfigSourceInterface
+{
+    /**
+     * Library for working with arrays.
+     *
+     * @var ArrayManager
+     */
+    private $arrayManager;
+
+    /**
+     * Object for working with placeholders for environment variables.
+     *
+     * @var PlaceholderInterface
+     */
+    private $placeholder;
+
+    /**
+     * @param ArrayManager $arrayManager
+     * @param PlaceholderFactory $placeholderFactory
+     */
+    public function __construct(
+        ArrayManager $arrayManager,
+        PlaceholderFactory $placeholderFactory
+    ) {
+        $this->arrayManager = $arrayManager;
+        $this->placeholder = $placeholderFactory->create(PlaceholderFactory::TYPE_ENVIRONMENT);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get($path = '')
+    {
+        $data = new DataObject($this->loadConfig());
+        return $data->getData($path) ?: [];
+    }
+
+    /**
+     * Loads config from environment variables.
+     *
+     * @return array
+     */
+    private function loadConfig()
+    {
+        $config = [];
+
+        $environmentVariables = $_ENV;
+
+        foreach ($environmentVariables as $template => $value) {
+            if (!$this->placeholder->isApplicable($template)) {
+                continue;
+            }
+
+            $config = $this->arrayManager->set(
+                $this->placeholder->restore($template),
+                $config,
+                $value
+            );
+        }
+
+        return $config;
+    }
+}

app/code/Magento/Config/Block/System/Config/Form.php

@@ -11,6 +11,7 @@
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
+use Magento\Config\Model\Config\Structure\ElementVisibilityInterface;
 
 /**
  * System config form block
@@ -113,6 +114,14 @@ class Form extends \Magento\Backend\Block\Widget\Form\Generic
      */
     private $appConfig;
 
+    /**
+     * Checks visibility status of form elements on Stores > Settings > Configuration page in Admin Panel
+     * by their paths in the system.xml structure.
+     *
+     * @var ElementVisibilityInterface
+     */
+    private $elementVisibility;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -355,7 +364,8 @@ protected function _initElement(
         $sharedClass = $this->_getSharedCssClass($field);
         $requiresClass = $this->_getRequiresCssClass($field, $fieldPrefix);
 
-        $isReadOnly = $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
+        $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
+            ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
         $formField = $fieldset->addField(
             $elementId,
             $field->getType(),
@@ -805,4 +815,21 @@ private function getAppConfigDataValue($path)
         }
         return $data->getData($path);
     }
+
+    /**
+     * Gets instance of ElementVisibilityInterface.
+     *
+     * @return ElementVisibilityInterface
+     * @deprecated Added to not break backward compatibility of the constructor signature
+     *             by injecting the new dependency directly.
+     *             The method can be removed in a future major release, when constructor signature can be changed.
+     */
+    public function getElementVisibility()
+    {
+        if (null === $this->elementVisibility) {
+            $this->elementVisibility = ObjectManager::getInstance()->get(ElementVisibilityInterface::class);
+        }
+
+        return $this->elementVisibility;
+    }
 }

app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorFactory.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Console\Command\ConfigSet;
+
+use Magento\Config\Console\Command\ConfigSetCommand;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Creates different implementations of config:set processors of type ConfigSetProcessorInterface.
+ *
+ * @see ConfigSetProcessorInterface
+ * @see ConfigSetCommand
+ */
+class ConfigSetProcessorFactory
+{
+    /**#@+
+     * Constants for processors.
+     *
+     * default - save configuration
+     * lock - save and lock configuration
+     */
+    const TYPE_DEFAULT = 'default';
+    const TYPE_LOCK = 'lock';
+    /**#@-*/
+
+    /**
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * List of class names that implement config:set processors
+     *
+     * @var array
+     * @see ConfigSetProcessorInterface
+     */
+    private $processors;
+
+    /**
+     * @param ObjectManagerInterface $objectManager
+     * @param array $processors
+     */
+    public function __construct(
+        ObjectManagerInterface $objectManager,
+        array $processors = []
+    ) {
+        $this->objectManager = $objectManager;
+        $this->processors = $processors;
+    }
+
+    /**
+     * Creates an instance of specified processor.
+     *
+     * @param string $processorName The name of processor
+     * @return ConfigSetProcessorInterface New processor instance
+     * @throws ConfigurationMismatchException If processor type is not exists in processors array
+     * or declared class has wrong implementation
+     */
+    public function create($processorName)
+    {
+        if (!isset($this->processors[$processorName])) {
+            throw new ConfigurationMismatchException(__('Class for type "%1" was not declared', $processorName));
+        }
+
+        $object = $this->objectManager->create($this->processors[$processorName]);
+
+        if (!$object instanceof ConfigSetProcessorInterface) {
+            throw new ConfigurationMismatchException(
+                __('%1 should implement %2', get_class($object), ConfigSetProcessorInterface::class)
+            );
+        }
+
+        return $object;
+    }
+}

app/code/Magento/Config/Console/Command/ConfigSet/ConfigSetProcessorInterface.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Console\Command\ConfigSet;
+
+use Magento\Config\Console\Command\ConfigSetCommand;
+use Magento\Framework\Exception\CouldNotSaveException;
+
+/**
+ * Allows to process different flows of config:set command.
+ *
+ * @see ConfigSetCommand
+ */
+interface ConfigSetProcessorInterface
+{
+    /**
+     * Processes config:set command.
+     *
+     * @param string $path The configuration path in format group/section/field_name
+     * @param string $value The configuration value
+     * @param string $scope The configuration scope (default, website, or store)
+     * @param string $scopeCode The scope code
+     * @return void
+     * @throws CouldNotSaveException An exception on processing error
+     */
+    public function process($path, $value, $scope, $scopeCode);
+}