Skip to content

Commit 028199d

Browse files
RafikoooRafikooo
committed
Resolve conflicts between 1.0 and 2.0
2 parents e8c5a1d + 033dc4f commit 028199d

File tree

156 files changed

+992
-1268
lines changed

Some content is hidden

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

156 files changed

+992
-1268
lines changed

.github/workflows/build.yml renamed to .github/workflows/build.yaml

Lines changed: 25 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -12,60 +12,33 @@ on:
1212

1313
jobs:
1414
tests:
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-22.04
1616

1717
name: "Sylius ${{ matrix.sylius }}, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, ${{ matrix.database == 'mysql' && format('MySQL {0}', matrix.mysql) || matrix.database == 'postgres' && format('PostgreSQL {0}', matrix.postgres) }}, wkhtmltopdf: ${{ matrix.wkhtmltopdf }}, State Machine Adapter ${{ matrix.state_machine_adapter }}"
1818

1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
php: ["8.3"]
23-
symfony: ["^5.4.21", "^6.4"]
24-
sylius: ["~1.13.0", "~1.14.0"]
25-
mysql: ["8.4"]
22+
php: ["8.2", "8.3"]
23+
symfony: ["^6.4", "^7.1"]
24+
sylius: ["~2.0.0"]
2625
node: ["20.x"]
27-
postgres: ["15.8"]
2826
database: ["mysql", "postgres"]
29-
wkhtmltopdf: ["0.12.6-1"]
27+
mysql: ["8.4"]
28+
postgres: ["15.8"]
29+
wkhtmltopdf: ["0.12.6-1", false]
3030
state_machine_adapter: ["symfony_workflow"]
3131

3232
include:
3333
-
34-
php: "8.1"
35-
symfony: "^6.4"
36-
sylius: "~1.14.0"
37-
database: "mysql"
38-
mysql: "8.4"
34+
php: "8.3"
35+
symfony: "^7.1"
36+
sylius: "~2.0.0"
3937
node: "20.x"
40-
wkhtmltopdf: "0.12.6-1"
41-
state_machine_adapter: "symfony_workflow"
42-
-
43-
php: "8.2"
44-
symfony: "^6.4"
45-
sylius: "~1.14.0"
4638
database: "mysql"
4739
mysql: "8.4"
48-
node: "20.x"
4940
wkhtmltopdf: "0.12.6-1"
5041
state_machine_adapter: "winzou_state_machine"
51-
-
52-
php: "8.2"
53-
symfony: "^6.4"
54-
sylius: "~1.14.0"
55-
database: "mysql"
56-
mysql: "8.4"
57-
node: "20.x"
58-
wkhtmltopdf: false
59-
state_machine_adapter: "symfony_workflow"
60-
-
61-
php: "8.2"
62-
symfony: "^6.4"
63-
sylius: "~1.14.0"
64-
database: "postgres"
65-
postgres: "15.8"
66-
node: "20.x"
67-
wkhtmltopdf: false
68-
state_machine_adapter: "symfony_workflow"
6942

7043
env:
7144
APP_ENV: test
@@ -135,7 +108,6 @@ jobs:
135108
if: matrix.wkhtmltopdf == false
136109
run: |
137110
mv tests/Application/etc/sylius_invoicing_pdf_generation_disabled.yaml tests/Application/config/packages
138-
sed -i 's/pdf_generation_disabled/pdf_generation_enabled/g' behat.yml.dist
139111
140112
-
141113
name: Get Composer cache directory
@@ -164,6 +136,13 @@ jobs:
164136
if: matrix.sylius != ''
165137
run: composer require "sylius/sylius:${{ matrix.sylius }}" --no-update --no-scripts --no-interaction
166138

139+
-
140+
name: Require Winzou State Machine
141+
if: "${{ matrix.state_machine_adapter == 'winzou_state_machine' }}"
142+
run: |
143+
composer require winzou/state-machine:^0.4 --no-update
144+
composer require winzou/state-machine-bundle:^0.6 --no-update
145+
167146
-
168147
name: Install PHP dependencies
169148
run: composer install --no-interaction --no-scripts
@@ -206,21 +185,13 @@ jobs:
206185
name: Load fixtures in test application
207186
run: (cd tests/Application && bin/console sylius:fixtures:load -n)
208187

209-
-
210-
name: Validate composer.json
211-
run: composer validate --ansi --strict --no-check-publish
212-
213-
-
214-
name: Run ECS
215-
run: vendor/bin/ecs check src/ spec/
216-
217188
-
218189
name: Run security check
219190
run: symfony security:check
220191

221192
-
222-
name: Run PHPStan
223-
run: vendor/bin/phpstan analyse -c phpstan.neon -l max src/
193+
name: Run analysis
194+
run: composer analyse
224195

225196
-
226197
name: Run PHPSpec
@@ -232,7 +203,12 @@ jobs:
232203

233204
-
234205
name: Run Behat
235-
run: vendor/bin/behat --colors --strict -vvv --no-interaction -f progress || vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --rerun
206+
run: |
207+
if [ "${{ matrix.wkhtmltopdf }}" != "false" ]; then
208+
vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --tags="~@pdf_disabled" || vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --rerun;
209+
else
210+
vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --tags="~@pdf_enabled" || vendor/bin/behat --colors --strict -vvv --no-interaction -f progress --rerun;
211+
fi
236212
237213
-
238214
name: Upload Behat logs

‎CHANGELOG-2.0.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# CHANGELOG
2+
3+
### v2.0.0-RC.1 (2024-12-03)
4+
5+
- [#323](https://github.com/Sylius/InvoicingPlugin/issues/323) Upgrade to 2.0 ([@TheMilek](https://github.com/TheMilek))
6+
- [#325](https://github.com/Sylius/InvoicingPlugin/issues/325) Reflect Sylius 2.0 Changes ([@Rafikooo](https://github.com/Rafikooo))
7+
- [#328](https://github.com/Sylius/InvoicingPlugin/issues/328) [Maintenance] Bump twig hooks ([@mpysiak](https://github.com/mpysiak))
8+
- [#332](https://github.com/Sylius/InvoicingPlugin/issues/332) Bump to stable Sylius 2.0 + minor clean up ([@GSadee](https://github.com/GSadee))
9+
- [#344](https://github.com/Sylius/InvoicingPlugin/issues/344) Fix translations' keys after upmerge ([@GSadee](https://github.com/GSadee))
10+
- [#347](https://github.com/Sylius/InvoicingPlugin/issues/347) [CI] Enable composer analyse ([@GSadee](https://github.com/GSadee))
11+
- [#348](https://github.com/Sylius/InvoicingPlugin/issues/348) Adjust the translations and routes after naming convention changes ([@TheMilek](https://github.com/TheMilek))

0 commit comments

Comments
 (0)