Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix phpstan errors from new version

Browse Source 
[MAILPOET-3725]
This commit is contained in:
Jan Lysý
2021-08-05 12:40:18 +02:00
committed by Veljko V
parent 3ede4366b6
commit a9621875bd
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Form/Block/Select.php
View File

@@ -53,7 +53,7 @@ class Select {
} }
$html .= '<option value="" disabled selected hidden>' . $label . '</option>'; $html .= '<option value="" disabled selected hidden>' . $label . '</option>';
} else { } else {
if (empty($block['params']['required']) || !$block['params']['required']) { if (empty($block['params']['required'])) {
$html .= '<option value="">-</option>'; $html .= '<option value="">-</option>';
} }
} }

2
lib/Models/Model.php
View File

@@ -179,7 +179,7 @@ class Model extends \MailPoetVendor\Sudzy\ValidModel {
$model = $model->where($field, $value); $model = $model->where($field, $value);
} }
} }
if ($model) $model = $model->findOne(); if ($model !== false) $model = $model->findOne();
} }
if ($model === false) { if ($model === false) {

9
lib/Newsletter/Renderer/Renderer.php
View File

@@ -4,6 +4,7 @@ namespace MailPoet\Newsletter\Renderer;
use MailPoet\Config\Env; use MailPoet\Config\Env;
use MailPoet\Entities\NewsletterEntity; use MailPoet\Entities\NewsletterEntity;
use MailPoet\InvalidStateException;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
use MailPoet\Newsletter\NewslettersRepository; use MailPoet\Newsletter\NewslettersRepository;
use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper; use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper;
@@ -63,11 +64,13 @@ class Renderer {
* @return NewsletterEntity|null * @return NewsletterEntity|null
*/ */
private function getNewsletter($newsletter) { private function getNewsletter($newsletter) {
if ($newsletter instanceof NewsletterEntity) return $newsletter;
if ($newsletter instanceof Newsletter) { if ($newsletter instanceof Newsletter) {
$newsletterId = $newsletter->id; return $this->newslettersRepository->findOneById($newsletter->id);
} }
return $this->newslettersRepository->findOneById($newsletterId); if (!$newsletter instanceof NewsletterEntity) {
throw new InvalidStateException();
}
return $newsletter;
} }
public function render($newsletter, SendingTask $sendingTask = null, $type = false) { public function render($newsletter, SendingTask $sendingTask = null, $type = false) {