Remove calls to getMockForAbstractClass()

[alexandre-daubois]

Q	A
Branch?	5.4
Bug fix?	no
New feature?	no
Deprecations?	no
Issues	-
License	MIT

This method is deprecated (see sebastianbergmann/phpunit#5241), and must be replaced where used.

[nicolas-grekas]

Thanks. Just one failure on deps=low.

[xabbuh]

Suggested change

	->getMockBuilder(\get_class($bundle))
	->getMockBuilder($className ?? \get_class($bundle))

Can't we use this and remove the if below?

[alexandre-daubois]

No, it throws:

However, I pushed a simpler way of creating the mock. Don't know why I didn't think about it before, but it's better now as we avoid creating 2 mocks.

[alexandre-daubois]

Also I never played with setMockClassName, but it seems that using ?? would change the semantic and the mock wouldn't implement BundleInterface anymore. We need to implement BundleInterface, which is done with getMockBuilder. Then setMockClassName would rename the mock but keep BundleInterface as the mock parent.

Not sure I'm super clear here 😄

[xabbuh]

@alexandre-daubois Can you rebase please?

[derrabus]

Those methods need to return something. Otherwise we won't be able to ad a return type after merging up.

Suggested change

	protected function normalizeValue($value)
	{
	}
	protected function mergeValues($leftSide, $rightSide)
	{
	}
	protected function finalizeValue($value)
	{
	}
	protected function normalizeValue($value)
	{
	return null;
	}
	protected function mergeValues($leftSide, $rightSide)
	{
	return null;
	}
	protected function finalizeValue($value)
	{
	return null;
	}

[alexandre-daubois]

Given that they return mixed, I think it would still work at up-merge without the return statement? I added return statement anyway, better be safe than sorry 🙂

[alexandre-daubois]

I should also add return types to other anonymous classes, I'm on it.

[alexandre-daubois]

Better now 👍

[derrabus]

Given that they return mixed, I think it would still work at up-merge without the return statement?

Yes, but whoever does the merge-up will have to think less when doing so. 😅 Also, the diff is smaller.