Skip to content

5.x phpstan 7 #994

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.

Sign up for GitHub

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

Merged
markstory merged 2 commits into from
Mar 4, 2024
Merged

5.x phpstan 7 #994

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ff5ec3
Fix PHPStan L7
dereuromark Mar 2, 2024
cea4563
Fix up psalm
dereuromark Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix up psalm
  • Loading branch information
@dereuromark
dereuromark committed Mar 2, 2024
commit cea45636ddd5f31b155e60be82c82c1aa0fc63ef
3 changes: 0 additions & 3 deletions psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@
<NullArgument>
<code><![CDATA[$this->emailLog]]></code>
</NullArgument>
<PropertyTypeCoercion>
<code>new $className($config)</code>
</PropertyTypeCoercion>
</file>
<file src="src/Model/Table/LazyTableTrait.php">
<RiskyTruthyFalsyComparison>
Expand Down
4 changes: 2 additions & 2 deletions src/Controller/MailPreviewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,9 @@ protected function findPreview(string $previewName, string $emailName, string $p
$mailPreview = new $realClass();

$email = $mailPreview->find($emailName);
if (!$email) {
if ($email === null) {
throw new NotFoundException(sprintf(
'Mailer preview %s::%s not found',
'Mailer preview `%s::%s` not found',
$previewName,
$emailName
));
Expand Down
1 change: 1 addition & 0 deletions src/DebugInclude.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public function __construct()
*/
public function includePaths(): array
{
/** @psalm-suppress RedundantCast */
$paths = explode(PATH_SEPARATOR, (string)get_include_path());
$paths = array_filter($paths, function ($path) {
if ($path === '.' || strlen($path) === 0) {
Expand Down
1 change: 1 addition & 0 deletions src/Mailer/Transport/DebugKitTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public function __construct(array $config = [], ?AbstractTransport $originalTran

if ($className) {
unset($config['originalClassName'], $config['debugKitLog']);
/** @psalm-suppress UnsafeInstantiation */
$this->originalTransport = new $className($config);
}
}
Expand Down