Skip to content

Commit

Permalink
DevKit updates for 1.x branch (#379)
Browse files Browse the repository at this point in the history
* DevKit updates

* Normalize

Co-authored-by: Vincent Langlet <vincentlanglet@hotmail.fr>
  • Loading branch information
SonataCI and VincentLanglet committed Dec 5, 2021
1 parent 256a3e7 commit ea38089
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 17 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
Expand Up @@ -68,6 +68,7 @@ jobs:
run: composer require ${{ matrix.variant }} --no-update

- name: Allow unstable dependencies
if: matrix.symfony-require == '6.0.*'
run: composer config minimum-stability dev

- name: Install Composer dependencies (${{ matrix.dependencies }})
Expand Down
34 changes: 17 additions & 17 deletions composer.json
@@ -1,14 +1,13 @@
{
"name": "sonata-project/doctrine-extensions",
"type": "library",
"description": "Doctrine2 behavioral extensions",
"license": "MIT",
"type": "library",
"keywords": [
"json",
"doctrine2",
"doctrine"
],
"homepage": "https://github.com/sonata-project/sonata-doctrine-extensions",
"license": "MIT",
"authors": [
{
"name": "Thomas Rabaix",
Expand All @@ -20,17 +19,12 @@
"homepage": "https://github.com/sonata-project/sonata-doctrine-extensions/contributors"
}
],
"homepage": "https://github.com/sonata-project/sonata-doctrine-extensions",
"require": {
"php": "^7.3 || ^8.0",
"doctrine/dbal": "^2.13 || ^3.1",
"doctrine/persistence": "^1.3.6 || ^2.0"
},
"conflict": {
"doctrine/doctrine-bundle": "<2.0",
"doctrine/mongodb-odm": "<2.0",
"doctrine/orm": "<2.5",
"doctrine/phpcr-odm": "<1.5.2"
},
"require-dev": {
"doctrine/common": "^2.7 || ^3.0",
"doctrine/doctrine-bundle": "^2.0",
Expand All @@ -52,19 +46,17 @@
"symfony/phpunit-bridge": "^6.0",
"vimeo/psalm": "^4.1"
},
"conflict": {
"doctrine/doctrine-bundle": "<2.0",
"doctrine/mongodb-odm": "<2.0",
"doctrine/orm": "<2.5",
"doctrine/phpcr-odm": "<1.5.2"
},
"suggest": {
"doctrine/orm": "If you use doctrine orm",
"doctrine/phpcr-odm": "If you use doctrine phpcr",
"symfony/framework-bundle": "If you want to use symfony"
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Sonata\\Doctrine\\": "src/",
Expand All @@ -75,5 +67,13 @@
"psr-4": {
"Sonata\\Doctrine\\Tests\\": "tests/"
}
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
}
}

0 comments on commit ea38089

Please sign in to comment.