MCLOUD-6529: Add support for .magento.docker.yml extension (#254)

Author: shiftedreality

src/Config/Source/ConfigSource.php

@@ -8,7 +8,7 @@
 namespace Magento\CloudDocker\Config\Source;
 
 use Illuminate\Config\Repository;
-use Magento\CloudDocker\Filesystem\FileList;
+use Magento\CloudDocker\Filesystem\DirectoryList;
 use Magento\CloudDocker\Filesystem\Filesystem;
 use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Yaml;
@@ -19,22 +19,22 @@
 class ConfigSource implements SourceInterface
 {
     /**
-     * @var FileList
+     * @var DirectoryList
      */
-    private $fileList;
+    private $directoryList;
 
     /**
      * @var Filesystem
      */
     private $filesystem;
 
     /**
-     * @param FileList $fileList
+     * @param DirectoryList $directoryList
      * @param Filesystem $filesystem
      */
-    public function __construct(FileList $fileList, Filesystem $filesystem)
+    public function __construct(DirectoryList $directoryList, Filesystem $filesystem)
     {
-        $this->fileList = $fileList;
+        $this->directoryList = $directoryList;
         $this->filesystem = $filesystem;
     }
 
@@ -43,7 +43,12 @@ public function __construct(FileList $fileList, Filesystem $filesystem)
      */
     public function read(): Repository
     {
-        $configFile = $this->fileList->getDockerConfig();
+        $configFile = $this->directoryList->getMagentoRoot() . '/.magento.docker.yml';
+
+        if (!$this->filesystem->exists($configFile)) {
+            $configFile = $this->directoryList->getMagentoRoot() . '/.magento.docker.yaml';
+        }
+
         $repository = new Repository();
 
         try {

src/Filesystem/FileList.php

@@ -49,14 +49,6 @@ public function getServicesConfig(): string
         return $this->directoryList->getMagentoRoot() . '/.magento/services.yaml';
     }
 
-    /**
-     * @return string
-     */
-    public function getEceToolsCompose(): string
-    {
-        return $this->directoryList->getEceToolsRoot() . '/docker-compose.yml';
-    }
-
     /**
      * @return string
      */
@@ -72,12 +64,4 @@ public function getMagentoComposer(): string
     {
         return $this->directoryList->getMagentoRoot() . '/composer.json';
     }
-
-    /**
-     * @return string
-     */
-    public function getDockerConfig(): string
-    {
-        return $this->directoryList->getMagentoRoot() . '/.magento.docker.yaml';
-    }
 }