Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 16205f6

Browse files
lchrusciellchrusciel
authored
refactor #10970 Require Symfony ^4.4 (pamil)
This PR was merged into the 1.7-dev branch. Discussion ---------- Commits ------- 430d9cd Require Symfony ^4.4 08883d7 Fix the validation message after update to symfony/validator ^4.4 f9f5e08 Fix packages build after upgrade to Symfony 4.4
2 parents 8fa1227 + f9f5e08 commit 16205f6

42 files changed

Lines changed: 156 additions & 233 deletions

File tree

Some content is hidden

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

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ addons:
1717

1818
matrix:
1919
include:
20-
-
20+
-
2121
php: 7.3
2222
env:
2323
- SYLIUS_SUITE="application"
24-
- SYMFONY_VERSION="4.3.*"
24+
- SYMFONY_VERSION="4.4.*"
2525
services:
2626
- memcached
2727
- mysql
28-
-
28+
-
2929
php: 7.3
3030
env:
3131
- SYLIUS_SUITE="docs packages"
32-
- SYMFONY_VERSION="4.3.*"
32+
- SYMFONY_VERSION="4.4.*"
3333
services:
3434
- docker
3535
addons:

‎composer.json‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -59,38 +59,38 @@
5959
"sylius/resource": "^1.4.4",
6060
"sylius/resource-bundle": "^1.4.4",
6161
"sylius/theme-bundle": "^1.4.5",
62-
"symfony/asset": "^4.3",
63-
"symfony/config": "^4.3",
64-
"symfony/console": "^4.3",
65-
"symfony/dependency-injection": "^4.3",
66-
"symfony/doctrine-bridge": "^4.3",
67-
"symfony/event-dispatcher": "^4.3",
68-
"symfony/expression-language": "^4.3",
69-
"symfony/filesystem": "^4.3",
70-
"symfony/finder": "^4.3",
71-
"symfony/form": "^4.3",
72-
"symfony/framework-bundle": "^4.3",
73-
"symfony/http-foundation": "^4.3",
74-
"symfony/http-kernel": "^4.3",
75-
"symfony/intl": "^4.3",
62+
"symfony/asset": "^4.4",
63+
"symfony/config": "^4.4",
64+
"symfony/console": "^4.4",
65+
"symfony/dependency-injection": "^4.4",
66+
"symfony/doctrine-bridge": "^4.4",
67+
"symfony/event-dispatcher": "^4.4",
68+
"symfony/expression-language": "^4.4",
69+
"symfony/filesystem": "^4.4",
70+
"symfony/finder": "^4.4",
71+
"symfony/form": "^4.4",
72+
"symfony/framework-bundle": "^4.4",
73+
"symfony/http-foundation": "^4.4",
74+
"symfony/http-kernel": "^4.4",
75+
"symfony/intl": "^4.4",
7676
"symfony/monolog-bundle": "^3.0",
77-
"symfony/options-resolver": "^4.3",
77+
"symfony/options-resolver": "^4.4",
7878
"symfony/polyfill-iconv": "^1.3",
7979
"symfony/polyfill-intl-icu": "^1.3",
8080
"symfony/polyfill-mbstring": "^1.3",
81-
"symfony/process": "^4.3",
82-
"symfony/property-access": "^4.3",
83-
"symfony/proxy-manager-bridge": "^4.3",
84-
"symfony/routing": "^4.3",
85-
"symfony/security": "^4.3",
86-
"symfony/security-bundle": "^4.3",
81+
"symfony/process": "^4.4",
82+
"symfony/property-access": "^4.4",
83+
"symfony/proxy-manager-bridge": "^4.4",
84+
"symfony/routing": "^4.4",
85+
"symfony/security": "^4.4",
86+
"symfony/security-bundle": "^4.4",
8787
"symfony/swiftmailer-bundle": "^3.0",
88-
"symfony/templating": "^4.3",
88+
"symfony/templating": "^4.4",
8989
"symfony/thanks": "^1.0",
90-
"symfony/translation": "^4.3",
91-
"symfony/twig-bundle": "^4.3",
92-
"symfony/validator": "^4.3",
93-
"symfony/yaml": "^4.3",
90+
"symfony/translation": "^4.4",
91+
"symfony/twig-bundle": "^4.4",
92+
"symfony/validator": "^4.4",
93+
"symfony/yaml": "^4.4",
9494
"twig/intl-extra": "^2.12",
9595
"twig/twig": "^2.12",
9696
"webmozart/assert": "^1.1",
@@ -127,11 +127,11 @@
127127
"sspooky13/yaml-standards": "^5.0",
128128
"stripe/stripe-php": "^4.1",
129129
"sylius-labs/coding-standard": "^3.0",
130-
"symfony/browser-kit": "^4.3",
131-
"symfony/debug-bundle": "^4.3",
132-
"symfony/dotenv": "^4.2",
130+
"symfony/browser-kit": "^4.4",
131+
"symfony/debug-bundle": "^4.4",
132+
"symfony/dotenv": "^4.4",
133133
"symfony/flex": "^1.2",
134-
"symfony/web-profiler-bundle": "^4.3",
134+
"symfony/web-profiler-bundle": "^4.4",
135135
"vimeo/psalm": "3.7.2"
136136
},
137137
"replace": {

‎src/Sylius/Behat/Context/Ui/Admin/ManagingPromotionsContext.php‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -521,25 +521,15 @@ public function iShouldBeNotifiedThatThisValueShouldNotBeBlank()
521521
);
522522
}
523523

524-
/**
525-
* @Then I should be notified that the maximum value of a percentage discount is 100%
526-
*/
527-
public function iShouldBeNotifiedThatTheMaximumValueOfAPercentageDiscountIs100()
528-
{
529-
Assert::same(
530-
$this->createPage->getValidationMessageForAction(),
531-
'The maximum value of a percentage discount is 100%.'
532-
);
533-
}
534-
535524
/**
536525
* @Then I should be notified that a percentage discount value must be at least 0%
526+
* @Then I should be notified that the maximum value of a percentage discount is 100%
537527
*/
538-
public function iShouldBeNotifiedThatAPercentageDiscountValueMustBeAtLeast0()
528+
public function iShouldBeNotifiedThatPercentageDiscountShouldBeBetween(): void
539529
{
540530
Assert::same(
541531
$this->createPage->getValidationMessageForAction(),
542-
'The value of a percentage discount must be at least 0%.'
532+
'The percentage discount must be between 0% and 100%.'
543533
);
544534
}
545535

‎src/Sylius/Bundle/AddressingBundle/composer.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,17 @@
2525
"stof/doctrine-extensions-bundle": "^1.2",
2626
"sylius/addressing": "^1.2",
2727
"sylius/resource-bundle": "^1.2",
28-
"symfony/framework-bundle": "^4.3",
29-
"symfony/intl": "^4.3"
28+
"symfony/framework-bundle": "^4.4",
29+
"symfony/intl": "^4.4"
3030
},
3131
"require-dev": {
3232
"doctrine/orm": "^2.5",
3333
"phpspec/phpspec": "^5.0",
34-
"symfony/dependency-injection": "^4.3",
35-
"symfony/form": "^4.3",
36-
"symfony/validator": "^4.3",
34+
"symfony/dependency-injection": "^4.4",
35+
"symfony/form": "^4.4",
36+
"symfony/validator": "^4.4",
3737
"phpunit/phpunit": "^7.0",
38-
"symfony/browser-kit": "^4.3",
38+
"symfony/browser-kit": "^4.4",
3939
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
4040
},
4141
"conflict": {

‎src/Sylius/Bundle/AdminApiBundle/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@
2424

2525
"friendsofsymfony/oauth-server-bundle": "^1.6",
2626
"sylius/core-bundle": "^1.2",
27-
"symfony/form": "^4.3",
28-
"symfony/framework-bundle": "^4.3",
29-
"symfony/validator": "^4.3"
27+
"symfony/form": "^4.4",
28+
"symfony/framework-bundle": "^4.4",
29+
"symfony/validator": "^4.4"
3030
},
3131
"require-dev": {
3232
"doctrine/orm": "^2.5",
3333
"matthiasnoback/symfony-config-test": "^4.0",
3434
"phpspec/phpspec": "^5.0",
3535
"phpunit/phpunit": "^7.0",
36-
"symfony/dependency-injection": "^4.3",
36+
"symfony/dependency-injection": "^4.4",
3737
"twig/twig": "^2.0"
3838
},
3939
"config": {

‎src/Sylius/Bundle/AdminBundle/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424

2525
"sylius/core-bundle": "^1.2",
2626
"sylius/ui-bundle": "^1.2",
27-
"symfony/framework-bundle": "^4.3",
27+
"symfony/framework-bundle": "^4.4",
2828
"twig/intl-extra": "^2.12",
2929
"twig/twig": "^2.12"
3030
},
3131
"require-dev": {
3232
"phpspec/phpspec": "^5.0",
3333
"phpunit/phpunit": "^7.0",
34-
"symfony/dependency-injection": "^4.3"
34+
"symfony/dependency-injection": "^4.4"
3535
},
3636
"config": {
3737
"bin-dir": "bin"

‎src/Sylius/Bundle/AttributeBundle/composer.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,15 @@
2626
"stof/doctrine-extensions-bundle": "^1.2",
2727
"sylius/attribute": "^1.2",
2828
"sylius/resource-bundle": "^1.2",
29-
"symfony/framework-bundle": "^4.3"
29+
"symfony/framework-bundle": "^4.4"
3030
},
3131
"require-dev": {
3232
"doctrine/orm": "^2.5",
3333
"phpspec/phpspec": "^5.0",
3434
"phpunit/phpunit": "^7.0",
35-
"symfony/dependency-injection": "^4.3",
36-
"symfony/form": "^4.3",
37-
"symfony/browser-kit": "^4.3",
38-
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
35+
"symfony/dependency-injection": "^4.4",
36+
"symfony/form": "^4.4",
37+
"symfony/browser-kit": "^4.4"
3938
},
4039
"config": {
4140
"bin-dir": "bin"

‎src/Sylius/Bundle/AttributeBundle/test/app/AppKernel.php‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public function registerBundles(): array
3232
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
3333
new Sylius\Bundle\AttributeBundle\SyliusAttributeBundle(),
3434
new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),
35-
new Symfony\Bundle\TwigBundle\TwigBundle(),
3635
];
3736
}
3837

@@ -43,16 +42,4 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
4342
{
4443
$loader->load(__DIR__ . '/config/config.yml');
4544
}
46-
47-
/**
48-
* {@inheritdoc}
49-
*/
50-
protected function getContainerBaseClass(): string
51-
{
52-
if (0 === strpos($this->environment, 'test')) {
53-
return MockerContainer::class;
54-
}
55-
56-
return parent::getContainerBaseClass();
57-
}
5845
}

‎src/Sylius/Bundle/AttributeBundle/test/app/config/config.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,13 @@ framework:
99
resource: "%kernel.project_dir%/app/config/routing.yml"
1010
form: ~
1111
csrf_protection: true
12-
templating:
13-
engines: ['twig']
1412
default_locale: "%locale%"
1513
session:
1614
handler_id: ~
1715
storage_id: session.storage.mock_file
1816
http_method_override: true
1917
test: ~
2018

21-
twig:
22-
debug: "%kernel.debug%"
23-
strict_variables: "%kernel.debug%"
24-
2519
doctrine:
2620
dbal:
2721
driver: "%database_driver%"

‎src/Sylius/Bundle/ChannelBundle/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424

2525
"sylius/channel": "^1.2",
2626
"sylius/resource-bundle": "^1.2",
27-
"symfony/framework-bundle": "^4.3"
27+
"symfony/framework-bundle": "^4.4"
2828
},
2929
"require-dev": {
3030
"matthiasnoback/symfony-dependency-injection-test": "^3.0",
3131
"phpspec/phpspec": "^5.0",
3232
"phpunit/phpunit": "^7.0",
3333
"twig/twig": "^2.0",
3434
"doctrine/orm": "^2.5",
35-
"symfony/dependency-injection": "^4.3",
36-
"symfony/form": "^4.3",
37-
"symfony/browser-kit": "^4.3",
35+
"symfony/dependency-injection": "^4.4",
36+
"symfony/form": "^4.4",
37+
"symfony/browser-kit": "^4.4",
3838
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
3939
},
4040
"config": {

0 commit comments

Comments
 (0)