Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[FrameworkBundle] avoid issue with doctrine/annotations 2.0.0 #48868

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

Closed
wants to merge 1 commit into from
Closed

[FrameworkBundle] avoid issue with doctrine/annotations 2.0.0 #48868

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Symfony\Bundle\FrameworkBundle\Controller;

use Doctrine\Common\Annotations\Annotation\IgnoreAnnotation;
use Doctrine\Persistence\ManagerRegistry;
use Psr\Container\ContainerInterface;
use Psr\Link\LinkInterface;
Expand Down Expand Up @@ -53,6 +54,10 @@
* Provides shortcuts for HTTP-related features in controllers.
*
* @author Fabien Potencier <[email protected]>
*
* The following annotation is necessary for compatibility with doctrine/annotations:^2.
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we need that comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the only instance of @IgnoreAnnotation in the codebase, so I added that for future developers which may be surprised, and removing it won't break the tests so it may be removed by mistake.

Copy link
Member

Choose a reason for hiding this comment

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

please see my comment below to actually investigate the root cause of why this fails with doctrine/annotations 2.0 but not with doctrine/annotations 1.14 as this either indicates an undocumented BC break or a bug.

*
* @IgnoreAnnotation("required")
*/
abstract class AbstractController implements ServiceSubscriberInterface
{
Expand Down Expand Up @@ -411,7 +416,7 @@ protected function getUser()
return null;
}

// @deprecated since 5.4, $user will always be a UserInterface instance
// @deprecated since Symfony 5.4, $user will always be a UserInterface instance
if (!\is_object($user = $token->getUser())) {
// e.g. anonymous authentication
return null;
Expand Down