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

Fix support for symfony 5.1 #334

Closed
wants to merge 3 commits into from
Closed

Fix support for symfony 5.1 #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bfa284
Fix support for symfony 5.1
Jun 13, 2020
f471592
Add conflicting dependencies
Jun 13, 2020
9bc2fe5
Add conflicting package to all affected packages
Jun 13, 2020
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
17 changes: 10 additions & 7 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
"php-jsonpointer/php-jsonpointer": "^3.0",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
"symfony/console": "^4.4 || 5.0.*",
"symfony/filesystem": "^4.4 || 5.0.*",
"symfony/options-resolver": "^4.4 || 5.0.*",
"symfony/console": "^4.4 || ^5.0",
"symfony/filesystem": "^4.4 || ^5.0",
"symfony/options-resolver": "^4.4 || ^5.0",
"symfony/property-info": "~5.1",
"symfony/serializer": "^4.4 || 5.0.*",
"symfony/serializer": "^4.4 || ^5.0",
"symfony/string": "^5.0",
"symfony/translation-contracts": "^2.0",
"symfony/var-dumper": "^4.4 || 5.0.*",
"symfony/yaml": "^4.4 || 5.0.*"
"symfony/var-dumper": "^4.4 || ^5.0",
"symfony/yaml": "^4.4 || ^5.0"
},
"replace": {
"jane-php/automapper": "self.version",
Expand All @@ -50,11 +50,14 @@
"friendsofphp/php-cs-fixer": "2.16.3",
"phpbench/phpbench": "@dev",
"phpunit/phpunit": "^8.0",
"symfony/framework-bundle": "^4.4 || 5.0.*"
"symfony/framework-bundle": "^4.4 || ^5.0"
},
"suggest": {
"friendsofphp/php-cs-fixer": "Allow to automatically fix cs on generated code for better visualisation"
},
"conflict": {
"symfony/framework-bundle": "5.1.0"
},
"extra": {
"branch-alias": {
"dev-master": "6-dev"
Expand Down
2 changes: 1 addition & 1 deletion src/AutoMapper/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"require-dev": {
"doctrine/annotations": "~1.0",
"phpdocumentor/reflection-docblock": "^3.0 || ^4.0",
"symfony/serializer": "^4.2 || 5.0.*"
"symfony/serializer": "^4.2 || ^5.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This composer file should also conflict framework-bundle 5.1.0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my bad, I'll add it to every package, that requires sf serializer

},
"suggest": {
"symfony/serializer": "Allow to bridge mappers to normalizer and denormalizer"
Expand Down
17 changes: 10 additions & 7 deletions src/JsonSchema/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,23 @@
"doctrine/inflector": "^1.4",
"jane-php/json-schema-runtime": "^6.0",
"nikic/php-parser": "^4.0",
"symfony/console": "^4.4 || 5.0.*",
"symfony/filesystem": "^4.4 || 5.0.*",
"symfony/options-resolver": "^4.4 || 5.0.*",
"symfony/serializer": "^4.4 || 5.0.*",
"symfony/var-dumper": "^4.4 || 5.0.*",
"symfony/yaml": "^4.4 || 5.0.*"
"symfony/console": "^4.4 || ^5.0",
"symfony/filesystem": "^4.4 || ^5.0",
"symfony/options-resolver": "^4.4 || ^5.0",
"symfony/serializer": "^4.4 || ^5.0",
"symfony/var-dumper": "^4.4 || ^5.0",
"symfony/yaml": "^4.4 || ^5.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0",
"symfony/finder": "^4.4 || 5.0.*"
"symfony/finder": "^4.4 || ^5.0"
},
"suggest": {
"friendsofphp/php-cs-fixer": "Allow to automatically fix cs on generated code for better visualisation"
},
"conflict": {
"symfony/framework-bundle": "5.1.0"
},
"extra": {
"branch-alias": {
"dev-master": "6-dev"
Expand Down
7 changes: 5 additions & 2 deletions src/JsonSchemaRuntime/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,15 @@
"ext-json": "*",
"league/uri": "^6.0",
"php-jsonpointer/php-jsonpointer": "^3.0",
"symfony/serializer": "^4.4 || 5.0.*",
"symfony/yaml": "^4.4 || 5.0.*"
"symfony/serializer": "^4.4 || ^5.0",
"symfony/yaml": "^4.4 || ^5.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0"
},
"conflict": {
"symfony/framework-bundle": "5.1.0"
},
"extra": {
"branch-alias": {
"dev-master": "6-dev"
Expand Down
9 changes: 6 additions & 3 deletions src/OpenApi2/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,19 @@
"jane-php/json-schema": "^6.0",
"jane-php/open-api-common": "^6.0",
"nikic/php-parser": "^4.0",
"symfony/serializer": "^4.4 || 5.0.*",
"symfony/yaml": "^4.4 || 5.0.*"
"symfony/serializer": "^4.4 || ^5.0",
"symfony/yaml": "^4.4 || ^5.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0",
"symfony/finder": "^4.4 || 5.0.*"
"symfony/finder": "^4.4 || ^5.0"
},
"suggest": {
"friendsofphp/php-cs-fixer": "To have a nice formatting of the generated files"
},
"conflict": {
"symfony/framework-bundle": "5.1.0"
},
"extra": {
"branch-alias": {
"dev-master": "6-dev"
Expand Down
9 changes: 6 additions & 3 deletions src/OpenApi3/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,19 @@
"jane-php/json-schema": "^6.0",
"jane-php/open-api-common": "^6.0",
"nikic/php-parser": "^4.0",
"symfony/serializer": "^4.4 || 5.0.*",
"symfony/yaml": "^4.4 || 5.0.*"
"symfony/serializer": "^4.4 || ^5.0",
"symfony/yaml": "^4.4 || ^5.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0",
"symfony/finder": "^4.4 || 5.0.*"
"symfony/finder": "^4.4 || ^5.0"
},
"suggest": {
"friendsofphp/php-cs-fixer": "To have a nice formatting of the generated files"
},
"conflict": {
"symfony/framework-bundle": "5.1.0"
},
"extra": {
"branch-alias": {
"dev-master": "6-dev"
Expand Down
6 changes: 3 additions & 3 deletions src/OpenApiCommon/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
"ext-json": "*",
"jane-php/json-schema": "^6.0",
"jane-php/open-api-runtime": "^6.0",
"symfony/console": "^4.4 || 5.0.*",
"symfony/filesystem": "^4.4 || 5.0.*",
"symfony/console": "^4.4 || ^5.0",
"symfony/filesystem": "^4.4 || ^5.0",
"symfony/string": "^5.0",
"symfony/translation-contracts": "^2.0",
"symfony/var-dumper": "^4.4 || 5.0.*"
"symfony/var-dumper": "^4.4 || ^5.0"
},
"extra": {
"branch-alias": {
Expand Down
4 changes: 2 additions & 2 deletions src/OpenApiRuntime/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
"php-http/multipart-stream-builder": "^1.0",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
"symfony/options-resolver": "^4.4 || 5.0.*",
"symfony/options-resolver": "^4.4 || ^5.0",
"jane-php/json-schema-runtime": "^6.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0",
"symfony/serializer": "^4.4 || 5.0.*"
"symfony/serializer": "^4.4 || ^5.0"
},
"extra": {
"branch-alias": {
Expand Down