Skip to content

Commit

Permalink
Merge pull request #677 from doctrine/composer-cleanup
Browse files Browse the repository at this point in the history
cleanup composer.json, use RMT version that supports symfony 3
  • Loading branch information
dbu committed Dec 8, 2015
2 parents 922c239 + 35f9170 commit 0832243
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@
"prefer-stable": true,
"require": {
"php": "^5.3.9|~7.0",
"doctrine/common": "~2.4",
"doctrine/annotations": "~1.2",
"doctrine/data-fixtures": "~1.0",
"phpcr/phpcr": "~2.1.1",
"phpcr/phpcr-implementation": "~2.1.0",
"doctrine/common": "^2.4",
"doctrine/annotations": "^1.2",
"doctrine/data-fixtures": "^1.0",
"phpcr/phpcr": "^2.1.1",
"phpcr/phpcr-implementation": "^2.1.0",
"phpcr/phpcr-utils": "^1.2.8",
"doctrine/instantiator": "^1.0.1",
"symfony/console": "~2.3|~3.0"
"symfony/console": "^2.3|^3.0"
},
"require-dev": {
"symfony/yaml": "~2.3|~3.0",
"symfony/phpunit-bridge": "~2.7|~3.0",
"liip/rmt": "~1.1"
"symfony/yaml": "^2.3|^3.0",
"symfony/phpunit-bridge": "^2.7|^3.0",
"liip/rmt": "~1.2"
},
"suggest": {
"symfony/yaml": "~2.3|~3.0",
"symfony/yaml": "^2.3|^3.0",
"jackalope/jackalope-doctrine-dbal": "^1.1.5",
"jackalope/jackalope-jackrabbit": "~1.0"
"jackalope/jackalope-jackrabbit": "^1.0"
},
"conflict": {
"jackalope/jackalope-doctrine-dbal": "<1.1.5"
Expand Down

0 comments on commit 0832243

Please sign in to comment.