Fix PSR2 and rename files

centreon · Jan 20, 2020 · 7af3e06 · 7af3e06
1 parent 4f0264a
commit 7af3e06
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 7 deletions.
diff --git a/...omain/Gorgone/YamlConfigurationLoader.php → ...urationLoader/YamlConfigurationLoader.php b/...omain/Gorgone/YamlConfigurationLoader.php → ...urationLoader/YamlConfigurationLoader.php
@@ -19,7 +19,7 @@
  */
 declare(strict_types=1);
 
-namespace Centreon\Domain\Gorgone;
+namespace Centreon\Domain\ConfigurationLoader;
 
 use Symfony\Component\Yaml\Tag\TaggedValue;
 use Symfony\Component\Yaml\Yaml;
@@ -38,7 +38,7 @@ class YamlConfigurationLoader
      */
     private $configurationFile;
 
-    public function __construct (string $configurationFile)
+    public function __construct(string $configurationFile)
     {
         $this->configurationFile = $configurationFile;
     }
@@ -68,12 +68,15 @@ public function load(): array
      * @return array Returns the configuration data including other configuration data from the include files
      * @throws \FileNotFoundException
      */
-    private function iterateConfiguration(array $configuration, string $currentDirectory, string $historyLoadedFile): array
-    {
+    private function iterateConfiguration(
+        array $configuration,
+        string $currentDirectory,
+        string $historyLoadedFile
+    ): array {
         foreach ($configuration as $key => $value) {
             if (is_array($value)) {
                 $configuration[$key] = $this->iterateConfiguration($value, $currentDirectory, $historyLoadedFile);
-            } else if ($value instanceof TaggedValue) {
+            } elseif ($value instanceof TaggedValue) {
                 $fileToLoad = $value->getValue();
                 if ($fileToLoad[0] !== DIRECTORY_SEPARATOR) {
                     $fileToLoad = $currentDirectory . '/' . $fileToLoad;
@@ -90,7 +93,6 @@ private function iterateConfiguration(array $configuration, string $currentDirec
                     $loadedFile = explode(':', $historyLoadedFile);
                     throw new \Exception('Loop detected in file ' . array_pop($loadedFile));
                 }
-
             }
         }
         return $configuration;

diff --git a/...n/Gorgone/YamlConfigurationLoaderTest.php → ...ionLoader/YamlConfigurationLoaderTest.php b/...n/Gorgone/YamlConfigurationLoaderTest.php → ...ionLoader/YamlConfigurationLoaderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Centreon\Domain\Gorgone;
+namespace Centreon\Domain\ConfigurationLoader;
 
 use PHPUnit\Framework\TestCase;
 

diff --git a/...s/php/Centreon/Domain/Gorgone/child1.yaml → ...on/Domain/ConfigurationLoader/child1.yaml b/...s/php/Centreon/Domain/Gorgone/child1.yaml → ...on/Domain/ConfigurationLoader/child1.yaml
diff --git a/...s/php/Centreon/Domain/Gorgone/child3.yaml → ...on/Domain/ConfigurationLoader/child3.yaml b/...s/php/Centreon/Domain/Gorgone/child3.yaml → ...on/Domain/ConfigurationLoader/child3.yaml
diff --git a/...entreon/Domain/Gorgone/conf.d/child2.yaml → ...in/ConfigurationLoader/conf.d/child2.yaml b/...entreon/Domain/Gorgone/conf.d/child2.yaml → ...in/ConfigurationLoader/conf.d/child2.yaml
diff --git a/...entreon/Domain/Gorgone/conf.d/child3.yaml → ...in/ConfigurationLoader/conf.d/child3.yaml b/...entreon/Domain/Gorgone/conf.d/child3.yaml → ...in/ConfigurationLoader/conf.d/child3.yaml
diff --git a/...entreon/Domain/Gorgone/conf.d/child5.yaml → ...in/ConfigurationLoader/conf.d/child5.yaml b/...entreon/Domain/Gorgone/conf.d/child5.yaml → ...in/ConfigurationLoader/conf.d/child5.yaml
diff --git a/...hp/Centreon/Domain/Gorgone/root_file.yaml → ...Domain/ConfigurationLoader/root_file.yaml b/...hp/Centreon/Domain/Gorgone/root_file.yaml → ...Domain/ConfigurationLoader/root_file.yaml
diff --git a/...n/Domain/Gorgone/root_file_with_loop.yaml → ...figurationLoader/root_file_with_loop.yaml b/...n/Domain/Gorgone/root_file_with_loop.yaml → ...figurationLoader/root_file_with_loop.yaml