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

Fix newly found phpstan errors

Browse Source 
[MAILPOET-3792]
This commit is contained in:
Pavel Dohnal
2021-10-22 09:29:48 +02:00
committed by Veljko V
parent f597416837
commit c4037776f7
5 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/integration/API/JSON/v1/SubscribersTest.php
View File

@ -194,6 +194,7 @@ class SubscribersTest extends \MailPoetTest {
$this->entityManager->clear();
$subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
$subscriber = $subscriberRepository->findOneBy(['email' => 'raul.doe@mailpoet.com']);
$this->assertInstanceOf(SubscriberEntity::class, $subscriber);
expect($response->data['email'])->equals('raul.doe@mailpoet.com');
expect($response->data['id'])->equals($subscriber->getId());
expect($response->data['status'])->equals($subscriber->getStatus());
@ -240,6 +241,7 @@ class SubscribersTest extends \MailPoetTest {
$this->entityManager->clear();
$subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
$subscriber = $subscriberRepository->findOneBy(['email' => 'raul.doe@mailpoet.com']);
$this->assertInstanceOf(SubscriberEntity::class, $subscriber);
expect($response->data['email'])->equals('raul.doe@mailpoet.com');
expect($response->data['id'])->equals($subscriber->getId());
expect($response->data['status'])->equals($subscriber->getStatus());
@ -291,6 +293,7 @@ class SubscribersTest extends \MailPoetTest {
expect($response->status)->equals(APIResponse::STATUS_OK);
$subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
$subscriber = $subscriberRepository->findOneById($this->subscriber1->getId());
$this->assertInstanceOf(SubscriberEntity::class, $subscriber);
expect($response->data['id'])->equals($subscriber->getId());
expect($response->data['email'])->equals($subscriber->getEmail());
expect($response->data['status'])->equals($subscriber->getStatus());
@ -303,6 +306,7 @@ class SubscribersTest extends \MailPoetTest {
expect($response->status)->equals(APIResponse::STATUS_OK);
$subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
$subscriber = $subscriberRepository->findOneById($this->subscriber2->getId());
$this->assertInstanceOf(SubscriberEntity::class, $subscriber);
expect($response->data['id'])->equals($subscriber->getId());
expect($response->data['email'])->equals($subscriber->getEmail());
expect($response->data['status'])->equals($subscriber->getStatus());
@ -617,6 +621,7 @@ class SubscribersTest extends \MailPoetTest {
expect($response->status)->equals(APIResponse::STATUS_OK);
$subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
$subscriber = $subscriberRepository->findOneBy(['email' => 'toto@mailpoet.com']);
$this->assertInstanceOf(SubscriberEntity::class, $subscriber);
$segments = $subscriber->getSegments();
expect($segments->count())->equals(1);
expect($segments->get(0)->getId())->equals($this->segment2->getId());
@ -715,6 +720,7 @@ class SubscribersTest extends \MailPoetTest {
expect($response->status)->equals(APIResponse::STATUS_OK);
$subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
$subscriber = $subscriberRepository->findOneBy(['email' => 'toto@mailpoet.com']);
$this->assertInstanceOf(SubscriberEntity::class, $subscriber);
$segments = $subscriber->getSegments();
expect($segments->count())->equals(2);
expect($segments->get(0)->getId())->equals($settings['segments'][0]);
@ -886,6 +892,7 @@ class SubscribersTest extends \MailPoetTest {
$subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
$subscriber = $subscriberRepository->findOneById($subscriber->id);
$this->assertInstanceOf(SubscriberEntity::class, $subscriber);
$segments = $subscriber->getSegments();
expect($segments->get(0)->getId())->equals($this->segment1->getId());
expect($segments->get(1)->getId())->equals($wcSegment->id);

5
tests/integration/Cron/Workers/StatsNotifications/NewsletterLinkRepositoryTest.php
View File

@ -49,7 +49,8 @@ class NewsletterLinkRepositoryTest extends \MailPoetTest {
$this->entityManager->flush();
$repository = $this->diContainer->get(NewsletterLinkRepository::class);
$topLink = $repository->findTopLinkForNewsletter($newsletter->getId());
$topLink = $repository->findTopLinkForNewsletter((int)$newsletter->getId());
$this->assertInstanceOf(NewsletterLinkEntity::class, $topLink);
expect($topLink->getUrl())->equals('http://example1.com');
$newsletter2 = new NewsletterEntity();
@ -59,7 +60,7 @@ class NewsletterLinkRepositoryTest extends \MailPoetTest {
$this->entityManager->persist($newsletter2);
$this->entityManager->flush();
$nonExistingTopLink = $repository->findTopLinkForNewsletter($newsletter2->getId());
$nonExistingTopLink = $repository->findTopLinkForNewsletter((int)$newsletter2->getId());
expect($nonExistingTopLink)->null();
}
}

12
tests/integration/Statistics/Track/ClicksTest.php
View File

@ -196,7 +196,9 @@ class ClicksTest extends \MailPoetTest {
$trackedClicks = $clicksRepository->findAll();
expect($trackedClicks)->count(1);
$click = $trackedClicks[0];
expect($click->getUserAgent()->getUserAgent())->equals('User Agent');
$userAgent = $click->getUserAgent();
$this->assertInstanceOf(UserAgentEntity::class, $userAgent);
expect($userAgent->getUserAgent())->equals('User Agent');
}
public function testItUpdateUserAgent(): void {
@ -219,13 +221,17 @@ class ClicksTest extends \MailPoetTest {
$trackedClicks = $clicksRepository->findAll();
expect($trackedClicks)->count(1);
$click = $trackedClicks[0];
expect($click->getUserAgent()->getUserAgent())->equals('User Agent');
$userAgent = $click->getUserAgent();
$this->assertInstanceOf(UserAgentEntity::class, $userAgent);
expect($userAgent->getUserAgent())->equals('User Agent');
$data->userAgent = 'User Agent 2';
$clicks->track($data);
$trackedClicks = $clicksRepository->findAll();
expect($trackedClicks)->count(1);
$click = $trackedClicks[0];
expect($click->getUserAgent()->getUserAgent())->equals('User Agent 2');
$userAgent = $click->getUserAgent();
$this->assertInstanceOf(UserAgentEntity::class, $userAgent);
expect($userAgent->getUserAgent())->equals('User Agent 2');
}
public function testItDoesNotOverrideHumanUserAgentWithMachine(): void {

15
tests/unit/DI/ContainerWrapperTest.php
View File

@ -9,6 +9,8 @@ use MailPoetVendor\Symfony\Component\DependencyInjection\Container;
use MailPoetVendor\Symfony\Component\DependencyInjection\ContainerBuilder;
use MailPoetVendor\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
require_once __DIR__ . '/TestService.php';
class ContainerWrapperTest extends \MailPoetUnitTest {
public function testItCanConstruct() {
$instance = new ContainerWrapper(new ContainerBuilder());
@ -31,12 +33,12 @@ class ContainerWrapperTest extends \MailPoetUnitTest {
public function testItProvidesFreePluginServices() {
$freeContainerStub = Stub::make(Container::class, [
'get' => function () {
return 'service';
return new TestService();
},
]);
$instance = new ContainerWrapper($freeContainerStub);
$service = $instance->get('service_id');
expect($service)->equals('service');
$service = $instance->get(TestService::class);
$this->assertInstanceOf(TestService::class, $service);
}
public function testItThrowsFreePluginServices() {
@ -48,6 +50,7 @@ class ContainerWrapperTest extends \MailPoetUnitTest {
$instance = new ContainerWrapper($freeContainerStub);
$exception = null;
try {
/* @phpstan-ignore-next-line - normally it is not allowed to pass an arbitrary string here, but we want to test this behaviour */
$instance->get('service');
} catch (ServiceNotFoundException $e) {
$exception = $e;
@ -63,11 +66,12 @@ class ContainerWrapperTest extends \MailPoetUnitTest {
]);
$premiumContainerStub = Stub::make(Container::class, [
'get' => function () {
return 'service_1';
return new TestService();
},
]);
$instance = new ContainerWrapper($freeContainerStub, $premiumContainerStub);
expect($instance->get('service'))->equals('service_1');
$service = $instance->get(TestService::class);
$this->assertInstanceOf(TestService::class, $service);
}
public function testItThrowsIfServiceNotFoundInBothContainers() {
@ -79,6 +83,7 @@ class ContainerWrapperTest extends \MailPoetUnitTest {
$instance = new ContainerWrapper($containerStub, $containerStub);
$exception = null;
try {
/* @phpstan-ignore-next-line - normally it is not allowed to pass an arbitrary string here, but we want to test this behaviour */
$instance->get('service');
} catch (ServiceNotFoundException $e) {
$exception = $e;

7
tests/unit/DI/TestService.php Normal file
View File

@ -0,0 +1,7 @@
<?php
namespace MailPoet\Test\DI;
class TestService {
}