Merge remote-tracking branch 'main/develop' into MAGETWO-32004

Author: dkvashninbay

.gitignore

@@ -10,6 +10,7 @@ atlassian*
 /.gitattributes
 /app/config_sandbox
 /app/etc/config.php
+/app/etc/env.php
 /app/code/Magento/TestModule*
 /lib/internal/flex/uploader/.actionScriptProperties
 /lib/internal/flex/uploader/.flexProperties

app/code/Magento/AdminNotification/Model/Feed.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\AdminNotification\Model;
 
-use Magento\Framework\Config\ConfigOptionsList;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 
 /**
  * AdminNotification Feed model
@@ -137,7 +137,7 @@ public function checkUpdate()
 
         $feedXml = $this->getFeedData();
 
-        $installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE));
+        $installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE));
 
         if ($feedXml && $feedXml->channel && $feedXml->channel->item) {
             foreach ($feedXml->channel->item as $item) {

app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

@@ -7,7 +7,7 @@
 namespace Magento\AdminNotification\Test\Unit\Model;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
-use Magento\Framework\Config\ConfigOptionsList;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -141,7 +141,7 @@ public function testCheckUpdate($callInbox, $curlRequest)
         $this->backendConfig->expects($this->at(1))->method('getValue')
             ->will($this->returnValue('http://feed.magento.com'));
         $this->deploymentConfig->expects($this->once())->method('get')
-            ->with(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE)
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE)
             ->will($this->returnValue('Sat, 6 Sep 2014 16:46:11 UTC'));
         if ($callInbox) {
             $this->inboxFactory->expects($this->once())->method('create')

app/code/Magento/Backend/App/AbstractAction.php

@@ -285,7 +285,7 @@ public function _processUrlKeys()
     protected function _processLocaleSettings()
     {
         $forceLocale = $this->getRequest()->getParam('locale', null);
-        if ($this->_objectManager->get('Magento\Framework\Locale\Validator')->isValid($forceLocale)) {
+        if ($this->_objectManager->get('Magento\Framework\Validator\Locale')->isValid($forceLocale)) {
             $this->_getSession()->setSessionLocale($forceLocale);
         }
 

app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

@@ -33,7 +33,7 @@ public function execute()
             ->setLastname($this->getRequest()->getParam('lastname', false))
             ->setEmail(strtolower($this->getRequest()->getParam('email', false)));
 
-        if ($this->_objectManager->get('Magento\Framework\Locale\Validator')->isValid($interfaceLocale)) {
+        if ($this->_objectManager->get('Magento\Framework\Validator\Locale')->isValid($interfaceLocale)) {
             $user->setInterfaceLocale($interfaceLocale);
             /** @var \Magento\Backend\Model\Locale\Manager $localeManager */
             $localeManager = $this->_objectManager->get('Magento\Backend\Model\Locale\Manager');

app/code/Magento/Backend/Helper/Dashboard/Data.php

@@ -6,7 +6,7 @@
 namespace Magento\Backend\Helper\Dashboard;
 
 use Magento\Framework\App\DeploymentConfig;
-use Magento\Framework\Config\ConfigOptionsList;
+use Magento\Framework\Config\ConfigOptionsListConstants;
 
 /**
  * Data helper for dashboard
@@ -41,7 +41,7 @@ public function __construct(
         parent::__construct(
             $context
         );
-        $this->_installDate = $deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE);
+        $this->_installDate = $deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE);
         $this->_storeManager = $storeManager;
     }
 

app/code/Magento/Backend/Model/Locale/Resolver.php

@@ -26,7 +26,7 @@ class Resolver extends \Magento\Framework\Locale\Resolver
     protected $_request;
 
     /**
-     * @var \Magento\Framework\Locale\Validator
+     * @var \Magento\Framework\Validator\Locale
      */
     protected $_localeValidator;
 
@@ -37,7 +37,7 @@ class Resolver extends \Magento\Framework\Locale\Resolver
      * @param \Magento\Backend\Model\Session $session
      * @param Manager $localeManager
      * @param \Magento\Framework\App\RequestInterface $request
-     * @param \Magento\Framework\Locale\Validator $localeValidator
+     * @param \Magento\Framework\Validator\Locale $localeValidator
      * @param null $locale
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -48,7 +48,7 @@ public function __construct(
         \Magento\Backend\Model\Session $session,
         \Magento\Backend\Model\Locale\Manager $localeManager,
         \Magento\Framework\App\RequestInterface $request,
-        \Magento\Framework\Locale\Validator $localeValidator,
+        \Magento\Framework\Validator\Locale $localeValidator,
         $locale = null
     ) {
         $this->_session = $session;

app/code/Magento/Backend/Setup/ConfigOptionsList.php

@@ -19,7 +19,7 @@ class ConfigOptionsList implements ConfigOptionsListInterface
     /**
      * Input key for the options
      */
-    const INPUT_KEY_BACKEND_FRONTNAME = 'backend_frontname';
+    const INPUT_KEY_BACKEND_FRONTNAME = 'backend-frontname';
 
     /**
      * Path to the values in the deployment config
@@ -48,7 +48,7 @@ public function getOptions()
      */
     public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     {
-        $configData = new ConfigData(ConfigFilePool::APP_CONFIG);
+        $configData = new ConfigData(ConfigFilePool::APP_ENV);
 
         if (isset($options[self::INPUT_KEY_BACKEND_FRONTNAME])) {
             $configData->set(self::CONFIG_PATH_BACKEND_FRONTNAME, $options[self::INPUT_KEY_BACKEND_FRONTNAME]);
@@ -60,7 +60,7 @@ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
     /**
      * {@inheritdoc}
      */
-    public function validate(array $options)
+    public function validate(array $options, DeploymentConfig $deploymentConfig)
     {
         $errors = [];
         if (isset($options[self::INPUT_KEY_BACKEND_FRONTNAME])

app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php

@@ -33,7 +33,7 @@ class SaveTest extends \PHPUnit_Framework_TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\User\Model\User */
     protected $_userMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Locale\Validator */
+    /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Validator\locale */
     protected $_validatorMock;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Backend\Model\Locale\Manager */
@@ -80,7 +80,7 @@ protected function setUp()
             )
             ->getMock();
 
-        $this->_validatorMock = $this->getMockBuilder('Magento\Framework\Locale\Validator')
+        $this->_validatorMock = $this->getMockBuilder('Magento\Framework\Validator\Locale')
             ->disableOriginalConstructor()
             ->setMethods(['isValid'])
             ->getMock();
@@ -172,7 +172,7 @@ public function testSaveAction()
         )->method(
             'get'
         )->with(
-            $this->equalTo('Magento\Framework\Locale\Validator')
+            $this->equalTo('Magento\Framework\Validator\Locale')
         )->will(
             $this->returnValue($this->_validatorMock)
         );

app/code/Magento/Backend/Test/Unit/Setup/ConfigOptionsListTest.php

@@ -42,7 +42,7 @@ public function testCreateConfig()
 
         $expectedData = [
             [
-                'file' => ConfigFilePool::APP_CONFIG,
+                'file' => ConfigFilePool::APP_ENV,
                 'segment' => 'backend',
                 'data' => [
                     'backend' => ['frontName' => 'admin']
@@ -62,7 +62,7 @@ public function testCreateConfig()
     public function testValidate()
     {
         $options = [ConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME => 'admin'];
-        $errors = $this->object->validate($options);
+        $errors = $this->object->validate($options, $this->deploymentConfig);
         $this->assertEmpty($errors);
     }
 
@@ -73,7 +73,7 @@ public function testValidate()
      */
     public function testValidateInvalid(array $options, $expectedError)
     {
-        $errors = $this->object->validate($options);
+        $errors = $this->object->validate($options, $this->deploymentConfig);
         $this->assertSame([$expectedError], $errors);
     }