Skip to content

Commit 9ba5914

Browse files
jbcrdamonsson
authored andcommitted
update test app to Symfony 5.2
1 parent fd8121f commit 9ba5914

8 files changed

Lines changed: 18 additions & 12 deletions

File tree

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"friends-of-behat/suite-settings-extension": "^1.0",
2727
"friends-of-behat/symfony-extension": "^2.1",
2828
"friends-of-behat/variadic-extension": "^1.3",
29-
"lchrusciel/api-test-case": "^4.1",
29+
"friendsofsymfony/oauth-server-bundle": ">2.0.0-alpha.0 ^2.0@dev",
30+
"lchrusciel/api-test-case": "^4.1||^5.0",
3031
"matthiasnoback/symfony-config-test": "^4.0",
3132
"phpspec/phpspec": "^7.0",
3233
"phpstan/phpstan": "^0.12",
@@ -39,8 +40,7 @@
3940
"symfony/debug-bundle": "^4.4||^5.2",
4041
"symfony/dotenv": "^4.4||^5.2",
4142
"symfony/intl": "^4.4||^5.2",
42-
"symfony/web-profiler-bundle": "^4.4||^5.2",
43-
"symfony/web-server-bundle": "^4.4||^5.2"
43+
"symfony/web-profiler-bundle": "^4.4||^5.2"
4444
},
4545
"conflict": {
4646
"symfony/symfony": "4.1.8",

tests/Application/Kernel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ protected function getContainerLoader(ContainerInterface $container): LoaderInte
8585
/** @var ContainerBuilder $container */
8686
Assert::isInstanceOf($container, ContainerBuilder::class);
8787

88-
$locator = new FileLocator($this, $this->getRootDir() . '/Resources');
88+
$locator = new FileLocator($this, $this->getProjectDir() . '/Resources');
8989
$resolver = new LoaderResolver(array(
9090
new XmlFileLoader($container, $locator),
9191
new YamlFileLoader($container, $locator),

tests/Application/config/bundles.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
88
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
99
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
10-
Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
1110
Sylius\Bundle\OrderBundle\SyliusOrderBundle::class => ['all' => true],
1211
Sylius\Bundle\MoneyBundle\SyliusMoneyBundle::class => ['all' => true],
1312
Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle::class => ['all' => true],
@@ -40,12 +39,11 @@
4039
Liip\ImagineBundle\LiipImagineBundle::class => ['all' => true],
4140
Payum\Bundle\PayumBundle\PayumBundle::class => ['all' => true],
4241
Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
43-
BabDev\PagerfantaBundle\WhiteOctoberPagerfantaBundle::class => ['all' => true],
42+
BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
4443
Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
4544
Sylius\Bundle\FixturesBundle\SyliusFixturesBundle::class => ['all' => true],
4645
Sylius\Bundle\PayumBundle\SyliusPayumBundle::class => ['all' => true],
4746
Sylius\Bundle\ThemeBundle\SyliusThemeBundle::class => ['all' => true],
48-
Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['all' => true],
4947
Sylius\Bundle\AdminBundle\SyliusAdminBundle::class => ['all' => true],
5048
Sylius\Bundle\ShopBundle\SyliusShopBundle::class => ['all' => true],
5149
FOS\OAuthServerBundle\FOSOAuthServerBundle::class => ['all' => true],

tests/Application/config/packages/bitbag_sylius_cms_plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ imports:
22
- { resource: "@BitBagSyliusCmsPlugin/Resources/config/config.yml" }
33

44
parameters:
5-
fixtures_dir: "%kernel.root_dir%/Resources/fixtures"
5+
fixtures_dir: "%kernel.project_dir%/Resources/fixtures"
66

77
sylius_fixtures:
88
suites:

tests/Application/config/packages/dev/jms_serializer.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
jms_serializer:
22
visitors:
3-
json:
3+
json_serialization:
4+
options:
5+
- JSON_PRETTY_PRINT
6+
- JSON_UNESCAPED_SLASHES
7+
- JSON_PRESERVE_ZERO_FRACTION
8+
json_deserialization:
49
options:
510
- JSON_PRETTY_PRINT
611
- JSON_UNESCAPED_SLASHES

tests/Application/config/packages/framework.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ framework:
22
secret: '%env(APP_SECRET)%'
33
form: true
44
csrf_protection: true
5-
templating: { engines: ["twig"] }
65
session:
76
handler_id: ~
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
jms_serializer:
22
visitors:
3-
xml:
3+
xml_serialization:
44
format_output: '%kernel.debug%'
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
jms_serializer:
22
visitors:
3-
json:
3+
json_serialization:
4+
options:
5+
- JSON_UNESCAPED_SLASHES
6+
- JSON_PRESERVE_ZERO_FRACTION
7+
json_deserialization:
48
options:
59
- JSON_UNESCAPED_SLASHES
610
- JSON_PRESERVE_ZERO_FRACTION

0 commit comments

Comments
 (0)