Skip to content

Commit

Permalink
Merge pull request #1338 from dpfaffenbauer/pimcore/6.6
Browse files Browse the repository at this point in the history
[Pimcore] require min 6.6
  • Loading branch information
dpfaffenbauer authored Apr 2, 2020
2 parents 06c2825 + 1456789 commit 099a3da
Show file tree
Hide file tree
Showing 25 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/behat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
matrix:
php: [7.2, 7.3, 7.4]
symfony: [~3.4, ^4.0]
pimcore: [~6.5.0, dev-master]
pimcore: [~6.6.0, dev-master]

steps:
- uses: actions/checkout@v2
Expand Down
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
global:
- PIMCORE_ENVIRONMENT=test
- PIMCORE_TEST_DB_DSN="mysql://root@localhost/coreshop_test"
- PIMCORE_VERSION="^6.5"
- PIMCORE_VERSION="^6.6"
- CORESHOP_TEST=1
- CORESHOP_SUITE=application
- SYMFONY_VERSION="^3.4"
Expand All @@ -27,24 +27,24 @@ matrix:
php: 7.2
env:
- CORESHOP_SUITE=stan
- PIMCORE_VERSION="~6.5.0"
- PIMCORE_VERSION="~6.6.0"

- sudo: required
php: 7.3
env:
- CORESHOP_SUITE=stan
- PIMCORE_VERSION="~6.5.0"
- PIMCORE_VERSION="~6.6.0"

- sudo: required
php: 7.2
env:
- PIMCORE_VERSION="~6.5.0"
- PIMCORE_VERSION="~6.6.0"
- SYMFONY_VERSION="^4.0"

- sudo: required
php: 7.3
env:
- PIMCORE_VERSION="~6.5.0"
- PIMCORE_VERSION="~6.6.0"
- SYMFONY_VERSION="^4.0"

- sudo: required
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"payum/payum-bundle": "^2.2",
"payum/sofort": "^1.4",
"php-http/guzzle6-adapter": "^2.0",
"pimcore/pimcore": "^6.5.3",
"pimcore/pimcore": "^6.6.0",
"rinvex/countries": "^6.0",
"stof/doctrine-extensions-bundle": "^1.2",
"webmozart/assert": "^1.2"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/AddressBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"php": "^7.2",
"coreshop/address": "^2.0",
"coreshop/resource-bundle": "^2.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/ConfigurationBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"php": "^7.2",
"coreshop/configuration": "^2.0",
"coreshop/resource-bundle": "^2.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/CoreBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"coreshop/core": "^2.0",
"fzaninotto/faker": "^1.6",
"rinvex/countries": "^5.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/CurrencyBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"php": "^7.2",
"coreshop/currency": "^2.0",
"coreshop/resource-bundle": "^2.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/CustomerBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"php": "^7.2",
"coreshop/customer": "^2.0",
"coreshop/resource-bundle": "^2.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/IndexBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"coreshop/registry": "^2.0",
"coreshop/resource-bundle": "^2.1",
"coreshop/menu-bundle": "^2.1",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"conflict": {
"dpfaffenbauer/process-manager": "<2.4"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/MenuBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"require": {
"php": "^7.2",
"pimcore/pimcore": "^6.5.3",
"pimcore/pimcore": "^6.6.0",
"knplabs/knp-menu-bundle": "^2.2.0"
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/MoneyBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"php": "^7.2",
"coreshop/currency": "^2.0",
"coreshop/pimcore-bundle": "^2.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/NotificationBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"coreshop/notification": "^2.0",
"coreshop/registry": "^2.0",
"coreshop/rule-bundle": "^2.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/OrderBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"coreshop/store-bundle": "^2.0",
"coreshop/money-bundle": "^2.0",
"coreshop/workflow-bundle": "^2.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/PaymentBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"coreshop/payment": "^2.0",
"coreshop/resource-bundle": "^2.0",
"coreshop/workflow-bundle": "^2.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/PayumBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"payum/sofort": "^1.4",
"payum/paypal-express-checkout-nvp": "^1.4",
"php-http/guzzle6-adapter": "^1.1",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/ProductBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"coreshop/rule-bundle": "^2.0",
"coreshop/resource-bundle": "^2.0",
"coreshop/money-bundle": "^2.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"coreshop/product-quantity-price-rules": "^2.1",
"coreshop/rule-bundle": "^2.1",
"coreshop/money-bundle": "^2.1",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/ResourceBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"symfony/validator": "^3.4 | ^4.0",
"symfony/yaml": "^3.4 | ^4.0",
"gedmo/doctrine-extensions": "^2.4.12",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/StoreBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"coreshop/currency-bundle": "^2.0",
"coreshop/theme-bundle": "^2.1",
"coreshop/store": "^2.1",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/ThemeBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"coreshop/registry": "^2.0",
"coreshop/pimcore-bundle": "^2.1",
"liip/theme-bundle": "^1.4",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/TrackingBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"php": "^7.2",
"coreshop/registry": "^2.0",
"coreshop/tracking": "^2.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/WorkflowBundle/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"symfony/config": "^3.4 | ^4.0",
"symfony/workflow": "~3.3|~4.0",
"symfony/yaml": "^3.4 | ^4.0",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Locale/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"require": {
"php": "^7.2",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Pimcore/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"require": {
"php": "^7.2",
"pimcore/pimcore": "^6.5.3"
"pimcore/pimcore": "^6.6.0"
},
"config": {
"bin-dir": "bin"
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Component/Resource/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"require": {
"php": "^7.2",
"doctrine/common": "^2.6",
"pimcore/pimcore": "^6.5.3",
"pimcore/pimcore": "^6.6.0",
"webmozart/assert": "^1.2"
},
"config": {
Expand Down

0 comments on commit 099a3da

Please sign in to comment.