Adding deployment configuration for environments

Author: JosephMaxwell

app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php

@@ -9,8 +9,6 @@
  */
 namespace Magento\Config\Model\Config\Backend\Admin;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-
 class Robots extends \Magento\Framework\App\Config\Value
 {
     /**
@@ -39,12 +37,13 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
         \Magento\Framework\Filesystem $filesystem,
+        \Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
-        $this->_directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $this->_directory = $filesystem->getDirectoryWrite($documentRoot->getPath());
         $this->_file = 'robots.txt';
     }
 

app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * @by SwiftOtter, Inc., 04/01/2017
+ * @website https://swiftotter.com
+ **/
+
+namespace Magento\Config\Model\Config\Reader\Source\Deployed;
+
+use Magento\Framework\Config\ConfigOptionsListConstants;
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+class DocumentRoot
+{
+    private $config;
+
+    public function __construct(\Magento\Framework\App\DeploymentConfig $config)
+    {
+        $this->config = $config;
+    }
+
+    public function getPath()
+    {
+        return $this->isPub() ? DirectoryList::PUB : DirectoryList::ROOT;
+    }
+
+    public function isPub()
+    {
+        return (bool)$this->config->get(ConfigOptionsListConstants::CONFIG_PATH_DOCUMENT_ROOT_IS_PUB);
+    }
+}

app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Config\Test\Unit\Model\Config\Reader\Source\Deployed;
+
+use Magento\Config\Model\Config\Reader;
+use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
+use Magento\Framework\App\Config;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Config\Model\Placeholder\PlaceholderInterface;
+use Magento\Config\Model\Placeholder\PlaceholderFactory;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Config\ConfigOptionsListConstants;
+
+/**
+ * Test class for checking settings that defined in config file
+ */
+class DocumentRootTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var PlaceholderInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $placeholderMock;
+
+    /**
+     * @var Config\ScopeCodeResolver|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $scopeCodeResolverMock;
+
+    /**
+     * @var SettingChecker
+     */
+    private $documentRoot;
+
+    /**
+     * @var array
+     */
+    private $env;
+
+    public function setUp()
+    {
+        $this->configMock = $this->getMockBuilder(DeploymentConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->documentRoot = new Reader\Source\Deployed\DocumentRoot($this->configMock);
+    }
+
+    public function testGetPath()
+    {
+        $this->configMockSetForDocumentRootIsPub();
+
+        $this->assertSame(DirectoryList::PUB, $this->documentRoot->getPath());
+    }
+
+    public function testIsPub()
+    {
+        $this->configMockSetForDocumentRootIsPub();
+
+        $this->assertSame(true, $this->documentRoot->isPub());
+    }
+
+    private function configMockSetForDocumentRootIsPub()
+    {
+        $this->configMock->expects($this->any())
+            ->method('get')
+            ->willReturnMap([
+                [
+                    ConfigOptionsListConstants::CONFIG_PATH_DOCUMENT_ROOT_IS_PUB,
+                    null,
+                    true
+                ],
+            ]);
+    }
+}

app/code/Magento/Sitemap/Model/Sitemap.php

@@ -8,8 +8,6 @@
 
 namespace Magento\Sitemap\Model;
 
-use Magento\Framework\App\Filesystem\DirectoryList;
-
 /**
  * Sitemap model
  *
@@ -177,13 +175,14 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\RequestInterface $request,
         \Magento\Framework\Stdlib\DateTime $dateTime,
+        \Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->_escaper = $escaper;
         $this->_sitemapData = $sitemapData;
-        $this->_directory = $filesystem->getDirectoryWrite(DirectoryList::ROOT);
+        $this->_directory = $filesystem->getDirectoryWrite($documentRoot->getPath());
         $this->_categoryFactory = $categoryFactory;
         $this->_productFactory = $productFactory;
         $this->_cmsFactory = $cmsFactory;

generated/.htaccess

@@ -30,6 +30,8 @@ class ConfigOptionsListConstants
     const CONFIG_PATH_DB = 'db';
     const CONFIG_PATH_RESOURCE = 'resource';
     const CONFIG_PATH_CACHE_TYPES = 'cache_types';
+    const CONFIG_PATH_DOCUMENT_ROOT_IS_PUB = 'directories/document_root_is_pub';
+
     /**#@-*/
 
     /**#@+