Skip to content

Commit 87c8c53

Browse files
committed
[Maintenance] Support Sylius 1.14
1 parent 8bc9e24 commit 87c8c53

File tree

16 files changed

+25
-214
lines changed

16 files changed

+25
-214
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
php: [ "8.1", "8.2", "8.3" ]
2626
symfony: ["^5.4", "^6.4"]
27-
sylius: [ "^1.12", "^1.13" ]
27+
sylius: [ "^1.13", "^1.14" ]
2828
node: [ "18.x", "20.x" ]
2929
mysql: ["8.0"]
3030
state_machine_adapter: ["winzou_state_machine", "symfony_workflow"]
@@ -146,7 +146,7 @@ jobs:
146146
name: Prepare test application assets
147147
run: |
148148
(cd tests/Application && bin/console assets:install public -vvv)
149-
(cd tests/Application && yarn prod)
149+
(cd tests/Application && yarn build)
150150
151151
-
152152
name: Prepare test application cache
@@ -178,7 +178,7 @@ jobs:
178178

179179
-
180180
name: Upload Behat logs
181-
uses: actions/upload-artifact@v3
181+
uses: actions/upload-artifact@v4
182182
if: failure()
183183
with:
184184
name: Behat logs
@@ -187,7 +187,7 @@ jobs:
187187

188188
-
189189
name: Upload test log logs
190-
uses: actions/upload-artifact@v3
190+
uses: actions/upload-artifact@v4
191191
if: failure()
192192
with:
193193
name: Var logs

.github/workflows/coding_standard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
php: [ "8.1", "8.2", "8.3" ]
2222
symfony: [ "^5.4", "^6.4" ]
23-
sylius: [ "^1.12", "^1.13" ]
23+
sylius: [ "^1.13", "^1.14" ]
2424
node: [ "18.x", "20.x" ]
2525

2626
steps:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"license": "MIT",
66
"require": {
77
"php": "^8.1",
8-
"sylius/sylius": "^1.12 || ^1.13",
8+
"sylius/sylius": "^1.13 || ^1.14",
99
"symfony/webpack-encore-bundle": "^1.15",
1010
"dompdf/dompdf": "^2.0"
1111
},

src/DependencyInjection/BitBagSyliusWishlistExtension.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Sylius\Bundle\CoreBundle\DependencyInjection\PrependDoctrineMigrationsTrait;
1515
use Sylius\Bundle\ResourceBundle\DependencyInjection\Extension\AbstractResourceExtension;
16+
use Symfony\Component\Config\Definition\ConfigurationInterface;
1617
use Symfony\Component\Config\FileLocator;
1718
use Symfony\Component\DependencyInjection\ContainerBuilder;
1819
use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;

tests/Application/.babelrc

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/Application/Kernel.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,5 @@ private function registerBundlesFromFile(string $bundlesFile): iterable
138138
private function getConfigurationDirectories(): iterable
139139
{
140140
yield $this->getProjectDir() . '/config';
141-
$syliusConfigDir = $this->getProjectDir() . '/config/sylius/' . SyliusKernel::MAJOR_VERSION . '.' . SyliusKernel::MINOR_VERSION;
142-
if (is_dir($syliusConfigDir)) {
143-
yield $syliusConfigDir;
144-
}
145-
$symfonyConfigDir = $this->getProjectDir() . '/config/symfony/' . BaseKernel::MAJOR_VERSION . '.' . BaseKernel::MINOR_VERSION;
146-
if (is_dir($symfonyConfigDir)) {
147-
yield $symfonyConfigDir;
148-
}
149141
}
150142
}

tests/Application/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "sylius/plugin-skeleton-test-application",
2+
"name": "bitbag/wishlist-plugin-test-application",
33
"description": "Sylius application for plugin testing purposes (composer.json needed for project dir resolving)",
44
"license": "MIT"
55
}

tests/Application/config/bundles.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,7 @@
6060
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
6161
League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
6262
Sylius\Calendar\SyliusCalendarBundle::class => ['all' => true],
63+
BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
64+
SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
65+
Sylius\Abstraction\StateMachine\SyliusStateMachineAbstractionBundle::class => ['all' => true],
6366
];

tests/Application/config/packages/_sylius.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ sylius_api:
99

1010
parameters:
1111
sylius_core.public_dir: '%kernel.project_dir%/public'
12+
test_default_state_machine_adapter: 'symfony_workflow'
13+
test_sylius_state_machine_adapter: '%env(string:default:test_default_state_machine_adapter:TEST_SYLIUS_STATE_MACHINE_ADAPTER)%'
1214

1315
sylius_shop:
1416
product_grid:
1517
include_all_descendants: true
18+
19+
sylius_state_machine_abstraction:
20+
graphs_to_adapters_mapping:
21+
sylius_refund_refund_payment: '%test_sylius_state_machine_adapter%'
File renamed without changes.

0 commit comments

Comments
 (0)