Skip to content

Commit e38a3e7

Browse files
committed
Added actual version to the dump mod info.
1 parent 1c510f4 commit e38a3e7

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

src/Factorio/Instance.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ class Instance
5858
*/
5959
protected $instancesDirectory;
6060

61+
/**
62+
* The version of the export project.
63+
* @var string
64+
*/
65+
protected $version;
66+
6167
/**
6268
* The directory for the combination instance.
6369
* @var string
@@ -72,21 +78,24 @@ class Instance
7278
* @param SerializerInterface $exportSerializer
7379
* @param string $factorioDirectory
7480
* @param string $instancesDirectory
81+
* @param string $version
7582
*/
7683
public function __construct(
7784
Console $console,
7885
DumpExtractor $dumpExtractor,
7986
ModFileManager $modFileManager,
8087
SerializerInterface $exportSerializer,
8188
string $factorioDirectory,
82-
string $instancesDirectory
89+
string $instancesDirectory,
90+
string $version
8391
) {
8492
$this->console = $console;
8593
$this->dumpExtractor = $dumpExtractor;
8694
$this->modFileManager = $modFileManager;
8795
$this->serializer = $exportSerializer;
8896
$this->factorioDirectory = $factorioDirectory;
8997
$this->instancesDirectory = $instancesDirectory;
98+
$this->version = $version;
9099
}
91100

92101
/**
@@ -180,7 +189,7 @@ protected function createDumpInfoJson(array $modNames): InfoJson
180189
$info->setName('Dump')
181190
->setTitle('Factorio Item Browser - Dump')
182191
->setAuthor('factorio-item-browser')
183-
->setVersion('1.0.0')
192+
->setVersion($this->version)
184193
->setFactorioVersion($baseInfo->getVersion())
185194
->setDependencies($modNames);
186195

test/src/Factorio/InstanceTest.php

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,16 @@ public function testConstruct(): void
7979
{
8080
$factorioDirectory = 'foo';
8181
$instancesDirectory = 'bar';
82+
$version = '1.2.3';
8283

8384
$instance = new Instance(
8485
$this->console,
8586
$this->dumpExtractor,
8687
$this->modFileManager,
8788
$this->serializer,
8889
$factorioDirectory,
89-
$instancesDirectory
90+
$instancesDirectory,
91+
$version
9092
);
9193

9294
$this->assertSame($this->console, $this->extractProperty($instance, 'console'));
@@ -95,6 +97,7 @@ public function testConstruct(): void
9597
$this->assertSame($this->serializer, $this->extractProperty($instance, 'serializer'));
9698
$this->assertSame($factorioDirectory, $this->extractProperty($instance, 'factorioDirectory'));
9799
$this->assertSame($instancesDirectory, $this->extractProperty($instance, 'instancesDirectory'));
100+
$this->assertSame($version, $this->extractProperty($instance, 'version'));
98101
}
99102

100103
/**
@@ -143,6 +146,7 @@ public function testRun(): void
143146
$this->serializer,
144147
'foo',
145148
$instancesDirectory,
149+
'1.2.3',
146150
])
147151
->getMock();
148152
$instance->expects($this->once())
@@ -233,6 +237,7 @@ public function testSetUpMods(): void
233237
public function testCreateDumpInfoJson(): void
234238
{
235239
$baseVersion = '1.2.3';
240+
$version = '2.3.4';
236241
$modNames = ['abc', 'def'];
237242

238243
/* @var InfoJson&MockObject $baseInfo */
@@ -250,7 +255,7 @@ public function testCreateDumpInfoJson(): void
250255
$expectedResult->setName('Dump')
251256
->setTitle('Factorio Item Browser - Dump')
252257
->setAuthor('factorio-item-browser')
253-
->setVersion('1.0.0')
258+
->setVersion($version)
254259
->setFactorioVersion($baseVersion)
255260
->setDependencies($modNames);
256261

@@ -260,7 +265,8 @@ public function testCreateDumpInfoJson(): void
260265
$this->modFileManager,
261266
$this->serializer,
262267
'foo',
263-
'bar'
268+
'bar',
269+
$version
264270
);
265271

266272
$result = $this->invokeMethod($instance, 'createDumpInfoJson', $modNames);
@@ -456,7 +462,8 @@ public function testGetFactorioPath(): void
456462
$this->modFileManager,
457463
$this->serializer,
458464
$factorioDirectory,
459-
'bar'
465+
'bar',
466+
'1.2.3',
460467
);
461468

462469
$result = $this->invokeMethod($instance, 'getFactorioPath', $fileName);
@@ -481,7 +488,8 @@ public function testGetInstancePath(): void
481488
$this->modFileManager,
482489
$this->serializer,
483490
'foo',
484-
'bar'
491+
'bar',
492+
'1.2.3',
485493
);
486494
$this->injectProperty($instance, 'combinationInstanceDirectory', $combinationInstanceDirectory);
487495

0 commit comments

Comments
 (0)