Skip to content

Adding Entity attribute support #978

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

Merged
merged 1 commit into from
Sep 27, 2021

Conversation

weaverryan
Copy link
Member

Hi!

This is #920 cleaned up.

Somehow, in that PR, the commits got tanged. For example, some commits were done twice, like SimonMarx@d12c2f9 and SimonMarx@3848f4f - but the bigger problem is that some commits (like the 2nd listed) have one date on GitHub (e.g. Aug 12th) but another date when pulled down locally (July 4th). Whatever is causing this seems to also cause, during a rebase, for these commits to be rebased on reverse. In short, it was an odd mess.

To fix this, I've created a single commit with co-authors. I need to verify that this is ok with @SimonMarx and determine where these other two contributors came from :) (see #920 (comment))

Cheers!

Co-authored-by: Simon Marx <[email protected]>
Co-authored-by: Morgan ABRAHAM <[email protected]>
Co-authored-by: Adria Lopez <[email protected]>
Co-authored-by: Jesse Rushlow <[email protected]>

Co-authored-by: Simon Marx <[email protected]>
Co-authored-by: Morgan ABRAHAM <[email protected]>
Co-authored-by: Adria Lopez <[email protected]>
Co-authored-by: Jesse Rushlow <[email protected]>
@SimonMarx
Copy link

@weaverryan For what exactly do you need my "ok" 😄 ?

@weaverryan
Copy link
Member Author

Just wanted you to see that I squashed all your commits and set you as a co-author :). It was the best I could do to clean things up but still give credit to everyone.

@SimonMarx
Copy link

Whatever this means, im totally fine with it. Let's bring the feature out there, no matter what the git history says :) Hopefully my next PR won't make a mess which you have to cleanup ;/

@weaverryan weaverryan merged commit 3ca4dcc into symfony:main Sep 27, 2021
@weaverryan weaverryan deleted the entity-attribute-support branch September 27, 2021 14:05
@weaverryan
Copy link
Member Author

Thank you @SimonMarx, @Geekimo, @adlpz & @jrushlow for contributing to this!

@jrushlow jrushlow mentioned this pull request Sep 27, 2021
weaverryan added a commit that referenced this pull request Sep 27, 2021
This PR was merged into the 1.0-dev branch.

Discussion
----------

[release] prep 1.34.0

# Release
Hi Makers!

This release contains a few new features, fixes, and improvements under the hood! Most notably, this release introduces PHP Attribute support for `make:entity` including entities using API Platform, support for the new Symfony Password Hasher in `make:reset-password`, & `make:registration`, and implements stronger return types where possible.

Diff: v1.33.0...v1.34.0

Happy making!

# Changelog

## [v1.34.0](https://github.com/symfony/maker-bundle/releases/tag/v1.34.0)

*September 27th, 2021*

### Feature

- [#978](#978) - Adding Entity attribute support - *`@simonmarx`*, *`@geekimo`*, *`@adlpz`*, *`@weaverryan`*, *`@jrushlow`*
- [#970](#970) - make PhpCompatUtil::getPhpVersion() public - *`@nikophil`*
- [#968](#968) - [make:entity] APIP: use new attribute if exists - *`@nikophil`*
- [#963](#963) - add return types for symfony 6 - *`@jrushlow`*
- [#925](#925) - [templates] Add void return types - *`@seb`-jean*
- [#923](#923) - use password hasher for make:registration & make:reset-password, includes other improvements - *`@jrushlow`*

### Bug Fix

- [#974](#974) - Fix method call definition - *`@ajgarlag`*
- [#973](#973) - Fix we we typo - *`@karser`*
- [#933](#933) - [make:entity] Remove deprecated json_array type from available list types. - *`@bdaler`*
- [#930](#930) - Add all missed dependencies to make:reset-password - *`@upyx`*
- [#870](#870) - [make:crud] Fix templates path use in include - *`@leblanc`-simon*

Commits
-------

2ba83b3 [release] prep 1.34.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants