report

oliwierptak · Aug 8, 2021 · 2260140 · 2260140
1 parent bed38f6
commit 2260140
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 41 deletions.
diff --git a/src/Popo/Loader/SchemaLoader.php b/src/Popo/Loader/SchemaLoader.php
@@ -18,41 +18,6 @@ public function __construct(protected FileLocator $fileLocator, protected Loader
     {
     }
 
-    /**
-     * @param \Popo\PopoConfigurator $configurator
-     *
-     * @return SchemaFile[]
-     */
-    #[ArrayShape([SchemaFile::class])] public function loadReport(PopoConfigurator $configurator): array
-    {
-        $result = [];
-        $files = $this->loadSchemaFiles($configurator);
-
-        foreach ($files as $configurationFile) {
-            $schemaConfig = [];
-            $data = $this->loader->load($configurationFile);
-            $fileConfig = $data[PopoDefinesInterface::CONFIGURATION_SCHEMA_OPTION_SYMBOL] ?? [];
-            $data = $this->removeOptionSymbol($data);
-
-            foreach ($data as $schemaName => $schemaData) {
-                if ($this->hasSchemaConfigOption($schemaData)) {
-                    $schemaConfig[$schemaName] = $schemaData[PopoDefinesInterface::CONFIGURATION_SCHEMA_OPTION_SYMBOL] ?? [];
-                    $data[$schemaName] = $this->removeOptionSymbol($schemaData);
-                }
-            }
-
-            $result[] = (new SchemaFile)
-                ->setFilename($configurationFile)
-                ->setFileConfig($fileConfig)
-                ->setSchemaConfig($schemaConfig)
-                ->setData(
-                    $data
-                );
-        }
-
-        return $result;
-    }
-
     public function loadSharedConfig(?string $schemaConfigFilename): SchemaFile
     {
         $file = (new SchemaFile)->setFileConfig(PopoDefinesInterface::SCHEMA_DEFAULT_DATA);
@@ -70,23 +35,24 @@ public function loadSharedConfig(?string $schemaConfigFilename): SchemaFile
 
     /**
      * @param \Popo\PopoConfigurator $configurator
+     * @param bool $remapProperties
      *
      * @return SchemaFile[]
      */
-    #[ArrayShape([SchemaFile::class])] public function load(PopoConfigurator $configurator): array
+    #[ArrayShape([SchemaFile::class])] public function load(PopoConfigurator $configurator, bool $remapProperties = true): array
     {
         $result = [];
         $files = $this->loadSchemaFiles($configurator);
 
         foreach ($files as $configurationFile) {
             $schemaConfig = [];
             $data = $this->loader->load($configurationFile);
-            $fileConfig = $this->extractConfig($data);
+            $fileConfig = $this->extractConfig($data, $remapProperties);
             $data = $this->removeOptionSymbol($data);
 
             foreach ($data as $schemaName => $schemaData) {
                 if ($this->hasSchemaConfigOption($schemaData)) {
-                    $schemaConfig[$schemaName] = $this->extractConfig($schemaData);
+                    $schemaConfig[$schemaName] = $this->extractConfig($schemaData, $remapProperties);
                     $data[$schemaName] = $this->removeOptionSymbol($schemaData);
                 }
             }
@@ -174,10 +140,12 @@ protected function remapProperties(array $data): array
         return $properties;
     }
 
-    protected function extractConfig($data): array
+    protected function extractConfig(array $data, bool $remap): array
     {
         $fileConfig = $data[PopoDefinesInterface::CONFIGURATION_SCHEMA_OPTION_SYMBOL] ?? [];
-        $fileConfig[PopoDefinesInterface::CONFIGURATION_SCHEMA_PROPERTY] = $this->remapProperties($fileConfig);
+        if ($remap) {
+            $fileConfig[PopoDefinesInterface::CONFIGURATION_SCHEMA_PROPERTY] = $this->remapProperties($fileConfig);
+        }
 
         return $fileConfig;
     }

diff --git a/src/Popo/Model/Report/ReportModel.php b/src/Popo/Model/Report/ReportModel.php
@@ -18,7 +18,7 @@ public function __construct(protected SchemaLoader $loader)
 
     public function generate(PopoConfigurator $configurator): ReportResult
     {
-        $data = $this->loader->loadReport($configurator);
+        $data = $this->loader->load($configurator, false);
         $sharedSchemaFile = $this->loader->loadSharedConfig($configurator->getSchemaConfigFilename());
 
         return $this->generateReport($data, $sharedSchemaFile);