MAGETWO-31850: [GITHUB] install.log can not be created with open_base…

…dir restriction #796 - CR changes
magento · Jan 9, 2015 · 40148b3 · 40148b3
1 parent 999d538
commit 40148b3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php b/setup/module/Magento/Setup/src/Controller/DatabaseCheck.php
@@ -5,6 +5,7 @@
 namespace Magento\Setup\Controller;
 
 use Magento\Setup\Model\InstallerFactory;
+use Magento\Setup\Model\WebLogger;
 use Zend\Json\Json;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\JsonModel;
@@ -18,14 +19,23 @@ class DatabaseCheck extends AbstractActionController
      */
     private $installerFactory;
 
+    /**
+     * WebLogger to access log
+     *
+     * @var WebLogger
+     */
+    private $webLogger;
+
     /**
      * Constructor
      *
      * @param InstallerFactory $installerFactory
+     * @param WebLogger $webLogger
      */
-    public function __construct(InstallerFactory $installerFactory)
+    public function __construct(InstallerFactory $installerFactory, WebLogger $webLogger)
     {
         $this->installerFactory = $installerFactory;
+        $this->webLogger = $webLogger;
     }
 
     /**
@@ -37,7 +47,7 @@ public function indexAction()
     {
         $params = Json::decode($this->getRequest()->getContent(), Json::TYPE_ARRAY);
         try {
-            $installer = $this->installerFactory->create();
+            $installer = $this->installerFactory->create($this->webLogger);
             $password = isset($params['password']) ? $params['password'] : '';
             $installer->checkDatabaseConnection($params['name'], $params['host'], $params['user'], $password);
             return new JsonModel(['success' => true]);

diff --git a/setup/module/Magento/Setup/src/Model/InstallerFactory.php b/setup/module/Magento/Setup/src/Model/InstallerFactory.php
@@ -29,9 +29,10 @@ public function __construct(ServiceLocatorInterface $serviceLocator)
     /**
      * Factory method for installer object
      *
+     * @param LoggerInterface $log
      * @return Installer
      */
-    public function create()
+    public function create(LoggerInterface $log)
     {
         return new Installer(
             $this->serviceLocator->get('Magento\Setup\Model\FilePermissions'),
@@ -42,7 +43,7 @@ public function create()
             $this->serviceLocator->get('Magento\Framework\Module\ModuleList\Loader'),
             $this->serviceLocator->get('Magento\Framework\App\Filesystem\DirectoryList'),
             $this->serviceLocator->get('Magento\Setup\Model\AdminAccountFactory'),
-            new WebLogger($this->serviceLocator->get('Magento\Framework\Filesystem')),
+            $log,
             $this->serviceLocator->get('Magento\Framework\Math\Random'),
             $this->serviceLocator->get('Magento\Setup\Module\ConnectionFactory'),
             $this->serviceLocator->get('Magento\Framework\App\MaintenanceMode'),