Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DevKit updates for 2.x branch #496

Merged
merged 2 commits into from Dec 5, 2021
Merged

DevKit updates for 2.x branch #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5c428d
DevKit updates
SonataCI Dec 5, 2021
3c54648
Normalize
VincentLanglet Dec 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/test.yaml
View file
Open in desktop
Expand Up @@ -86,6 +86,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
26 changes: 13 additions & 13 deletions composer.json
View file
Open in desktop
@@ -1,16 +1,15 @@
{
"name": "sonata-project/intl-bundle",
"type": "symfony-bundle",
"description": "Symfony SonataIntlBundle",
"license": "MIT",
"type": "symfony-bundle",
"keywords": [
"sonata",
"intl",
"date",
"time",
"number"
],
"homepage": "https://docs.sonata-project.org/projects/SonataIntlBundle",
"license": "MIT",
"authors": [
{
"name": "Thomas Rabaix",
Expand All @@ -21,6 +20,7 @@
"homepage": "https://github.com/sonata-project/SonataIntlBundle/contributors"
}
],
"homepage": "https://docs.sonata-project.org/projects/SonataIntlBundle",
"require": {
"php": "^7.3 || ^8.0",
"symfony/config": "^4.4 || ^5.3 || ^6.0",
Expand All @@ -31,9 +31,6 @@
"symfony/templating": "^4.4 || ^5.3 || ^6.0",
"twig/twig": "^2.9 || ^3.0"
},
"conflict": {
"sonata-project/user-bundle": "<3.6"
},
"require-dev": {
"matthiasnoback/symfony-config-test": "^4.2",
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
Expand All @@ -49,13 +46,8 @@
"symfony/security-core": "^4.4.23 || ^5.3 || ^6.0",
"vimeo/psalm": "^4.7.2"
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
"conflict": {
"sonata-project/user-bundle": "<3.6"
},
"autoload": {
"psr-4": {
Expand All @@ -66,5 +58,13 @@
"psr-4": {
"Sonata\\IntlBundle\\Tests\\": "tests/"
}
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
}
}
}