Merge release 2.1.4 into 3.0.x

[github-actions]

Release Notes for 2.1.4

2.1.x bugfix release (patch)

2.1.4

• Total issues resolved: 0
• Total pull requests resolved: 4
• Total contributors: 3

Static Analysis

• 380: Improve return type for Collection::partition thanks to @heiglandreas

• 379: Make returntypes consistent with implementation thanks to @heiglandreas

• 377: Add doctrine-project.json to .gitattributes thanks to @VincentLanglet

Improvement

• 376: Doctrine Coding Standard 12 thanks to @derrabus

[greg0ire]

@derrabus @heiglandreas I've tried fixing the cs issue by adding {@inheritDoc}, but then phpcs complains about that annotation being useless. I have yet to figure out why this happens only when merging up.

[derrabus]

This is a bug in the Slevotmat CS. Pin it to the same version we use in DBAL.

[greg0ire]

Just pushed a commit showing that pinning does not seem to fix the issue (I did add annotations). Interestingly, other classes extending Collection such as ArrayCollection don't have the issue, because they override the return annotations:

collections/src/ArrayCollection.php

Lines 315 to 324 in bdd8b62

	/**
	* {@inheritDoc}
	*
	* @return static
	* @psalm-return static<TKey,T>
	*/
	public function filter(Closure $p): Collection
	{
	return $this->createFrom(array_filter($this->elements, $p, ARRAY_FILTER_USE_BOTH));
	}

[greg0ire]

It is more precise, and it makes phpcs happy.

It's actually not more precise, I'll revert to the previous commit 😞

[greg0ire]

Cc @kukulich, can you please have look at this?

TL;DR: slevomat/coding-standard@4b2af2f does not seem to cover all cases, we have a case with complex annotations that are not detected as useful to inherit.

[kukulich]

@greg0ire I'm not able to reproduce any bug. And I see only these reports https://github.com/doctrine/collections/pull/381/files#annotation_14617881091 and all seems relevant

[greg0ire]

@kukulich when adding {@inheritDoc}, the report will change, saying {@inheritDoc} is useless. I will push a commit for you to see this.

UPD: done

[kukulich]

SlevomatCodingStandard.Commenting.UselessInheritDocComment
Reports documentation comments containing only {@inheritDoc} annotation because inheritance is automatic, and it's not needed to use a special annotation for it.

I would suggest to disable this sniff in this repository. It goes against other sniffs that you use.