Skip to content

Commit

Permalink
Merge branch '1.1'
Browse files Browse the repository at this point in the history 
* 1.1:
  Require Symfony ^3.4 in components & bundles
  • Loading branch information
@pamil
pamil committed Dec 27, 2017
2 parents 5e132cd + 761d92b commit e329351
Show file tree
Hide file tree
Showing 39 changed files with 144 additions and 145 deletions.
10 changes: 5 additions & 5 deletions src/Sylius/Bundle/AddressingBundle/composer.json
View file
Expand Up @@ -25,16 +25,16 @@
"stof/doctrine-extensions-bundle": "^1.2",
"sylius/addressing": "^1.0",
"sylius/resource-bundle": "^1.0",
"symfony/framework-bundle": "^3.2"
"symfony/framework-bundle": "^3.4"
},
"require-dev": {
"doctrine/orm": "~2.5.0",
"phpspec/phpspec": "^4.0",
"symfony/dependency-injection": "^3.2",
"symfony/form": "^3.2",
"symfony/validator": "^3.2",
"symfony/dependency-injection": "^3.4",
"symfony/form": "^3.4",
"symfony/validator": "^3.4",
"phpunit/phpunit": "^5.6",
"symfony/browser-kit": "^3.2",
"symfony/browser-kit": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down
8 changes: 4 additions & 4 deletions src/Sylius/Bundle/AdminApiBundle/composer.json
View file
Expand Up @@ -24,15 +24,15 @@

"friendsofsymfony/oauth-server-bundle": "^1.5",
"sylius/core-bundle": "^1.0",
"symfony/form": "^3.2",
"symfony/framework-bundle": "^3.2",
"symfony/validator": "^3.2"
"symfony/form": "^3.4",
"symfony/framework-bundle": "^3.4",
"symfony/validator": "^3.4"
},
"require-dev": {
"doctrine/orm": "~2.5.0",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"symfony/dependency-injection": "^3.2",
"symfony/dependency-injection": "^3.4",
"twig/twig": "^2.0"
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AdminBundle/composer.json
View file
Expand Up @@ -25,12 +25,12 @@
"sonata-project/intl-bundle": "^2.2",
"sylius/core-bundle": "^1.0",
"sylius/ui-bundle": "^1.0",
"symfony/framework-bundle": "^3.2"
"symfony/framework-bundle": "^3.4"
},
"require-dev": {
"phpunit/phpunit": "^5.6",
"phpspec/phpspec": "^4.0",
"symfony/dependency-injection": "^3.2"
"symfony/dependency-injection": "^3.4"
},
"config": {
"bin-dir": "bin"
Expand Down
8 changes: 4 additions & 4 deletions src/Sylius/Bundle/AttributeBundle/composer.json
View file
Expand Up @@ -26,15 +26,15 @@
"stof/doctrine-extensions-bundle": "^1.2",
"sylius/attribute": "^1.0",
"sylius/resource-bundle": "^1.0",
"symfony/framework-bundle": "^3.2"
"symfony/framework-bundle": "^3.4"
},
"require-dev": {
"doctrine/orm": "~2.5.0",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"symfony/dependency-injection": "^3.2",
"symfony/form": "^3.2",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.4",
"symfony/form": "^3.4",
"symfony/browser-kit": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down
8 changes: 4 additions & 4 deletions src/Sylius/Bundle/ChannelBundle/composer.json
View file
Expand Up @@ -24,17 +24,17 @@

"sylius/channel": "^1.0",
"sylius/resource-bundle": "^1.0",
"symfony/framework-bundle": "^3.2@rc"
"symfony/framework-bundle": "^3.4"
},
"require-dev": {
"matthiasnoback/symfony-dependency-injection-test": "^1.0",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"twig/twig": "^2.0",
"doctrine/orm": "~2.5.0",
"symfony/dependency-injection": "^3.2",
"symfony/form": "^3.2",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.4",
"symfony/form": "^3.4",
"symfony/browser-kit": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/CoreBundle/composer.json
View file
Expand Up @@ -49,7 +49,7 @@
"sylius/theme-bundle": "^1.0",
"sylius/user-bundle": "^1.0",
"sylius-labs/association-hydrator": "^1.0",
"symfony/framework-bundle": "^3.2",
"symfony/framework-bundle": "^3.4",
"winzou/state-machine-bundle": "^0.3",
"liip/imagine-bundle": "^1.9.1"
},
Expand All @@ -59,7 +59,7 @@
"matthiasnoback/symfony-dependency-injection-test": "^1.0",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"symfony/dependency-injection": "^3.2"
"symfony/dependency-injection": "^3.4"
},
"config": {
"bin-dir": "bin"
Expand Down
10 changes: 5 additions & 5 deletions src/Sylius/Bundle/CurrencyBundle/composer.json
View file
Expand Up @@ -24,17 +24,17 @@

"sylius/currency": "^1.0",
"sylius/resource-bundle": "^1.0",
"symfony/framework-bundle": "^3.2",
"symfony/templating": "^3.2"
"symfony/framework-bundle": "^3.4",
"symfony/templating": "^3.4"
},
"require-dev": {
"doctrine/orm": "~2.5.0",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"twig/twig": "^2.0",
"symfony/dependency-injection": "^3.2",
"symfony/form": "^3.2",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.4",
"symfony/form": "^3.4",
"symfony/browser-kit": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down
8 changes: 4 additions & 4 deletions src/Sylius/Bundle/CustomerBundle/composer.json
View file
Expand Up @@ -37,15 +37,15 @@
"doctrine/orm": "~2.5.0",
"sylius/customer": "^1.0",
"sylius/resource-bundle": "^1.0",
"symfony/framework-bundle": "^3.2",
"symfony/framework-bundle": "^3.4",
"webmozart/assert": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"symfony/dependency-injection": "^3.2",
"symfony/form": "^3.2",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.4",
"symfony/form": "^3.4",
"symfony/browser-kit": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down
16 changes: 8 additions & 8 deletions src/Sylius/Bundle/FixturesBundle/composer.json
View file
Expand Up @@ -24,8 +24,8 @@

"doctrine/data-fixtures": "^1.2",
"monolog/monolog": "^1.8",
"symfony/framework-bundle": "^3.2",
"symfony/monolog-bridge": "^3.2",
"symfony/framework-bundle": "^3.4",
"symfony/monolog-bridge": "^3.4",
"webmozart/assert": "^1.0",
"zendframework/zend-stdlib": "^3.0"
},
Expand All @@ -37,12 +37,12 @@
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"twig/twig": "^2.0",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.2",
"symfony/templating": "^3.2",
"symfony/translation": "^3.2",
"symfony/twig-bundle": "^3.2",
"symfony/security-csrf": "^3.2",
"symfony/browser-kit": "^3.4",
"symfony/dependency-injection": "^3.4",
"symfony/templating": "^3.4",
"symfony/translation": "^3.4",
"symfony/twig-bundle": "^3.4",
"symfony/security-csrf": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down
18 changes: 9 additions & 9 deletions src/Sylius/Bundle/GridBundle/composer.json
View file
Expand Up @@ -23,9 +23,9 @@
"php": "^7.1",

"sylius/grid": "^1.0",
"symfony/form": "^3.2",
"symfony/framework-bundle": "^3.2",
"symfony/templating": "^3.2"
"symfony/form": "^3.4",
"symfony/framework-bundle": "^3.4",
"symfony/templating": "^3.4"
},
"require-dev": {
"akeneo/phpspec-skip-example-extension": "^3.0@alpha",
Expand All @@ -41,12 +41,12 @@
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.2",
"symfony/proxy-manager-bridge": "^3.3",
"symfony/security-csrf": "^3.2",
"symfony/twig-bundle": "^3.2",
"symfony/validator": "^3.2",
"symfony/browser-kit": "^3.4",
"symfony/dependency-injection": "^3.4",
"symfony/proxy-manager-bridge": "^3.4",
"symfony/security-csrf": "^3.4",
"symfony/twig-bundle": "^3.4",
"symfony/validator": "^3.4",
"twig/twig": "^2.0"
},
"config": {
Expand Down
10 changes: 5 additions & 5 deletions src/Sylius/Bundle/InventoryBundle/composer.json
View file
Expand Up @@ -24,17 +24,17 @@

"sylius/inventory": "^1.0",
"sylius/resource-bundle": "^1.0",
"symfony/framework-bundle": "^3.2",
"symfony/templating": "^3.2",
"symfony/validator": "^3.2"
"symfony/framework-bundle": "^3.4",
"symfony/templating": "^3.4",
"symfony/validator": "^3.4"
},
"require-dev": {
"doctrine/orm": "~2.5.0",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"twig/twig": "^2.0",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.2",
"symfony/browser-kit": "^3.4",
"symfony/dependency-injection": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down
8 changes: 4 additions & 4 deletions src/Sylius/Bundle/LocaleBundle/composer.json
View file
Expand Up @@ -24,17 +24,17 @@

"sylius/locale": "^1.0",
"sylius/resource-bundle": "^1.0",
"symfony/framework-bundle": "^3.2",
"symfony/templating": "^3.2"
"symfony/framework-bundle": "^3.4",
"symfony/templating": "^3.4"
},
"require-dev": {
"doctrine/orm": "~2.5.0",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"twig/twig": "^2.0",
"ocramius/proxy-manager": "^2.0",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.2",
"symfony/browser-kit": "^3.4",
"symfony/dependency-injection": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down
12 changes: 6 additions & 6 deletions src/Sylius/Bundle/MailerBundle/composer.json
View file
Expand Up @@ -23,17 +23,17 @@
"php": "^7.1",

"sylius/mailer": "^1.0",
"symfony/framework-bundle": "^3.2"
"symfony/framework-bundle": "^3.4"
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.2",
"symfony/swiftmailer-bundle": "^3.0",
"symfony/templating": "^3.2",
"symfony/twig-bundle": "^3.2"
"symfony/browser-kit": "^3.4",
"symfony/dependency-injection": "^3.4",
"symfony/swiftmailer-bundle": "^3.1",
"symfony/templating": "^3.4",
"symfony/twig-bundle": "^3.4"
},
"config": {
"bin-dir": "bin"
Expand Down
12 changes: 6 additions & 6 deletions src/Sylius/Bundle/MoneyBundle/composer.json
View file
Expand Up @@ -23,9 +23,9 @@
"php": "^7.1",

"sylius/resource-bundle": "^1.0",
"symfony/framework-bundle": "^3.2",
"symfony/intl": "^3.2",
"symfony/templating": "^3.2",
"symfony/framework-bundle": "^3.4",
"symfony/intl": "^3.4",
"symfony/templating": "^3.4",
"webmozart/assert": "^1.0"
},
"require-dev": {
Expand All @@ -34,9 +34,9 @@
"phpunit/phpunit": "^5.6",
"twig/twig": "^2.0",
"sylius/currency-bundle": "^1.0",
"symfony/form": "^3.2",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.2",
"symfony/form": "^3.4",
"symfony/browser-kit": "^3.4",
"symfony/dependency-injection": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down
12 changes: 6 additions & 6 deletions src/Sylius/Bundle/OrderBundle/composer.json
View file
Expand Up @@ -26,17 +26,17 @@
"sylius/money-bundle": "^1.0",
"sylius/order": "^1.0",
"sylius/resource-bundle": "^1.0",
"symfony/framework-bundle": "^3.2",
"symfony/templating": "^3.2"
"symfony/framework-bundle": "^3.4",
"symfony/templating": "^3.4"
},
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.2",
"symfony/form": "^3.2",
"symfony/validator": "^3.2",
"symfony/browser-kit": "^3.4",
"symfony/dependency-injection": "^3.4",
"symfony/form": "^3.4",
"symfony/validator": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down
6 changes: 3 additions & 3 deletions src/Sylius/Bundle/PaymentBundle/composer.json
View file
Expand Up @@ -24,15 +24,15 @@

"sylius/payment": "^1.0",
"sylius/resource-bundle": "^1.0",
"symfony/framework-bundle": "^3.2"
"symfony/framework-bundle": "^3.4"
},
"require-dev": {
"doctrine/orm": "~2.5.0",
"phpspec/phpspec": "^4.0",
"sylius/locale-bundle": "^1.0",
"phpunit/phpunit": "^5.6",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.2",
"symfony/browser-kit": "^3.4",
"symfony/dependency-injection": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/PayumBundle/composer.json
View file
Expand Up @@ -37,7 +37,7 @@
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"symfony/dependency-injection": "^3.2"
"symfony/dependency-injection": "^3.4"
},
"config": {
"bin-dir": "bin"
Expand Down
10 changes: 5 additions & 5 deletions src/Sylius/Bundle/ProductBundle/composer.json
View file
Expand Up @@ -27,16 +27,16 @@
"sylius/product": "^1.0",
"sylius/locale-bundle": "^1.0",
"sylius/resource-bundle": "^1.0",
"symfony/framework-bundle": "^3.2"
"symfony/framework-bundle": "^3.4"
},
"require-dev": {
"doctrine/orm": "~2.5.0",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"symfony/form": "^3.2",
"symfony/validator": "^3.2",
"symfony/browser-kit": "^3.2",
"symfony/dependency-injection": "^3.2",
"symfony/form": "^3.4",
"symfony/validator": "^3.4",
"symfony/browser-kit": "^3.4",
"symfony/dependency-injection": "^3.4",
"incenteev/composer-parameter-handler": "~2.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0"
},
Expand Down

0 comments on commit e329351

Please sign in to comment.