8000 Use createMock() and use import instead of FQCN by OskarStark · Pull Request #39941 · symfony/symfony · GitHub
[go: up one dir, main page]

Skip to content

Use createMock() and use import instead of FQCN #39941

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
Jan 27, 2021

Conversation

OskarStark
Copy link
Contributor
Q A
Branch? 4.4
Bug fix? no
New feature? no
Deprecations? no
Tickets ---
License MIT
Doc PR ---

@jderusse
Copy link
Member

For reference #20984

@OskarStark
Copy link
Contributor Author

I checked all files manually on Github:
CleanShot 2021-01-22 at 14 02 24

Lets see if the tests pass

@OskarStark OskarStark force-pushed the use-createMock-4.4 branch 3 times, most recently from d8f79cc to 3065ce8 Compare January 22, 2021 14:19
@OskarStark OskarStark changed the title Use createMock() Use createMock() and use import instead of FQCN Jan 22, 2021
@OskarStark
Copy link
Contributor Author

I am not done yet 😬

@nicolas-grekas
Copy link
Member

This is going to be fun to merge into 5.2 (I'd way after the last 5.1 before merging this if I were you).

May I suggest ignoring all conflicts when doing the merge?

@OskarStark
Copy link
Contributor Author

Well let's merge this when 5.1 is EOL and merge it direct into 5.2? Will try to upmerge it beforehand and see how many conflicts we have.

@OskarStark OskarStark force-pushed the use-createMock-4.4 branch 6 times, most recently from 393124f to 2111d02 Compare January 25, 2021 12:52
@OskarStark OskarStark force-pushed the use-createMock-4.4 branch 3 times, most recently from d334711 to 97bdc01 Compare January 25, 2021 13:46
@OskarStark OskarStark force-pushed the use-createMock-4.4 branch 2 times, most recently from 818f2d3 to aee7e8b Compare January 25, 2021 16:18
@OskarStark OskarStark force-pushed the use-createMock-4.4 branch 3 times, most recently from 5c462b8 to 1a68adf Compare January 27, 2021 08:12
@OskarStark
Copy link
Contributor Author

Fabbot failure false positive.

@nicolas-grekas feel free to merge this in 4.4 only, I will take care of a new PR against 5.2 then by handling the conflicts, fine?

@nicolas-grekas nicolas-grekas merged commit 22b1eb4 into symfony:4.4 Jan 27, 2021
@nicolas-grekas
Copy link
Member

Thank you @OskarStark
Now merged up to 5.x
I'd appreciate if you could help me fix tests before doing this work on 5.1+ :)

@OskarStark
Copy link
Contributor Author

Sure will have a look later 👍🏻

@OskarStark OskarStark deleted the use-createMock-4.4 branch June 23, 2025 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants
0