-
Notifications
You must be signed in to change notification settings - Fork 155
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.
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
Adding support for Symfony 7 #863
Merged
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
85f4576
Move fos rest, jms serializer and hateoas on dev requirements
loic425 2b7ff42
Add tests for compiler passes
loic425 da7871f
Rename compiler passes
loic425 4dfc684
Allow SF7 on dependencies
loic425 d29e5fe
SF7 Fix the sf7 build
loic425 6ac896f
Bump symfony-dependency-injection-test
loic425 9ec1840
[SF7] Bump grid version
loic425 9f47ea9
[SF7] Bump Doctrine event manager version
loic425 c7c6a49
[SF7] Add removed symfony container aware trait
loic425 5a524b3
[SF7] Remove enable authenticator manager option on test application
loic425 a81388b
Upgrade winzou on dev branch
loic425 3c3d761
[SF7] Remove hateoas on Symfony 7
loic425 7d8b62e
[SF7] Fix resource loader
loic425 cffcc4a
Use abstract loader from Symfony
loic425 34bfd2f
Fix analysis errors
loic425 8beb5e5
Fix PHPStan errors
loic425 fd5ca0e
Add suggestion from code review
loic425 6de5b05
[SF7] Fix phpspec tests
loic425 66338cf
[SF7] Fix PHPUnit tests
loic425 15d8cc4
[SF7] Bump Winzou state machine version
loic425 dc9daca
Fix target entities resolving with Symfony 7
loic425 d12b302
Fix Psalm error
loic425 5b8a233
Fix coding standard
loic425 c3ff04d
Small fix
loic425 d622fa2
Remove experimental on CI build & bump php version on component
loic425 ae24d74
Fix coding standard and add conflict explanation
loic425 d15296e
Test CI
loic425 7371171
Fix ORM translatable listener to support SF7
loic425 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -30,27 +30,27 @@ | |||||
"doctrine/annotations": "^2.0", | ||||||
"doctrine/collections": "^1.8 || ^2.0", | ||||||
"doctrine/doctrine-bundle": "^2.0", | ||||||
"doctrine/event-manager": "^1.1", | ||||||
"doctrine/event-manager": "^1.1 || ^2.0", | ||||||
"doctrine/inflector": "^1.4 || ^2.0", | ||||||
"doctrine/persistence": "^2.0 || ^3.0", | ||||||
"gedmo/doctrine-extensions": "^2.4.12 || ^3.0", | ||||||
"sylius/registry": "^1.2", | ||||||
"symfony/config": "^5.4 || ^6.4", | ||||||
"symfony/config": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/deprecation-contracts": "^2.1 || ^3.0", | ||||||
"symfony/expression-language": "^5.4 || ^6.4", | ||||||
"symfony/form": "^5.4 || ^6.4", | ||||||
"symfony/framework-bundle": "^5.4 || ^6.4", | ||||||
"symfony/http-foundation": "^5.4 || ^6.4", | ||||||
"symfony/intl": "^5.4 || ^6.4", | ||||||
"symfony/security-core": "^5.4 || ^6.4", | ||||||
"symfony/security-csrf": "^5.4 || ^6.4", | ||||||
"symfony/routing": "^5.4 || ^6.4", | ||||||
"symfony/translation": "^5.4 || ^6.4", | ||||||
"symfony/twig-bundle": "^5.4 || ^6.4", | ||||||
"symfony/validator": "^5.4 || ^6.4", | ||||||
"symfony/yaml": "^5.4 || ^6.4", | ||||||
"symfony/expression-language": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/form": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/http-foundation": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/intl": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/security-core": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/security-csrf": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/routing": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/translation": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/validator": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/yaml": "^5.4 || ^6.4 || ^7.0", | ||||||
"webmozart/assert": "^1.8", | ||||||
"winzou/state-machine-bundle": "^0.6", | ||||||
"winzou/state-machine-bundle": "^0.6.2", | ||||||
"willdurand/negotiation": "^3.1" | ||||||
}, | ||||||
"replace": { | ||||||
|
@@ -61,7 +61,7 @@ | |||||
"friendsofsymfony/rest-bundle": "^3.0", | ||||||
"jms/serializer-bundle": "^3.5 || ^4.0 || ^5.0", | ||||||
"lchrusciel/api-test-case": "^5.0", | ||||||
"matthiasnoback/symfony-dependency-injection-test": "^4.2.1", | ||||||
"matthiasnoback/symfony-dependency-injection-test": "^4.2.1 || ^5.1", | ||||||
"pagerfanta/pagerfanta": "^3.7 || ^4.0", | ||||||
"pamil/phpspec-skip-example-extension": "^4.2", | ||||||
"phpspec/phpspec": "^7.3", | ||||||
|
@@ -70,26 +70,27 @@ | |||||
"phpstan/phpstan-phpunit": "^1.1", | ||||||
"phpstan/phpstan-webmozart-assert": "^1.2", | ||||||
"phpunit/phpunit": "^9.5", | ||||||
"rector/rector": "^0.18.2", | ||||||
"sylius-labs/coding-standard": "^4.0", | ||||||
"sylius/grid-bundle": "^1.7 || v1.12.0-ALPHA.1", | ||||||
"symfony/console": "^5.4 || ^6.4", | ||||||
"symfony/dependency-injection": "^5.4 || ^6.4", | ||||||
"symfony/dotenv": "^5.4 || ^6.4", | ||||||
"symfony/stopwatch": "^5.4 || ^6.4", | ||||||
"symfony/uid": "^5.4 || ^6.4", | ||||||
"symfony/workflow": "^5.4 || ^6.4", | ||||||
"sylius/grid-bundle": "^1.7 || dev-symfony-7", | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
"symfony/console": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/dotenv": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/stopwatch": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/uid": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/workflow": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/messenger": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/serializer": "^5.4 || ^6.4 || ^7.0", | ||||||
"symfony/security-bundle": "^5.4 || ^6.4 || ^7.0", | ||||||
"twig/twig": "^2.12 || ^3.0", | ||||||
"vimeo/psalm": "^5.20", | ||||||
"rector/rector": "^0.18.2", | ||||||
"symfony/messenger": "^5.4 || ^6.4", | ||||||
"symfony/serializer": "^5.4 || ^6.4", | ||||||
"symfony/security-bundle": "^5.4 || ^6.4", | ||||||
"willdurand/hateoas-bundle": "^2.0" | ||||||
}, | ||||||
"conflict": { | ||||||
"friendsofsymfony/rest-bundle": "<3.0", | ||||||
"jms/serializer-bundle": "<3.5", | ||||||
"willdurand/hateoas-bundle": "<2.0" | ||||||
"willdurand/hateoas-bundle": "<2.0 || ^2.6" | ||||||
GSadee marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||
}, | ||||||
"suggest": { | ||||||
"doctrine/orm": "^2.5", | ||||||
|
@@ -101,6 +102,11 @@ | |||||
"dealerdirect/phpcodesniffer-composer-installer": false | ||||||
} | ||||||
}, | ||||||
"extra": { | ||||||
"symfony": { | ||||||
"require": "^6.4" | ||||||
} | ||||||
}, | ||||||
"autoload": { | ||||||
"psr-4": { | ||||||
"Sylius\\Bundle\\ResourceBundle\\": "src/Bundle/", | ||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Sylius package. | ||
* | ||
* (c) Sylius Sp. z o.o. | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
declare(strict_types=1); | ||
|
||
namespace Sylius\Bundle\ResourceBundle\Controller; | ||
|
||
use Symfony\Component\DependencyInjection\ContainerInterface; | ||
|
||
/** | ||
* Copied from Symfony to keep using ResourceController as this trait has been removed in Symfony 7. | ||
* Do not use this trait on your projects, use dependency injection instead. | ||
* | ||
* @see https://github.com/symfony/symfony/blob/6.4/src/Symfony/Component/DependencyInjection/ContainerAwareTrait.php | ||
* | ||
* @internal | ||
*/ | ||
trait ContainerAwareTrait | ||
{ | ||
protected ?ContainerInterface $container = null; | ||
|
||
public function setContainer(?ContainerInterface $container = null): void | ||
{ | ||
$this->container = $container; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this package still a problem? The newest version supports SF7 if I see correctly.
Ref.: https://packagist.org/packages/willdurand/hateoas-bundle#2.6.0
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, there is an issue => willdurand/BazingaHateoasBundle#108