Migrated parsers etc. to new export-data library version. Extracted mapping to mapper classes, using the mapper-manager.

Author: BluePsyduck

bin/cli.php

@@ -17,7 +17,7 @@
 chdir(dirname(__DIR__));
 require(__DIR__ . '/../vendor/autoload.php');
 
-(function () {
+(function (): void {
     /* @var ContainerInterface $container */
     $container = require(__DIR__ . '/../config/container.php');
     $config = $container->get('config');
@@ -26,5 +26,5 @@
     $application->setCommandLoader(new ContainerCommandLoader($container, $config['commands']));
 
     $exit = $application->run();
-    exit ($exit);
+    exit($exit);
 })();

composer.json

@@ -20,11 +20,12 @@
     "ext-zip": "*",
     "bluepsyduck/factorio-mod-portal-client": "^1.2",
     "bluepsyduck/factorio-translator": "^1.0",
+    "bluepsyduck/mapper-manager": "dev-feature/generics",
     "bluepsyduck/symfony-process-manager": "^1.0",
     "bluepsyduck/laminas-autowire-factory": "^1.0",
     "doctrine/cache": "^1.8",
     "factorio-item-browser/common": "^1.2",
-    "factorio-item-browser/export-data": "^3.0",
+    "factorio-item-browser/export-data": "dev-feature/chunked-data",
     "factorio-item-browser/export-queue-client": "^1.2.0",
     "laminas/laminas-config-aggregator": "^1.0",
     "laminas/laminas-servicemanager": "^3.3",

composer.lock

@@ -40,6 +40,15 @@
 
             Helper\HashCalculator::class => AutoWireFactory::class,
 
+            Mapper\FluidMapper::class => AutoWireFactory::class,
+            Mapper\IconLayerMapper::class => AutoWireFactory::class,
+            Mapper\IconMapper::class => AutoWireFactory::class,
+            Mapper\ItemMapper::class => AutoWireFactory::class,
+            Mapper\MachineMapper::class => AutoWireFactory::class,
+            Mapper\RecipeIngredientMapper::class => AutoWireFactory::class,
+            Mapper\RecipeMapper::class => AutoWireFactory::class,
+            Mapper\RecipeProductMapper::class => AutoWireFactory::class,
+
             Mod\ModDownloader::class => AutoWireFactory::class,
             Mod\ModFileManager::class => AutoWireFactory::class,
 

config/autoload/dependencies.global.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace FactorioItemBrowser\Export;
+
+use BluePsyduck\MapperManager\Constant\ConfigKey;
+
+/**
+ * The configuration of the mapper manager.
+ *
+ * @author BluePsyduck <[email protected]>
+ * @license http://opensource.org/licenses/GPL-3.0 GPL v3
+ */
+
+return [
+    ConfigKey::MAIN => [
+        ConfigKey::MAPPERS => [
+            Mapper\FluidMapper::class,
+            Mapper\IconLayerMapper::class,
+            Mapper\IconMapper::class,
+            Mapper\ItemMapper::class,
+            Mapper\MachineMapper::class,
+            Mapper\RecipeIngredientMapper::class,
+            Mapper\RecipeMapper::class,
+            Mapper\RecipeProductMapper::class,
+        ],
+    ],
+];

config/autoload/mapper-manager.global.php

@@ -24,6 +24,7 @@
     new ArrayProvider($cacheConfig),
 
     \BluePsyduck\FactorioModPortalClient\ConfigProvider::class,
+    \BluePsyduck\MapperManager\ConfigProvider::class,
     \FactorioItemBrowser\ExportData\ConfigProvider::class,
     \FactorioItemBrowser\ExportQueue\Client\ConfigProvider::class,
 

config/config.php

@@ -73,12 +73,12 @@ public function run(ProcessStepData $processStepData): void
 
         $this->console->writeAction('Parsing');
         foreach ($this->parsers as $parser) {
-            $parser->parse($processStepData->getDump(), $processStepData->getExportData()->getCombination());
+            $parser->parse($processStepData->getDump(), $processStepData->getExportData());
         }
 
         $this->console->writeAction('Validating');
         foreach ($this->parsers as $parser) {
-            $parser->validate($processStepData->getExportData()->getCombination());
+            $parser->validate($processStepData->getExportData());
         }
     }
 }