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

Twig deprecation notice #336

Merged
merged 1 commit into from
May 19, 2019
Merged

Twig deprecation notice #336

merged 1 commit into from
May 19, 2019

Conversation

emulienfou
Copy link

@emulienfou emulienfou commented May 17, 2019

Subject

Fixing Twig deprecation notice in Symfony 4

Changelog

### Fixed
* deprecation notice about using namespaced classes from `\Twig\`

kunicmarko20
kunicmarko20 previously approved these changes May 17, 2019
@greg0ire
Copy link
Contributor

Please associate your email address with your Github account, or change the email in your commits to an address already associated with it.

@greg0ire
Copy link
Contributor

greg0ire commented May 17, 2019

Please kindly squash your commits together. If you don't, we'll try to remember to do it for you but it's best if you save us this trouble.

How to do that?

  1. git rebase -i origin/2.x, assuming origin is a git remote that points to this repository, and not your fork. If you're not sure what your remotes are, run git remote -vvv, there should be your fork and the holy/reference/base/origin/whatever-you-call-it repository.
  2. A window will show up with many lines, replace pick with fixup on every line but the first one
  3. Close your editor, git should do its magic, and you should end up with one commit
  4. Use git push --force to overwrite what you already push. Don't forget the --force option otherwise git will try to merge both things together.

@greg0ire
Copy link
Contributor

Blocked by #337

@greg0ire greg0ire closed this May 17, 2019
@greg0ire greg0ire reopened this May 17, 2019
@greg0ire
Copy link
Contributor

Closing and reopening is not enough apparently, please rebase.

OskarStark
OskarStark previously approved these changes May 18, 2019
Copy link
Member

@OskarStark OskarStark left a comment

Choose a reason for hiding this comment

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

Wound you mind check the other bundles for the same changes if you are on it? This would help us a lot 👍🏻😊

@emulienfou emulienfou dismissed stale reviews from OskarStark and kunicmarko20 via 5e08de7 May 18, 2019 20:43
@OskarStark OskarStark merged commit 940314e into sonata-project:2.x May 19, 2019
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