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

#48 merge release 3.5.0 into development branch for 4.0.x #56

Merged
merged 46 commits into from
Nov 30, 2020

Conversation

Ocramius
Copy link
Member

Fixes #48
Close #48

This is a full replacement for #48 which merges 3.5.0 into 4.0.x (complex conflicts occurring there)

michalbundyra and others added 30 commits December 10, 2019 18:21
Drop unused `use function strstr` in ClassGenerator
Signed-off-by: Michał Bundyra <contact@webimpress.com>
Signed-off-by: Michał Bundyra <contact@webimpress.com>
Signed-off-by: Michał Bundyra <contact@webimpress.com>
Signed-off-by: Michał Bundyra <contact@webimpress.com>
Signed-off-by: Geert Eltink <dev@elt.ink>
geerteltink and others added 16 commits September 11, 2020 15:16
Signed-off-by: Geert Eltink <dev@elt.ink>
Signed-off-by: Geert Eltink <dev@elt.ink>
Signed-off-by: Geert Eltink <dev@elt.ink>
PSR-12 in 4.3 "Properties and Constants" states that:
> Property names MUST NOT be prefixed with a single underscore to indicate
> protected or private visibility. That is, an underscore prefix explicitly
> has no meaning.
Signed-off-by: Jan Vernieuwe (PHPro) <jan.vernieuwe@phpro.be>
Signed-off-by: Filippo Tessarotto <zoeslam@gmail.com>
Signed-off-by: Filippo Tessarotto <zoeslam@gmail.com>
Signed-off-by: Filippo Tessarotto <zoeslam@gmail.com>
Signed-off-by: Filippo Tessarotto <zoeslam@gmail.com>
Signed-off-by: Filippo Tessarotto <zoeslam@gmail.com>
…PHP 8.0

Signed-off-by: Filippo Tessarotto <zoeslam@gmail.com>
Signed-off-by: Filippo Tessarotto <zoeslam@gmail.com>
Signed-off-by: Matthew Weier O'Phinney <matthew@weierophinney.net>
Updates the CHANGELOG.md to set the release date.
Updates the CHANGELOG.md file to add a changelog entry for a new 3.5.1 version.
@Ocramius Ocramius added this to the 4.0.0 milestone Nov 30, 2020
@Ocramius Ocramius self-assigned this Nov 30, 2020
@Ocramius
Copy link
Member Author

Travis decided to bail on me.

I'll add github actions as a workaround in a few, because I really need test visibility: otherwise navigating blind, and that's not a good scenario :-\

@Ocramius Ocramius merged commit 05f5d96 into 4.0.x Nov 30, 2020
@Ocramius Ocramius deleted the feature/#48-merge-3.5.0-into-4.0.x branch November 30, 2020 12:40
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.

10 participants