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.

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

Fix conflict with class names #103

Merged
merged 1 commit into from
Aug 9, 2020
Merged

Conversation

franmomu
Copy link
Member

@franmomu franmomu commented Aug 9, 2020

Subject

There is a conflict with the class names.

Ref: sonata-project/SonataAdminBundle#6264

I am targeting this branch, because this is BC.

Changelog

### Fixed
- Fixed conflict with class names.

@franmomu franmomu added the patch label Aug 9, 2020
OskarStark
OskarStark previously approved these changes Aug 9, 2020
phansys
phansys previously approved these changes Aug 9, 2020
Copy link
Member

@phansys phansys left a comment

Choose a reason for hiding this comment

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

My bad!

I'd use ForwardCompatibleSonataTwigBundle instead, since "Symfony" is not bringing anything related to the purpose of the alias, but not really a blocker.

@phansys
Copy link
Member

phansys commented Aug 9, 2020

In order to fix the build, could also please update the imported class here?

use Sonata\Doctrine\Bridge\Symfony\Bundle\SonataDoctrineBundle;

@phansys phansys merged commit 1b2c249 into sonata-project:1.x Aug 9, 2020
@phansys
Copy link
Member

phansys commented Aug 9, 2020

Thank you @franmomu!

@franmomu franmomu deleted the fix_alias branch August 9, 2020 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants