Skip to content

Commit bb93b83

Browse files
authored
Merge pull request #11 from factorio-item-browser/feature/combination-api
feature/combination-api
2 parents 875507f + 035f6b8 commit bb93b83

Some content is hidden

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

51 files changed

+2151
-3457
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 5 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: json, pdo_mysql, 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
@@ -98,7 +98,7 @@ jobs:
9898
- name: Setup PHP
9999
uses: shivammathur/setup-php@v2
100100
with:
101-
php-version: 7.4
101+
php-version: "7.4"
102102
extensions: json, pdo_mysql, zip
103103
tools: cs2pr
104104
coverage: none
@@ -130,7 +130,7 @@ jobs:
130130
- name: Setup PHP
131131
uses: shivammathur/setup-php@v2
132132
with:
133-
php-version: 7.4
133+
php-version: "7.4"
134134
extensions: json, pdo_mysql, zip
135135
coverage: none
136136

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"bluepsyduck/laminas-autowire-factory": "^1.0",
2020
"bluepsyduck/symfony-process-manager": "^1.3",
2121
"factorio-item-browser/api-database": "^3.3",
22+
"factorio-item-browser/combination-api-client": "^1.0",
2223
"factorio-item-browser/common": "^1.0",
23-
"factorio-item-browser/export-data": "^3.0",
24-
"factorio-item-browser/export-queue-client": "^1.2.0",
24+
"factorio-item-browser/export-data": "^4.0",
2525
"laminas/laminas-config-aggregator": "^1.0",
2626
"laminas/laminas-servicemanager": "^3.3",
2727
"ramsey/uuid": "^3.8",

0 commit comments

Comments
 (0)