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

Conflict with twig/twig ^3.9.0 #575

Merged
merged 1 commit into from Apr 18, 2024
Merged

Conflict with twig/twig ^3.9.0 #575

merged 1 commit into from Apr 18, 2024

Conversation

fashxp
Copy link
Member

@fashxp fashxp commented Apr 18, 2024

@fashxp fashxp added the Bug label Apr 18, 2024
@fashxp fashxp added this to the 11.1.5 milestone Apr 18, 2024
@jdreesen
Copy link
Contributor

Why do you add the conflict here and not on pimcore/pimcore? That's the repo requiring rybakit/twig-deferred-extension which is incompatible.

@jdreesen
Copy link
Contributor

pimcore/pimcore#16958

@fashxp
Copy link
Member Author

fashxp commented Apr 18, 2024

@jdreesen At least up to now, I was thinking, if one doesn't use deferred blocks in the project, they still would be able to use the latest twig version?
We are still thinking of how we can tackle this in a generic way, and also waiting for a response form the rybakit guys.
So this is the quick solution, also to fix our demo. But in the end, the final solution has to be in pimcore/pimcore indeed.
Thx for the PR!

@jdreesen
Copy link
Contributor

I don't understand. Why does pimcore/pimcore then require rybakit/twig-deferred-extension if it doesn't use it?

@fashxp
Copy link
Member Author

fashxp commented Apr 18, 2024

I don't understand. Why does pimcore/pimcore then require rybakit/twig-deferred-extension if it doesn't use it?

a valid point, we need to check.

@blankse
Copy link
Contributor

blankse commented Apr 18, 2024

Comes from pimcore/pimcore@7591812. At that time the demo templates were in the pimcore/pimcore project. I think we can remove phive/twig-extensions-deferred from the core and only make it required here in the demo.

@kingjia90 kingjia90 merged commit 301992d into 11.1 Apr 18, 2024
4 checks passed
@kingjia90 kingjia90 deleted the fashxp-patch-1 branch April 18, 2024 11:02
@kingjia90
Copy link
Contributor

FYI Merging and tagging this for "hotfixing" purposes. We will definitely look into removing it from the core, but in there it is more "bureaucratic" (and taking longer time) to be officially removing it (you know, maybe a minor release,changelog,deprecations,bc-breaks etc..)

@blankse
Copy link
Contributor

blankse commented Apr 19, 2024

@kingjia90 I created a PR to remve it from core:
pimcore/pimcore#16966

I also created PRs to add it here to demo and also to customer-data-framework and ecommerce-framework because there are also deferred twig blocks. There I also added the conflict to twig ^3.9.0:

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.

None yet

4 participants