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

Fix return-type for Sendmail::prepareSubject and the Sendmail::prepareParameters #242

Merged

Conversation

artemii-karkusha
Copy link
Contributor

Type of returning for functions of the prepareSubject and the prepareParameters have been fixed

#240

@artemii-karkusha
Copy link
Contributor Author

@Ocramius
Suggested changes have been applied.. Test case has been reverted.
I have change the Laminas\Mail\Transport\Envelope::getFrom, because of issue with type of property the $from.
Thank you.

@@ -1663,9 +1663,6 @@
</MissingReturnType>
</file>
<file src="src/Transport/Envelope.php">
<InvalidNullableReturnType>
<code>string</code>
</InvalidNullableReturnType>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see you've removed the InvalidNullableReturnType from src/Transport/Envelope.php, but I rather not touch the Envelope class properties as it could be seen as a BC Break.

In #241 (comment) the only InvalidNullableReturnType removal I suggest is the src/Transport/Sendmail.php, which in this PR is still in place

@Slamdunk Slamdunk self-assigned this May 25, 2023
@Slamdunk Slamdunk added this to the 2.23.0 milestone May 25, 2023
@Slamdunk Slamdunk added the Bug Something isn't working label May 25, 2023
This reverts commit 2274fbc52236c46266934e2bfa9cc1cee801b8e8.
This reverts commit 6514c48c1bada0d5cdb2ddad0a66f7d509506a50.
…pe 'string' for Laminas\Mail\Transport\Envelope::getFrom is not nullable, but 'null|string' contains null (see https://psalm.dev/144)" has been fixed"

This reverts commit d5038a6d544e27929a7da242758ee76be80da089.
….php instead of src/Transport/Envelope.php

Signed-off-by: Artemii Karkusha <artemii.karkusha@gmail.com>
Signed-off-by: Artemii Karkusha <artemii.karkusha@gmail.com>
@Slamdunk
Copy link
Contributor

Thank you

@Slamdunk Slamdunk changed the title Type of returning for functions of the prepareSubject and the prepare… Fix return-type for Sendmail::prepareSubject and the Sendmail::prepareParameters May 25, 2023
@Slamdunk Slamdunk changed the title Fix return-type for Sendmail::prepareSubject and the Sendmail::prepareParameters Fix return-type for Sendmail::prepareSubject and the Sendmail::prepareParameters May 25, 2023
@Slamdunk Slamdunk merged commit 3ae64e7 into laminas:2.23.x May 25, 2023
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working
Projects
None yet
2 participants