[PersistentCollection] Fix compatibility with PHP7 return types #1532
Conversation
Solves the issue about signature mismatch due missing return type in child class.
|
I've tested in local tuning CustomCollectionsTest successfully. I didn't commit the changes due PHP5 vs PHP7 runs. This has been tested with PHP 7.0 return types. Not with PHP 7.1 void or nullable return types |
|
Great, I haven't even thought of that! With PHP 7.1 released, could you add support for nullable types and the void return type? |
|
@alcaeus The code is based on Proxy code present at doctrine/commons. When that code become updated this could be done as well. |
|
This was added to doctrine/common in 2.7.0: doctrine/common#734 |
|
Then the code proposed on this PR include those changes. I just copy the code present on master yesterday. |
|
Ok. I'll take a look later today. |
| private function formatType( | ||
| \ReflectionType $type, | ||
| \ReflectionMethod $method, | ||
| \ReflectionParameter $parameter = null |
There was a problem hiding this comment.
We could simplify method by getting rid of this argument
There was a problem hiding this comment.
It's not my intention make something different from the code already present on doctrine commons.
If both snippets are equals then maintenance will be easy until a long term solution (DRY) become
There was a problem hiding this comment.
That is good point. This is not-blocking comment so I'll let @alcaeus decide :)
There was a problem hiding this comment.
I agree, we should try to keep it consistent.
| private function formatType( | ||
| \ReflectionType $type, | ||
| \ReflectionMethod $method, | ||
| \ReflectionParameter $parameter = null |
There was a problem hiding this comment.
I agree, we should try to keep it consistent.
| } | ||
| if ( ! $type->isBuiltin() && ! class_exists($name) && ! interface_exists($name)) { | ||
| if (null !== $parameter) { | ||
| throw UnexpectedValueException::invalidParameterTypeHint( |
There was a problem hiding this comment.
This should not be a Proxy\UnexpectedValueException. Either create a new exception class or throw a PersistentCollectionException.
|
@malarzm I was going to ask for some tests, then I saw that we currently don't have any. Would it be worth to create some tests for this class? |
|
IIRC I wasn't originally writing tests for this specific class because for any of custom collection test this generator must be well and alive :) |
|
This test class (https://github.com/doctrine/mongodb-odm/blob/d728cc1e309475ed52f4cd9aa35208e699941f9e/tests/Doctrine/ODM/MongoDB/Tests/Functional/CustomCollectionsTest.php) cover the scenario for PHP <7 but it's heavily coupled to the whole MongoDB setup and I don't have time for to perform a refactor and decouple the tests. Sorry for not to be more useful but don't expect more changes from my side. The branch is open so any of you can add more commits |
@Maks3w mind changing at least the exception to |
Solves the issue about signature mismatch due missing return type in child class.