From b48c9e696271a8feed5757b7d128f63bc73275aa Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Thu, 7 Jan 2016 16:31:21 +0100
Subject: [PATCH] Clean up code in FileDataProvider

---
 .../src/Install/Console/FileDataProvider.php  | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/framework/core/src/Install/Console/FileDataProvider.php b/framework/core/src/Install/Console/FileDataProvider.php
index 03d4c6620..f92e8489a 100644
--- a/framework/core/src/Install/Console/FileDataProvider.php
+++ b/framework/core/src/Install/Console/FileDataProvider.php
@@ -16,7 +16,6 @@ use Exception;
 
 class FileDataProvider implements DataProviderInterface
 {
-    protected $configurationFile;
     protected $default;
     protected $baseUrl = null;
     protected $databaseConfiguration = [];
@@ -29,45 +28,40 @@ class FileDataProvider implements DataProviderInterface
         $this->default = new DefaultsDataProvider();
 
         // Get configuration file path
-        $this->configurationFile = $input->getOption('file');
+        $configurationFile = $input->getOption('file');
 
         // Check if file exists before parsing content
-        if (file_exists($this->configurationFile)) {
+        if (file_exists($configurationFile)) {
             // Parse YAML
-            $configuration = Yaml::parse(file_get_contents($this->configurationFile));
+            $configuration = Yaml::parse(file_get_contents($configurationFile));
 
             // Define configuration variables
             $this->baseUrl = isset($configuration['baseUrl']) ? rtrim($configuration['baseUrl'], '/') : null;
-            $this->databaseConfiguration = isset($configuration['databaseConfiguration']) ? $configuration['databaseConfiguration'] : array();
-            $this->adminUser = isset($configuration['adminUser']) ? $configuration['adminUser'] : array();
-            $this->settings = isset($configuration['settings']) ? $configuration['settings']: array();
-        }
-        else {
+            $this->databaseConfiguration = isset($configuration['databaseConfiguration']) ? $configuration['databaseConfiguration'] : [];
+            $this->adminUser = isset($configuration['adminUser']) ? $configuration['adminUser'] : [];
+            $this->settings = isset($configuration['settings']) ? $configuration['settings']: [];
+        } else {
             throw new Exception('Configuration file does not exist.');
         }
     }
 
     public function getDatabaseConfiguration()
     {
-        // Merge with defaults
         return $this->databaseConfiguration + $this->default->getDatabaseConfiguration();
     }
 
     public function getBaseUrl()
     {
-        // Merge with defaults
         return (!is_null($this->baseUrl)) ? $this->baseUrl : $this->default->getBaseUrl();
     }
 
     public function getAdminUser()
     {
-        // Merge with defaults
         return $this->adminUser + $this->default->getAdminUser();
     }
 
     public function getSettings()
     {
-        // Merge with defaults
         return $this->settings + $this->default->getSettings();
     }
-}
\ No newline at end of file
+}