Skip to content

Commit

Permalink
Merge branch '1.4'
Browse files Browse the repository at this point in the history 
* 1.4:
  Use phpspec 5.0 in packages
  • Loading branch information
@pamil
pamil committed Feb 1, 2019
2 parents 2468d48 + 8666c62 commit 8c4cfb3
Show file tree
Hide file tree
Showing 48 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AddressingBundle/composer.json
View file
Expand Up @@ -29,7 +29,7 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"symfony/dependency-injection": "^3.4|^4.1.1",
"symfony/form": "^3.4|^4.1.1",
"symfony/validator": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminApiBundle/composer.json
View file
Expand Up @@ -30,7 +30,7 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"symfony/dependency-injection": "^3.4|^4.1.1",
"twig/twig": "^2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/composer.json
View file
Expand Up @@ -28,7 +28,7 @@
"symfony/framework-bundle": "^3.4|^4.1.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"symfony/dependency-injection": "^3.4|^4.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AttributeBundle/composer.json
View file
Expand Up @@ -31,7 +31,7 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"symfony/dependency-injection": "^3.4|^4.1.1",
"symfony/form": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ChannelBundle/composer.json
View file
Expand Up @@ -28,7 +28,7 @@
},
"require-dev": {
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"twig/twig": "^2.0",
"doctrine/orm": "^2.5",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CoreBundle/composer.json
View file
Expand Up @@ -58,7 +58,7 @@
"hwi/oauth-bundle": "^0.6",
"matthiasnoback/symfony-config-test": "^3.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"symfony/dependency-injection": "^3.4|^4.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CurrencyBundle/composer.json
View file
Expand Up @@ -29,7 +29,7 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"twig/twig": "^2.0",
"symfony/dependency-injection": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CustomerBundle/composer.json
View file
Expand Up @@ -42,7 +42,7 @@
"webmozart/assert": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"symfony/dependency-injection": "^3.4|^4.1.1",
"symfony/form": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/FixturesBundle/composer.json
View file
Expand Up @@ -34,7 +34,7 @@
"doctrine/doctrine-bundle": "^1.3",
"matthiasnoback/symfony-config-test": "^3.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"twig/twig": "^2.0",
"symfony/browser-kit": "^3.4|^4.1.1",
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/GridBundle/composer.json
View file
Expand Up @@ -28,7 +28,7 @@
"symfony/templating": "^3.4|^4.1.1"
},
"require-dev": {
"akeneo/phpspec-skip-example-extension": "^3.0",
"akeneo/phpspec-skip-example-extension": "^4.0",
"doctrine/doctrine-bundle": "^1.3",
"doctrine/orm": "^2.5",
"doctrine/phpcr-odm": "^1.3",
Expand All @@ -37,7 +37,7 @@
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"ocramius/proxy-manager": "^2.1",
"pagerfanta/pagerfanta": "^1.0|^2.0",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"symfony/browser-kit": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/InventoryBundle/composer.json
View file
Expand Up @@ -30,7 +30,7 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"twig/twig": "^2.0",
"symfony/browser-kit": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/LocaleBundle/composer.json
View file
Expand Up @@ -29,7 +29,7 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"twig/twig": "^2.0",
"ocramius/proxy-manager": "^2.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/MailerBundle/composer.json
View file
Expand Up @@ -26,7 +26,7 @@
"symfony/framework-bundle": "^3.4|^4.1.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"symfony/browser-kit": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/MoneyBundle/composer.json
View file
Expand Up @@ -30,7 +30,7 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"twig/twig": "^2.0",
"sylius/currency-bundle": "^1.2",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/OrderBundle/composer.json
View file
Expand Up @@ -32,7 +32,7 @@
"require-dev": {
"doctrine/orm": "^2.5",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"symfony/browser-kit": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/PaymentBundle/composer.json
View file
Expand Up @@ -28,7 +28,7 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"sylius/locale-bundle": "^1.2",
"phpunit/phpunit": "^6.5",
"symfony/browser-kit": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/PayumBundle/composer.json
View file
Expand Up @@ -36,7 +36,7 @@
"sylius/resource-bundle": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"symfony/dependency-injection": "^3.4|^4.1.1"
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ProductBundle/composer.json
View file
Expand Up @@ -31,7 +31,7 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"symfony/form": "^3.4|^4.1.1",
"symfony/validator": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/PromotionBundle/composer.json
View file
Expand Up @@ -32,7 +32,7 @@
"require-dev": {
"doctrine/orm": "^2.5",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"symfony/form": "^3.4|^4.1.1",
"symfony/validator": "^3.4|^4.1.1",
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/ResourceBundle/composer.json
View file
Expand Up @@ -42,14 +42,14 @@
"winzou/state-machine-bundle": "^0.3"
},
"require-dev": {
"akeneo/phpspec-skip-example-extension": "^3.0",
"akeneo/phpspec-skip-example-extension": "^4.0",
"doctrine/mongodb-odm": "^1.0",
"doctrine/orm": "^2.5",
"doctrine/phpcr-odm": "^1.4",
"jackalope/jackalope-doctrine-dbal": "^1.2",
"lakion/api-test-case": "^3.1.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"sylius/grid-bundle": "^1.2",
"sylius/locale": "^1.2",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ReviewBundle/composer.json
View file
Expand Up @@ -42,7 +42,7 @@
"symfony/framework-bundle": "^3.4|^4.1.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"symfony/form": "^3.4|^4.1.1",
"symfony/validator": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ShippingBundle/composer.json
View file
Expand Up @@ -29,7 +29,7 @@
"symfony/framework-bundle": "^3.4|^4.1.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"doctrine/orm": "^2.5",
"symfony/form": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ShopBundle/composer.json
View file
Expand Up @@ -37,7 +37,7 @@
"require-dev": {
"matthiasnoback/symfony-config-test": "^3.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"symfony/dependency-injection": "^3.4|^4.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/TaxationBundle/composer.json
View file
Expand Up @@ -31,7 +31,7 @@
"require-dev": {
"doctrine/orm": "^2.5",
"phpunit/phpunit": "^6.5",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"symfony/form": "^3.4|^4.1.1",
"symfony/browser-kit": "^3.4|^4.1.1",
"symfony/dependency-injection": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/TaxonomyBundle/composer.json
View file
Expand Up @@ -29,7 +29,7 @@
},
"require-dev": {
"doctrine/orm": "^2.5",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"symfony/dependency-injection": "^3.4|^4.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ThemeBundle/composer.json
View file
Expand Up @@ -42,7 +42,7 @@
"matthiasnoback/symfony-config-test": "^3.0",
"matthiasnoback/symfony-dependency-injection-test": "^2.0",
"mikey179/vfsStream": "^1.6",
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"phpunit/phpunit": "^6.5",
"sylius/registry": "^1.1",
"symfony/browser-kit": "^3.4|^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/UiBundle/composer.json
View file
Expand Up @@ -30,7 +30,7 @@
"symfony/templating": "^3.4|^4.1.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"symfony/dependency-injection": "^3.4|^4.1.1",
"symfony/form": "^3.4|^4.1.1",
"twig/twig": "^2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Addressing/composer.json
View file
Expand Up @@ -27,7 +27,7 @@
"symfony/intl": "^3.4|^4.1.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Attribute/composer.json
View file
Expand Up @@ -28,7 +28,7 @@
"symfony/validator": "^3.4|^4.1.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Channel/composer.json
View file
Expand Up @@ -29,7 +29,7 @@
},
"require-dev": {
"pamil/prophecy-common": "^0.1",
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Core/composer.json
View file
Expand Up @@ -48,7 +48,7 @@
"zendframework/zend-stdlib": "^3.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"symfony/property-access": "^3.4|^4.1.1"
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Currency/composer.json
View file
Expand Up @@ -27,7 +27,7 @@
"zendframework/zend-stdlib": "^3.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Customer/composer.json
View file
Expand Up @@ -34,7 +34,7 @@
"sylius/resource": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Grid/composer.json
View file
Expand Up @@ -26,7 +26,7 @@
"webmozart/assert": "^1.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0",
"phpspec/phpspec": "^5.0",
"symfony/property-access": "^3.4|^4.1.1"
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Inventory/composer.json
View file
Expand Up @@ -26,7 +26,7 @@
"webmozart/assert": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Locale/composer.json
View file
Expand Up @@ -27,7 +27,7 @@
"zendframework/zend-stdlib": "^3.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Mailer/composer.json
View file
Expand Up @@ -25,7 +25,7 @@
"webmozart/assert": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Order/composer.json
View file
Expand Up @@ -27,7 +27,7 @@
"zendframework/zend-stdlib": "^3.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Payment/composer.json
View file
Expand Up @@ -26,7 +26,7 @@
"sylius/resource": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Product/composer.json
View file
Expand Up @@ -29,7 +29,7 @@
"webmozart/assert": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"suggest": {
"ext-iconv": "For better performance than using Symfony Polyfill Component"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Promotion/composer.json
View file
Expand Up @@ -27,7 +27,7 @@
"sylius/resource": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Component/Registry/composer.json
View file
Expand Up @@ -26,7 +26,7 @@
"zendframework/zend-stdlib": "^3.1"
},
"require-dev": {
"phpspec/phpspec": "^4.0"
"phpspec/phpspec": "^5.0"
},
"config": {
"bin-dir": "bin"
Expand Down

0 comments on commit 8c4cfb3

Please sign in to comment.