Skip to content
This repository has been archived by the owner on Sep 16, 2021. It is now read-only.

Commit

Permalink
Master dev kit - Prepare Release (#290)
Browse files Browse the repository at this point in the history
* DevKit updates

* DevKit updates

* DevKit updates

* increase testing version

* use cache-bundle version 3.0

* use cache-bundle ind 2.4 again and conflict lower component versions

* fix phpcr-bundle version constraint
  • Loading branch information
ElectricMaxxx committed Aug 18, 2018
1 parent b582354 commit 8bc1b9d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Expand Up @@ -37,13 +37,13 @@ env:
matrix:
include:
- php: 7.2
env: STABILITY=dev SYMFONY_VERSION=4.0.*
env: SYMFONY_VERSION=4.0.*
- php: 7.1
env: STABILITY=dev COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
- php: 7.2
env: STABILITY=dev SYMFONY_VERSION=3.3.*
env: SYMFONY_VERSION=3.3.*
- php: 7.2
env: STABILITY=dev SYMFONY_VERSION=3.4.*
env: SYMFONY_VERSION=3.4.*
- env: TEST_INSTALLATION=true
fast_finish: true
allow_failures:
Expand Down
13 changes: 8 additions & 5 deletions composer.json
Expand Up @@ -18,18 +18,18 @@
"require": {
"php": "^7.1",
"symfony/framework-bundle": "^2.8 || ^3.3 || ^4.0",
"doctrine/phpcr-bundle": "^1.4|^2.0",
"doctrine/phpcr-odm": "^1.4.2|^2.0",
"doctrine/phpcr-bundle": "^1.3 || ^2.0",
"doctrine/phpcr-odm": "^1.4.2 || ^2.0",
"sonata-project/block-bundle": "^3.11",
"symfony-cmf/core-bundle": "^2.0"
},
"require-dev": {
"symfony-cmf/testing": "^2.1",
"symfony-cmf/testing": "^2.1.8",
"symfony-cmf/menu-bundle": "^2.1",
"symfony/phpunit-bridge": "^3.3 || ^4.0",
"sonata-project/cache-bundle": "^2.5",
"sonata-project/cache-bundle": "^2.4",
"sonata-project/core-bundle": "^3.0",
"twig/twig": "^1.14.2|^2.0",
"twig/twig": "^1.14.2 || ^2.0",
"symfony/security-bundle": "^2.8 || ^3.3 || ^4.0",
"symfony/twig-bundle": "^2.8 || ^3.3 || ^4.0",
"symfony/asset": "^2.8 || ^3.3 || ^4.0",
Expand All @@ -53,5 +53,8 @@
"branch-alias": {
"dev-master": "2.1-dev"
}
},
"conflict": {
"sonata/cache": "<1.1.1"
}
}

0 comments on commit 8bc1b9d

Please sign in to comment.