Fix errors discovered by doctrine-phpstan

[MAILPOET-2945]

lib/Entities/FormEntity.php

@@ -43,7 +43,7 @@ class FormEntity {
   private $settings;
 
   /**
-   * @ORM\Column(type="string")
+   * @ORM\Column(type="string", nullable=true)
    * @var string|null
    */
   private $styles;

lib/Entities/NewsletterEntity.php

@@ -42,7 +42,7 @@ class NewsletterEntity {
   use SafeToOneAssociationLoadTrait;
 
   /**
-   * @ORM\Column(type="string")
+   * @ORM\Column(type="string", nullable=true)
    * @var string|null
    */
   private $hash;
@@ -103,13 +103,13 @@ class NewsletterEntity {
   private $body;
 
   /**
-   * @ORM\Column(type="datetimetz")
+   * @ORM\Column(type="datetimetz", nullable=true)
    * @var DateTimeInterface|null
    */
   private $sentAt;
 
   /**
-   * @ORM\Column(type="string")
+   * @ORM\Column(type="string", nullable=true)
    * @var string|null
    */
   private $unsubscribeToken;

lib/Entities/NewsletterOptionEntity.php

@@ -20,7 +20,7 @@ class NewsletterOptionEntity {
 
 
   /**
-   * @ORM\Column(type="text")
+   * @ORM\Column(type="text", nullable=true)
    * @var string|null
    */
   private $value;

lib/Entities/NewsletterSegmentEntity.php

@@ -20,13 +20,13 @@ class NewsletterSegmentEntity {
 
   /**
    * @ORM\ManyToOne(targetEntity="MailPoet\Entities\NewsletterEntity", inversedBy="newsletterSegments")
-   * @var NewsletterEntity
+   * @var NewsletterEntity|null
    */
   private $newsletter;
 
   /**
    * @ORM\ManyToOne(targetEntity="MailPoet\Entities\SegmentEntity")
-   * @var SegmentEntity
+   * @var SegmentEntity|null
    */
   private $segment;
 

lib/Entities/ScheduledTaskEntity.php

@@ -28,13 +28,13 @@ class ScheduledTaskEntity {
   use DeletedAtTrait;
 
   /**
-   * @ORM\Column(type="string")
+   * @ORM\Column(type="string", nullable=true)
    * @var string|null
    */
   private $type;
 
   /**
-   * @ORM\Column(type="string")
+   * @ORM\Column(type="string", nullable=true)
    * @var string|null
    */
   private $status;
@@ -46,13 +46,13 @@ class ScheduledTaskEntity {
   private $priority = 0;
 
   /**
-   * @ORM\Column(type="datetimetz")
+   * @ORM\Column(type="datetimetz", nullable=true)
    * @var DateTimeInterface|null
    */
   private $scheduledAt;
 
   /**
-   * @ORM\Column(type="datetimetz")
+   * @ORM\Column(type="datetimetz", nullable=true)
    * @var DateTimeInterface|null
    */
   private $processedAt;

lib/Entities/SendingQueueEntity.php

@@ -42,13 +42,13 @@ class SendingQueueEntity {
   private $newsletterRenderedBody;
 
   /**
-   * @ORM\Column(type="string")
+   * @ORM\Column(type="string", nullable=true)
    * @var string|null
    */
   private $newsletterRenderedSubject;
 
   /**
-   * @ORM\Column(type="text")
+   * @ORM\Column(type="text", nullable=true)
    * @var string|null
    */
   private $subscribers;

lib/Entities/SettingEntity.php

@@ -26,7 +26,7 @@ class SettingEntity {
   private $name;
 
   /**
-   * @ORM\Column(type="text")
+   * @ORM\Column(type="text", nullable=true)
    * @var string|null
    */
   private $value;

lib/Entities/StatisticsClickEntity.php

@@ -34,7 +34,7 @@ class StatisticsClickEntity {
 
   /**
    * @ORM\Column(type="integer")
-   * @var int|null
+   * @var int
    */
   private $subscriberId;
 
@@ -103,7 +103,7 @@ class StatisticsClickEntity {
   }
 
   /**
-   * @param int|null $subscriberId
+   * @param int $subscriberId
    */
   public function setSubscriberId($subscriberId) {
     $this->subscriberId = $subscriberId;

lib/Entities/StatisticsNewsletterEntity.php

@@ -36,7 +36,7 @@ class StatisticsNewsletterEntity {
   private $subscriber;
 
   /**
-   * @ORM\Column(type="datetimetz")
+   * @ORM\Column(type="datetimetz", nullable=true)
    * @var \DateTimeInterface|null
    */
   private $sentAt;

lib/Entities/StatisticsOpenEntity.php

@@ -32,7 +32,7 @@ class StatisticsOpenEntity {
 
   /**
    * @ORM\Column(type="integer")
-   * @var int|null
+   * @var int
    */
   private $subscriberId;
 
@@ -77,7 +77,7 @@ class StatisticsOpenEntity {
   }
 
   /**
-   * @param int|null $subscriberId
+   * @param int $subscriberId
    */
   public function setSubscriberId($subscriberId) {
     $this->subscriberId = $subscriberId;

lib/Entities/StatisticsUnsubscribeEntity.php

@@ -32,7 +32,7 @@ class StatisticsUnsubscribeEntity {
 
   /**
    * @ORM\Column(type="integer")
-   * @var int|null
+   * @var int
    */
   private $subscriberId;
 

lib/Entities/SubscriberEntity.php

@@ -27,7 +27,7 @@ class SubscriberEntity {
   use DeletedAtTrait;
 
   /**
-   * @ORM\Column(type="bigint")
+   * @ORM\Column(type="bigint", nullable=true)
    * @var int|null
    */
   private $wpUserId;
@@ -111,7 +111,7 @@ class SubscriberEntity {
   private $unsubscribeToken;
 
   /**
-   * @ORM\Column(type="string")
+   * @ORM\Column(type="string", nullable=true)
    * @var string|null
    */
   private $linkToken;

lib/Entities/UserFlagEntity.php

@@ -29,7 +29,7 @@ class UserFlagEntity {
   private $name;
 
   /**
-   * @ORM\Column(type="string")
+   * @ORM\Column(type="string", nullable=true)
    * @var string|null
    */
   private $value;

lib/Newsletter/NewsletterSaveController.php

@@ -188,6 +188,10 @@ class NewsletterSaveController {
       }
 
       $segment = $this->entityManager->getReference(SegmentEntity::class, (int)$segmentData['id']);
+      if (!$segment) {
+        continue;
+      }
+
       $newsletterSegment = $this->newsletterSegmentRepository->findOneBy([
         'newsletter' => $newsletter,
         'segment' => $segment,

tasks/phpstan/phpstan-baseline-integration-tests.neon

@@ -350,31 +350,6 @@ parameters:
 			count: 2
 			path: ../../tests/integration/Cron/Workers/WooCommerceOrdersTest.php
 
-		-
-			message: "#^Cannot call method setName\\(\\) on object\\|null\\.$#"
-			count: 1
-			path: ../../tests/integration/Doctrine/EventListeners/TimestampListenerTest.php
-
-		-
-			message: "#^Cannot call method getCreatedAt\\(\\) on object\\|null\\.$#"
-			count: 1
-			path: ../../tests/integration/Doctrine/EventListeners/TimestampListenerTest.php
-
-		-
-			message: "#^Cannot call method getUpdatedAt\\(\\) on object\\|null\\.$#"
-			count: 1
-			path: ../../tests/integration/Doctrine/EventListeners/TimestampListenerTest.php
-
-		-
-			message: "#^Cannot call method getJsonData\\(\\) on object\\|null\\.$#"
-			count: 4
-			path: ../../tests/integration/Doctrine/Types/JsonTypesTest.php
-
-		-
-			message: "#^Cannot call method getJsonOrSerializedData\\(\\) on object\\|null\\.$#"
-			count: 4
-			path: ../../tests/integration/Doctrine/Types/JsonTypesTest.php
-
 		-
 			message: "#^Parameter \\#1 \\$orm of method MailPoet\\\\DynamicSegments\\\\Filters\\\\EmailAction\\:\\:toSql\\(\\) expects MailPoetVendor\\\\Idiorm\\\\ORM, MailPoet\\\\Models\\\\Subscriber given\\.$#"
 			count: 8
@@ -759,8 +734,3 @@ parameters:
 			message: "#^Parameter \\#1 \\$argument of class ReflectionClass constructor expects class\\-string\\<T of object\\>\\|T of object, string given\\.$#"
 			count: 1
 			path: ../../tests/integration/_bootstrap.php
-
-		-
-			message: "#^Parameter \\#1 \\$newsletter of method MailPoet\\\\Entities\\\\NewsletterTemplateEntity\\:\\:setNewsletter\\(\\) expects MailPoet\\\\Entities\\\\NewsletterEntity\\|null, object given\\.$#"
-			count: 1
-			path: ../../tests/integration/API/JSON/v1/NewsletterTemplatesTest.php

tests/integration/Doctrine/EventListeners/TimestampListenerTest.php

@@ -66,6 +66,7 @@ class TimestampListenerTest extends \MailPoetTest {
     ");
 
     $entity = $this->entityManager->find(TimestampEntity::class, 123);
+    assert($entity instanceof TimestampEntity); // PHPStan
     $entity->setName('Updated');
     $this->entityManager->flush();
 

tests/integration/Doctrine/Types/JsonTypesTest.php

@@ -70,6 +70,7 @@ class JsonTypesTest extends \MailPoetTest {
     );
 
     $entity = $this->entityManager->find(JsonEntity::class, 1);
+    assert($entity instanceof JsonEntity); // PHPStan
     expect($entity->getJsonData())->same($this->testData);
     expect($entity->getJsonOrSerializedData())->same($this->testData);
   }
@@ -84,6 +85,7 @@ class JsonTypesTest extends \MailPoetTest {
     );
 
     $entity = $this->entityManager->find(JsonEntity::class, 1);
+    assert($entity instanceof JsonEntity); // PHPStan
     expect($entity->getJsonData())->null();
     expect($entity->getJsonOrSerializedData())->same($this->testData);
   }
@@ -111,6 +113,7 @@ class JsonTypesTest extends \MailPoetTest {
     );
 
     $entity = $this->entityManager->find(JsonEntity::class, 1);
+    assert($entity instanceof JsonEntity); // PHPStan
     expect($entity->getJsonData())->null();
     expect($entity->getJsonOrSerializedData())->null();
   }
@@ -126,6 +129,7 @@ class JsonTypesTest extends \MailPoetTest {
     );
 
     $entity = $this->entityManager->find(JsonEntity::class, 1);
+    assert($entity instanceof JsonEntity); // PHPStan
     expect($entity->getJsonData())->null();
     expect($entity->getJsonOrSerializedData())->null();
   }