MAGETWO-64554: Rename config.local.php file, use env.php file as configs storage

Author: shiftedreality

lib/internal/Magento/Framework/App/DeploymentConfig/FileReader.php

@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Config\File\ConfigFilePool;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\DriverPool;
 
 /**
@@ -56,8 +57,8 @@ public function __construct(
      * Loads the configuration file.
      *
      * @param string $fileKey The file key
-     * @return array The configurations arrat
-     * @throws \Exception
+     * @return array The configurations array
+     * @throws FileSystemException If file key is not correct
      */
     public function load($fileKey)
     {

lib/internal/Magento/Framework/App/DeploymentConfig/Writer.php

@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem;
@@ -25,13 +24,6 @@ class Writer
      */
     private $reader;
 
-    /**
-     * Deployment file config reader
-     *
-     * @var FileReader
-     */
-    private $fileReader;
-
     /**
      * Application filesystem
      *
@@ -62,22 +54,19 @@ class Writer
      * @param ConfigFilePool $configFilePool
      * @param DeploymentConfig $deploymentConfig
      * @param Writer\FormatterInterface $formatter
-     * @param FileReader $fileReader
      */
     public function __construct(
         Reader $reader,
         Filesystem $filesystem,
         ConfigFilePool $configFilePool,
         DeploymentConfig $deploymentConfig,
-        Writer\FormatterInterface $formatter = null,
-        FileReader $fileReader = null
+        Writer\FormatterInterface $formatter = null
     ) {
         $this->reader = $reader;
         $this->filesystem = $filesystem;
         $this->configFilePool = $configFilePool;
         $this->deploymentConfig = $deploymentConfig;
-        $this->formatter = $formatter ?: ObjectManager::getInstance()->get(Writer\PhpFormatter::class);
-        $this->fileReader = $fileReader ?: ObjectManager::getInstance()->get(FileReader::class);
+        $this->formatter = $formatter ?: new Writer\PhpFormatter();
     }
 
     /**

lib/internal/Magento/Framework/App/Test/Unit/DeploymentConfig/WriterTest.php

@@ -33,11 +33,6 @@ class WriterTest extends \PHPUnit_Framework_TestCase
      */
     private $reader;
 
-    /**
-     * @var DeploymentConfig\FileReader|Mock
-     */
-    private $fileReader;
-
     /**
      * @var WriteInterface|Mock
      */
@@ -83,9 +78,6 @@ protected function setUp()
         $this->deploymentConfig = $this->getMockBuilder(DeploymentConfig::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->fileReader = $this->getMockBuilder(DeploymentConfig\FileReader::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->dirWrite = $this->getMockForAbstractClass(WriteInterface::class);
         $this->dirRead = $this->getMockForAbstractClass(ReadInterface::class);
 
@@ -94,8 +86,7 @@ protected function setUp()
             $this->filesystem,
             $this->configFilePool,
             $this->deploymentConfig,
-            $this->formatter,
-            $this->fileReader
+            $this->formatter
         );
     }