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

Upmerge 1.6.x to 1.7.x #265

Merged
merged 27 commits into from
Jan 15, 2021
Merged

Upmerge 1.6.x to 1.7.x #265

merged 27 commits into from
Jan 15, 2021

Conversation

SenseException
Copy link
Member

Especially because of the GitHub Actions workflows that can come in handy for 1.7.x and later the master branch.

ThomasLandauer and others added 27 commits September 9, 2020 17:27
* Renaming "count" to "number", since "count" was ambiguous (meaning: how many?)
* Explaining the callback function of `filter()` better
Since `ArrayCollection::filter` uses `array_filter` under the hood, the filtering keeps array indices untouched.
This caused me quite some time debugging, because I wasn't expecting the filtered collection would have gaps between array indices (that led to serializing to an object instead an array, in JSON etc.)
Adapts the website config to be compatible with the doctrine/doctrine-website#356 changes
This in turn allows to use PCOV with PHP 7.2
Add missing character in badge url
Use the ramsey/composer-install action to install dependencies
@SenseException
Copy link
Member Author

After the changes are merged in 1.7.x, the master branch can be updated too. Then #264 can benefit from the GitHub Action workflows instead of the travis-ci build.

@greg0ire greg0ire merged commit c5f6fff into 1.7.x Jan 15, 2021
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.

7 participants