Skip to content

Merge in 3.2.7#310

Merged
beberlei merged 14 commits intobeberlei:masterfrom
wilsonge:327-merge
Apr 18, 2021
Merged

Merge in 3.2.7#310
beberlei merged 14 commits intobeberlei:masterfrom
wilsonge:327-merge

Conversation

@wilsonge
Copy link
Copy Markdown
Contributor

Fixes #309

I've done my best to resolve conflicts. But hopefully the unit tests will point out if I've missed anything along the way hopefully!

Also once this is merged can you guys update the changelog for version 3.3.0 then release 3.3.1 :)

rquadling and others added 13 commits October 9, 2019 16:57
…ion for

use with Assertion::count(), Assertion::isCountable(), Assertion::minCount(),
and Assertion::maxCount() to operate on ResourceBundles.
Fixes beberlei#288.

While beberlei#268 and beberlei#269 updated count() and isCountable() to now work with intl resources, beberlei#286 made that the whole beberlei/assert package now requires the intl extension to be installed.

However, the intl extension dependency is a soft dependency.
The package does not need intl for most of its features and can safely work without it.
### Fixes
- Reinstated the `@method` return type for `Assert\LazyAssertion` methods to show that the return type is `LazyAssertion`.
@danieleartico
Copy link
Copy Markdown

Hello, any news about merging this PR, please? May I help somehow? :)

@wilsonge
Copy link
Copy Markdown
Contributor Author

Ping to @oqq and @beberlei as this is kinda frustrating for several linked projects

@thirsch
Copy link
Copy Markdown

thirsch commented Apr 16, 2021

Any news here?

@beberlei beberlei merged commit 3f6cb5c into beberlei:master Apr 18, 2021
@beberlei
Copy link
Copy Markdown
Owner

@wilsonge thank you!

@wilsonge wilsonge deleted the 327-merge branch April 20, 2021 12:47
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.

[BC break] Changes introduced in v3.2.4-v3.2.7 are excluded in v3.3.0

7 participants