Skip to content

Commit

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

* Applied fixes from FlintCI (#220)
  • Loading branch information
SonataCI authored and jordisala1991 committed Jan 21, 2018
1 parent cde4613 commit 8337031
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 12 deletions.
1 change: 1 addition & 0 deletions .flintci.yml
@@ -1,3 +1,4 @@
services:
composernormalize: true
phpcsfixer: true
yamllint: true
31 changes: 19 additions & 12 deletions composer.json
Expand Up @@ -2,7 +2,10 @@
"name": "sonata-project/translation-bundle",
"type": "symfony-bundle",
"description": "SonataTranslationBundle",
"keywords": ["translation", "i18n"],
"keywords": [
"translation",
"i18n"
],
"homepage": "http://sonata-project.org/bundles/translation",
"license": "MIT",
"authors": [
Expand All @@ -29,6 +32,11 @@
"symfony/options-resolver": "^2.8 || ^3.2 || ^4.0",
"twig/twig": "^1.35 || ^2.4"
},
"conflict": {
"doctrine/phpcr-odm": ">=3.0",
"knplabs/doctrine-behaviors": "<1.0 || >=2.0",
"stof/doctrine-extensions-bundle": "<1.1 || >=2.0"
},
"require-dev": {
"doctrine/orm": "^2.5",
"knplabs/doctrine-behaviors": "^1.4",
Expand All @@ -44,23 +52,22 @@
"sonata-project/doctrine-orm-admin-bundle": "if you translate orm entities and search on translated fields",
"stof/doctrine-extensions-bundle": "if you translate orm entities with the gedmo extensions"
},
"conflict": {
"doctrine/phpcr-odm": ">=3.0",
"knplabs/doctrine-behaviors": "<1.0 || >=2.0",
"stof/doctrine-extensions-bundle": "<1.1 || >=2.0"
},
"autoload": {
"psr-4": { "Sonata\\TranslationBundle\\": "src/" }
},
"autoload-dev": {
"psr-4": { "Sonata\\TranslationBundle\\Tests\\": "tests/" }
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
},
"autoload": {
"psr-4": {
"Sonata\\TranslationBundle\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"Sonata\\TranslationBundle\\Tests\\": "tests/"
}
}
}

0 comments on commit 8337031

Please sign in to comment.