Skip to content

Commit a4cc100

Browse files
authored
Merge pull request #31 from factorio-item-browser/feature/improved-output
feature/improved-output
2 parents 42151b9 + f5e21f0 commit a4cc100

File tree

111 files changed

+5806
-5832
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+5806
-5832
lines changed

.github/workflows/ci.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
pull_request:
55
schedule:
6-
- cron: '0 0 * * 0'
6+
- cron: "0 0 * * 0"
77

88
jobs:
99
composer-validation:
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: 7.4
19+
php-version: "7.4"
2020
extensions: ftp, gd, json, zip
2121
coverage: none
2222

@@ -29,7 +29,7 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
php-version:
32-
- 7.4
32+
- "7.4"
3333
runs-on: ubuntu-latest
3434
steps:
3535
- name: Checkout
@@ -95,7 +95,7 @@ jobs:
9595
fail-fast: false
9696
matrix:
9797
php-version:
98-
- 7.4
98+
- "7.4"
9999
runs-on: ubuntu-latest
100100
steps:
101101
- name: Checkout
@@ -135,7 +135,7 @@ jobs:
135135
- name: Setup PHP
136136
uses: shivammathur/setup-php@v2
137137
with:
138-
php-version: 7.4
138+
php-version: "7.4"
139139
extensions: ftp, gd, json, zip
140140
tools: cs2pr
141141
coverage: none
@@ -167,7 +167,7 @@ jobs:
167167
- name: Setup PHP
168168
uses: shivammathur/setup-php@v2
169169
with:
170-
php-version: 7.4
170+
php-version: "7.4"
171171
extensions: ftp, gd, json, zip
172172
coverage: none
173173

bin/render-icon

192 KB
Binary file not shown.

composer.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,31 @@
2020
"ext-zip": "*",
2121
"bluepsyduck/factorio-mod-portal-client": "^1.2",
2222
"bluepsyduck/factorio-translator": "^1.0",
23-
"bluepsyduck/mapper-manager": "dev-feature/generics",
23+
"bluepsyduck/jms-serializer-factory": "^1.0",
24+
"bluepsyduck/mapper-manager": "^1.2",
2425
"bluepsyduck/symfony-process-manager": "^1.0",
2526
"bluepsyduck/laminas-autowire-factory": "^1.0",
2627
"doctrine/cache": "^1.8",
2728
"factorio-item-browser/common": "^1.2",
28-
"factorio-item-browser/export-data": "dev-feature/chunked-data",
29-
"factorio-item-browser/export-queue-client": "^1.2.0",
29+
"factorio-item-browser/combination-api-client": "^1.0",
30+
"factorio-item-browser/export-data": "^4.0",
3031
"laminas/laminas-config-aggregator": "^1.0",
3132
"laminas/laminas-servicemanager": "^3.3",
3233
"laminas/laminas-stdlib": "^3.2",
34+
"monolog/monolog": "^2.1",
3335
"nicolab/php-ftp-client": "^1.5",
3436
"ramsey/uuid": "^3.8",
3537
"symfony/console": "^5.0",
3638
"symfony/filesystem": "^5.0",
3739
"symfony/process": "^5.0"
3840
},
3941
"require-dev": {
40-
"bluepsyduck/test-helper": "^1.0",
42+
"bluepsyduck/test-helper": "^2.0",
4143
"mikey179/vfsstream": "^1.6",
4244
"phpstan/phpstan": "^0.12",
4345
"phpstan/phpstan-phpunit": "^0.12",
4446
"phpstan/phpstan-strict-rules": "^0.12",
45-
"phpunit/phpunit": "^8.0",
47+
"phpunit/phpunit": "^9.0",
4648
"rregeer/phpunit-coverage-check": "^0.3",
4749
"squizlabs/php_codesniffer": "^3.3"
4850
},
@@ -71,8 +73,8 @@
7173
"test-unit": "phpunit --testsuite unit-test --colors=always --coverage-html=test/coverage --coverage-clover=test/coverage/clover.xml",
7274
"test-serialize": "phpunit --testsuite serializer-test --colors=always",
7375
"post-autoload-dump": [
74-
"mkdir -p data/cache data/factorio data/mods data/temp data/instances",
75-
"chmod 0777 data/cache data/factorio data/mods data/temp data/instances"
76+
"mkdir -p data/cache data/factorio data/log data/mods data/temp data/instances",
77+
"chmod 0777 data/cache data/factorio data/log data/mods data/temp data/instances"
7678
],
7779
"test": [
7880
"@composer validate --strict",

0 commit comments

Comments
 (0)