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

Conflict with Twig >= 3.9.0 #16958

Merged
merged 1 commit into from Apr 22, 2024
Merged

Conflict with Twig >= 3.9.0 #16958

merged 1 commit into from Apr 22, 2024

Conversation

jdreesen
Copy link
Contributor

Changes in this pull request

Conflict with Twig >=3.9.0 because rybakit/twig-deferred-extension is incompatible with it.

Additional info

See: rybakit/twig-deferred-extension#20

@github-actions GitHub Actions
Copy link

Review Checklist

  • Target branch (11.2 for bug fixes, others 11.x)
  • Tests (if it's testable code, there should be a test for it - get help)
  • Docs (every functionality needs to be documented, see here)
  • Migration incl. install.sql (e.g. if the database schema changes, ...)
  • Upgrade notes (deprecations, important information, migration hints, ...)
  • Label
  • Milestone

@jdreesen jdreesen mentioned this pull request Apr 18, 2024
Merged
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Apr 18, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
2.7% Duplication on New Code

See analysis details on SonarCloud

@blankse blankse mentioned this pull request Apr 19, 2024
Open
@jdreesen jdreesen mentioned this pull request Apr 22, 2024
Open
@fashxp fashxp added this to the 11.2.3 milestone Apr 22, 2024
@fashxp fashxp added the Bug label Apr 22, 2024
@fashxp fashxp self-assigned this Apr 22, 2024
@fashxp
Copy link
Member

fashxp commented Apr 22, 2024 •
edited

there are also other challenges like #16973 and eventually others (like manual mode in pimcore document blocks?)

so for now we have to conflict here, and sort things out step by step.

@fashxp fashxp merged commit a44e05b into pimcore:11.x Apr 22, 2024
19 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Apr 22, 2024
@jdreesen jdreesen deleted the patch-2 branch April 22, 2024 16:34
@fashxp fashxp modified the milestones: 11.2.3, 11.3.0 Apr 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@fashxp fashxp

Labels
Bug Pimcore:ToDo
Projects
None yet
Milestone
11.3.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jdreesen @fashxp @wisconaut