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

[TwigBundle] do not try to register incomplete definitions #20799

Merged
merged 1 commit into from Dec 17, 2016

Conversation

Projects
None yet
6 participants
@xabbuh
Member

xabbuh commented Dec 6, 2016

Q A
Branch? 2.7
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #20212
License MIT
Doc PR
@fabpot

This comment has been minimized.

Show comment
Hide comment
@fabpot

fabpot Dec 7, 2016

Member

When merging this PR in 3.2, we should add checks for each if with the new ClassExistenceResource resource.

Member

fabpot commented Dec 7, 2016

When merging this PR in 3.2, we should add checks for each if with the new ClassExistenceResource resource.

@nicolas-grekas nicolas-grekas added this to the 2.7 milestone Dec 7, 2016

@xabbuh

This comment has been minimized.

Show comment
Hide comment
@xabbuh
Member

xabbuh commented Dec 14, 2016

@stof

This comment has been minimized.

Show comment
Hide comment
@stof

stof Dec 15, 2016

Member

And regarding the extensions, we already have checks in a compiler pass. So I would rather fix them here if they are missing some condition rather than doing a second system in the DI extension itself.

Member

stof commented Dec 15, 2016

And regarding the extensions, we already have checks in a compiler pass. So I would rather fix them here if they are missing some condition rather than doing a second system in the DI extension itself.

@xabbuh

This comment has been minimized.

Show comment
Hide comment
@xabbuh

xabbuh Dec 15, 2016

Member

I also moved most of the clean up logic into the compiler passes except for the twig.translation.extractor service which didn't fit well in any of the existing passes.

Member

xabbuh commented Dec 15, 2016

I also moved most of the clean up logic into the compiler passes except for the twig.translation.extractor service which didn't fit well in any of the existing passes.

@HeahDude

This comment has been minimized.

Show comment
Hide comment
@HeahDude

HeahDude Dec 17, 2016

Member

This one should be good to merge now.

👍

Status: Reviewed

Member

HeahDude commented Dec 17, 2016

This one should be good to merge now.

👍

Status: Reviewed

@fabpot

This comment has been minimized.

Show comment
Hide comment
@fabpot

fabpot Dec 17, 2016

Member

Thank you @xabbuh.

Member

fabpot commented Dec 17, 2016

Thank you @xabbuh.

@fabpot fabpot merged commit 2c9dc66 into symfony:2.7 Dec 17, 2016

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
fabbot.io Your code looks good.
Details

fabpot added a commit that referenced this pull request Dec 17, 2016

bug #20799 [TwigBundle] do not try to register incomplete definitions…
… (xabbuh)

This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBundle] do not try to register incomplete definitions

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #20212
| License       | MIT
| Doc PR        |

Commits
-------

2c9dc66 do not try to register incomplete definitions

@xabbuh xabbuh deleted the xabbuh:issue-20212 branch Dec 17, 2016

fabpot added a commit that referenced this pull request Dec 17, 2016

minor #20974 [TwigBundle] do not remove the Twig ExceptionController …
…service (xabbuh)

This PR was merged into the 2.8 branch.

Discussion
----------

[TwigBundle] do not remove the Twig ExceptionController service

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | follow up of #20799

Commits
-------

c9e560f do not remove the Twig ExceptionController service

xabbuh added a commit to xabbuh/symfony that referenced this pull request Dec 19, 2016

nicolas-grekas added a commit that referenced this pull request Dec 19, 2016

minor #20992 [TwigBundle][#20799] fix merge (xabbuh)
This PR was merged into the 3.1 branch.

Discussion
----------

[TwigBundle][#20799] fix merge

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Commits
-------

98c835d [TwigBundle][#20799] fix merge

nicolas-grekas added a commit that referenced this pull request Dec 19, 2016

Merge branch '3.1' into 3.2
* 3.1:
  Fix merge
  [TwigBundle][#20799] fix merge

nicolas-grekas added a commit that referenced this pull request Dec 19, 2016

Merge branch '3.2'
* 3.2:
  Fix merge
  [TwigBundle][#20799] fix merge

fabpot added a commit that referenced this pull request Jan 8, 2017

bug #21205 [TwigBundle] fixed usage when Templating is not installed …
…(fabpot)

This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBundle] fixed usage when Templating is not installed

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | bug introduced in #20799
| License       | MIT
| Doc PR        | n/a

In #20799, the decoupling of the Templating definition means that the `twig.loader.filesystem` is not always defined, but used in Extension. So, this PR does the opposite as what was done before. Use `twig.loader.native_filesystem` by default and copy paths to `twig.loader.filesystem` when templating is used.

/cc @xabbuh

Commits
-------

6aa98d1 [TwigBundle] fixed usage when Templating is not installed

This was referenced Jan 12, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment