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

[make:*] add single_text widget for all date types #1393

Merged
merged 2 commits into from
Feb 27, 2024

Conversation

tacman
Copy link
Contributor

@tacman tacman commented Nov 7, 2023

Because there are many date types, I used to the helper to get the mapping and checked for those.

Fixes #1392

@jrushlow jrushlow added the Feature New Feature label Feb 20, 2024
Copy link
Collaborator

@jrushlow jrushlow left a comment

Choose a reason for hiding this comment

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

This looks good @tacman! Thank you.. Can you rebase this please and we'll get it merged in.

@jrushlow jrushlow added the Status: Waiting Feedback Needs feedback from the author label Feb 20, 2024
@tacman
Copy link
Contributor Author

tacman commented Feb 20, 2024

A bit embarrassing, but I don't know how to do a rebase. What do I need to do?

@jrushlow
Copy link
Collaborator

jrushlow commented Feb 20, 2024

No worries.. You should see me hunt for my post its when trying to remember how to add commits to someone else's pr

Assuming locally your remotes look something like:

$>  git remote -v
origin      jrushlow/maker-bundle (fetch)
origin	jrushlow/maker-bundle (push)
upstream	symfony/maker-bundle.git (fetch)
upstream	symfony/maker-bundle.git (push)
  1. git checkout -b feature/something main
  2. do some work - add a few commits - fix a few tests....
  3. git fetch upstream - the grabs all of the changes / releases / etc from symfony/maker-bundle
  4. git rebase upstream/main - this tells git to rebase any changes onto your feature/something branch from the symfony/maker-bundle main branch.

You may encounter an error or 2 that say hey! you need to fix a conflict. If you're using PHPStorm - i recommend fixing them in there. Otherwise you'll be diving into diff's that were generated by git in the files it mentions in the output.

After you resolve any conflicts -> git rebase --continue it will eventually tell you something like fatal: No rebase in progress? That means you're good to go.

  1. git push odds are this will fail if you have actually rebased any changes.. you'll need to use git push --force.

double check the git log before adding the --force flag.. for the most part in a fork, this won't cause alot of headaches if you accidentally erase history on your pr.. but imagine if you did that to something like tacman/super-important-project-repo on the main branch.... ouch!

git rebase --abort is your friend if you mess something up and are unsure of how to fix it...

Further reading: https://symfony.com/doc/current/contributing/code/pull_requests.html#work-on-your-pull-request

@jrushlow
Copy link
Collaborator

jrushlow commented Feb 20, 2024

As a side note for anyone that stumble on this.. never do a rebase on a "public" branch that others are working off of... e.g. some-repo's main or v1.x branch unless you know exactly what you're doing... Reason being is if someone else has that code checked out -> creates a pr / makes a commit -> tries to merge -> git will blow up and the world will end... atleast thats how it will feel when trying to resolve the merge conflicts...

Only rebase on code / branches you own and not code that someone else could be using... Git rebase essentially changes history on the branch you're rebasing... thats not always good...

@jrushlow jrushlow changed the title add single_text widget for all date types [make:*] add single_text widget for all date types Feb 27, 2024
@jrushlow jrushlow added Status: Reviewed Has been reviewed by a maintainer and removed Status: Waiting Feedback Needs feedback from the author labels Feb 27, 2024
@jrushlow jrushlow merged commit b0d2d5d into symfony:main Feb 27, 2024
6 checks passed
@jrushlow jrushlow mentioned this pull request Mar 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature New Feature Status: Reviewed Has been reviewed by a maintainer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

make:crud: not setting the "widget" option of form type "date" is deprecated
2 participants