From 176aba69feadc8d43354a77887cc365ab45be58c Mon Sep 17 00:00:00 2001 From: wxa Date: Wed, 25 Dec 2019 14:10:48 +0300 Subject: [PATCH] Specify types for mocks [MAILPOET-2488] --- .../WooCommerce/Events/PurchasedInCategoryTest.php | 3 ++- .../Cron/Workers/KeyCheck/PremiumKeyCheckTest.php | 5 ++++- .../Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php | 5 ++++- tests/integration/Cron/Workers/WooCommerceOrdersTest.php | 5 +++-- .../FreePluginConnectors/AddToNewslettersSegmentsTest.php | 2 ++ .../FreePluginConnectors/AddToSubscribersFiltersTest.php | 3 +++ .../SendingNewslettersSubscribersFinderTest.php | 5 +++-- .../Newsletter/Editor/PostContentTransformerTest.php | 3 +++ tests/integration/Segments/BulkActionTest.php | 2 ++ tests/integration/Segments/SubscribersFinderTest.php | 5 +++++ tests/integration/Segments/SubscribersListingsTest.php | 2 ++ tests/integration/Services/BridgeTest.php | 2 ++ 12 files changed, 35 insertions(+), 7 deletions(-) diff --git a/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php b/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php index 21666d4a6f..a541639688 100644 --- a/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php +++ b/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php @@ -17,10 +17,11 @@ use MailPoet\Tasks\Sending; use MailPoet\WooCommerce\Helper as WCHelper; use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Idiorm\ORM; +use PHPUnit_Framework_MockObject_MockObject as MockObject; class PurchasedInCategoryTest extends \MailPoetTest { - /** @var WCHelper */ + /** @var MockObject */ private $woocommerce_helper; /** @var PurchasedInCategory */ diff --git a/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php b/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php index 6514167f67..9c64c15782 100644 --- a/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php @@ -7,6 +7,7 @@ use MailPoet\Cron\Workers\KeyCheck\PremiumKeyCheck; use MailPoet\Services\Bridge; use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsRepository; +use PHPUnit_Framework_MockObject_MockObject as MockObject; class PremiumKeyCheckTest extends \MailPoetTest { public $worker; @@ -30,7 +31,8 @@ class PremiumKeyCheckTest extends \MailPoetTest { public function testItChecksPremiumKey() { $response = ['code' => Bridge::KEY_VALID]; - $this->worker->bridge = Stub::make( + /** @var MockObject $bridge */ + $bridge = Stub::make( new Bridge, [ 'checkPremiumKey' => $response, @@ -38,6 +40,7 @@ class PremiumKeyCheckTest extends \MailPoetTest { ], $this ); + $this->worker->bridge = $bridge; $this->worker->bridge->expects($this->once()) ->method('checkPremiumKey') ->with($this->equalTo($this->premium_key)); diff --git a/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php b/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php index 0e993ebf2c..14c61b88f8 100644 --- a/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php +++ b/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php @@ -9,6 +9,7 @@ use MailPoet\Mailer\Mailer; use MailPoet\Services\Bridge; use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsRepository; +use PHPUnit_Framework_MockObject_MockObject as MockObject; class SendingServiceKeyCheckTest extends \MailPoetTest { public $worker; @@ -27,7 +28,8 @@ class SendingServiceKeyCheckTest extends \MailPoetTest { public function testItChecksMSSKey() { $response = ['code' => Bridge::KEY_VALID]; - $this->worker->bridge = Stub::make( + /** @var MockObject $bridge */ + $bridge = Stub::make( new Bridge, [ 'checkMSSKey' => $response, @@ -36,6 +38,7 @@ class SendingServiceKeyCheckTest extends \MailPoetTest { ], $this ); + $this->worker->bridge = $bridge; $this->worker->bridge->expects($this->once()) ->method('checkMSSKey') ->with($this->equalTo($this->mss_key)); diff --git a/tests/integration/Cron/Workers/WooCommerceOrdersTest.php b/tests/integration/Cron/Workers/WooCommerceOrdersTest.php index 8cb1c3c36e..c6ed9973fe 100644 --- a/tests/integration/Cron/Workers/WooCommerceOrdersTest.php +++ b/tests/integration/Cron/Workers/WooCommerceOrdersTest.php @@ -12,12 +12,13 @@ use MailPoet\Models\StatisticsWooCommercePurchases; use MailPoet\Statistics\Track\WooCommercePurchases; use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoetVendor\Idiorm\ORM; +use PHPUnit_Framework_MockObject_MockObject as MockObject; class WooCommerceOrdersTest extends \MailPoetTest { - /** @var WooCommerceHelper */ + /** @var MockObject */ private $woocommerce_helper; - /** @var WooCommercePurchases */ + /** @var MockObject */ private $woocommerce_purchases; /** @var WooCommercePastOrders */ diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php index 8ea04fc98c..61b63b45fb 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/AddToNewslettersSegmentsTest.php @@ -5,6 +5,7 @@ namespace MailPoet\DynamicSegments\FreePluginConnectors; use Codeception\Stub; use Codeception\Stub\Expected; use MailPoet\Models\DynamicSegment; +use PHPUnit_Framework_MockObject_MockObject as MockObject; class AddToNewslettersSegmentsTest extends \MailPoetTest { @@ -38,6 +39,7 @@ class AddToNewslettersSegmentsTest extends \MailPoetTest { return [$dynamic_segment]; })]); + /** @var \MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount|MockObject $subscribers_count_loader */ $subscribers_count_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount']); $subscribers_count_loader ->expects($this->once()) diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php index bb41dbe1f7..8e3b0f9992 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/AddToSubscribersFiltersTest.php @@ -5,6 +5,7 @@ namespace MailPoet\DynamicSegments\FreePluginConnectors; use Codeception\Stub; use Codeception\Stub\Expected; use MailPoet\Models\DynamicSegment; +use PHPUnit_Framework_MockObject_MockObject as MockObject; class AddToSubscribersFiltersTest extends \MailPoetTest { @@ -37,6 +38,7 @@ class AddToSubscribersFiltersTest extends \MailPoetTest { return [$dynamic_segment]; })]); + /** @var \MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount|MockObject $subscribers_count_loader */ $subscribers_count_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount']); $subscribers_count_loader ->expects($this->once()) @@ -77,6 +79,7 @@ class AddToSubscribersFiltersTest extends \MailPoetTest { ] ); + /** @var \MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount|MockObject $subscribers_count_loader */ $subscribers_count_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SubscribersCount', ['getSubscribersCount']); $subscribers_count_loader ->expects($this->exactly(2)) diff --git a/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php b/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php index f56dad3c73..8c3202dfb5 100644 --- a/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php +++ b/tests/integration/DynamicSegments/FreePluginConnectors/SendingNewslettersSubscribersFinderTest.php @@ -8,13 +8,14 @@ use MailPoet\DynamicSegments\Persistence\Loading\SubscribersIds; use MailPoet\Models\DynamicSegment; use MailPoet\Models\Segment; use MailPoet\Models\Subscriber; +use PHPUnit_Framework_MockObject_MockObject as MockObject; class SendingNewslettersSubscribersFinderTest extends \MailPoetTest { - /** @var SingleSegmentLoader */ + /** @var SingleSegmentLoader|MockObject */ private $single_segment_loader; - /** @var SubscribersIds */ + /** @var SubscribersIds|MockObject */ private $subscribers_ids_loader; /** @var SendingNewslettersSubscribersFinder */ diff --git a/tests/integration/Newsletter/Editor/PostContentTransformerTest.php b/tests/integration/Newsletter/Editor/PostContentTransformerTest.php index 4d6846b65d..85f65acf10 100644 --- a/tests/integration/Newsletter/Editor/PostContentTransformerTest.php +++ b/tests/integration/Newsletter/Editor/PostContentTransformerTest.php @@ -5,6 +5,7 @@ namespace MailPoet\Test\Newsletter\Editor; use Codeception\Stub\Expected; use MailPoet\Newsletter\Editor\PostTransformer; use MailPoet\Newsletter\Editor\PostTransformerContentsExtractor; +use PHPUnit_Framework_MockObject_MockObject as MockObject; class PostContentTransformerTest extends \MailPoetTest { /** @var array */ @@ -242,6 +243,7 @@ class PostContentTransformerTest extends \MailPoetTest { $post = []; $expected_with_post_class = true; + /** @var MockObject $extractor */ $extractor = $this->make( PostTransformerContentsExtractor::class, [ @@ -272,6 +274,7 @@ class PostContentTransformerTest extends \MailPoetTest { $post = []; $expected_with_post_class = false; + /** @var MockObject $extractor */ $extractor = $this->make( PostTransformerContentsExtractor::class, [ diff --git a/tests/integration/Segments/BulkActionTest.php b/tests/integration/Segments/BulkActionTest.php index 2187f61956..4b8781b8da 100644 --- a/tests/integration/Segments/BulkActionTest.php +++ b/tests/integration/Segments/BulkActionTest.php @@ -8,6 +8,7 @@ use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberSegment; use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Idiorm\ORM; +use PHPUnit_Framework_MockObject_MockObject as MockObject; require_once('SubscribersBulkActionHandlerMock.php'); @@ -89,6 +90,7 @@ class BulkActionTest extends \MailPoetTest { } public function testBulkActionUsingFilter() { + /** @var MockObject $mock */ $mock = Stub::makeEmpty('\MailPoet\Test\Segments\SubscribersBulkActionHandlerMock', ['apply']); $mock ->expects($this->once()) diff --git a/tests/integration/Segments/SubscribersFinderTest.php b/tests/integration/Segments/SubscribersFinderTest.php index 781ee46462..2691389f39 100644 --- a/tests/integration/Segments/SubscribersFinderTest.php +++ b/tests/integration/Segments/SubscribersFinderTest.php @@ -13,6 +13,7 @@ use MailPoet\Models\SubscriberSegment; use MailPoet\Tasks\Sending as SendingTask; use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Idiorm\ORM; +use PHPUnit_Framework_MockObject_MockObject as MockObject; class SubscribersFinderTest extends \MailPoetTest { public $sending; @@ -71,6 +72,7 @@ class SubscribersFinderTest extends \MailPoetTest { } public function testFindSubscribersInSegmentUsingFinder() { + /** @var MockObject $mock */ $mock = Stub::makeEmpty('MailPoet\Segments\FinderMock', ['findSubscribersInSegment']); $mock ->expects($this->once()) @@ -89,6 +91,7 @@ class SubscribersFinderTest extends \MailPoetTest { } public function testFindSubscribersInSegmentUsingFinderMakesResultUnique() { + /** @var MockObject $mock */ $mock = Stub::makeEmpty('MailPoet\Segments\FinderMock', ['findSubscribersInSegment']); $mock ->expects($this->exactly(2)) @@ -130,6 +133,7 @@ class SubscribersFinderTest extends \MailPoetTest { } public function testItAddsSubscribersToTaskFromDynamicSegments() { + /** @var MockObject $mock */ $mock = Stub::makeEmpty('MailPoet\Segments\FinderMock', ['getSubscriberIdsInSegment']); $mock ->expects($this->once()) @@ -155,6 +159,7 @@ class SubscribersFinderTest extends \MailPoetTest { public function testItAddsSubscribersToTaskFromStaticAndDynamicSegments() { $finder = new SubscribersFinder(); + /** @var MockObject $mock */ $mock = Stub::makeEmpty('MailPoet\Segments\FinderMock', ['getSubscriberIdsInSegment']); $mock ->expects($this->once()) diff --git a/tests/integration/Segments/SubscribersListingsTest.php b/tests/integration/Segments/SubscribersListingsTest.php index 46f7770b0c..189a0c0168 100644 --- a/tests/integration/Segments/SubscribersListingsTest.php +++ b/tests/integration/Segments/SubscribersListingsTest.php @@ -11,6 +11,7 @@ use MailPoet\Models\Subscriber; use MailPoet\Models\SubscriberSegment; use MailPoet\WP\Functions as WPFunctions; use MailPoetVendor\Idiorm\ORM; +use PHPUnit_Framework_MockObject_MockObject as MockObject; class SubscribersListingsTest extends \MailPoetTest { public $subscriber_2; @@ -75,6 +76,7 @@ class SubscribersListingsTest extends \MailPoetTest { } public function testGetListingsUsingFilter() { + /** @var MockObject $mock */ $mock = Stub::makeEmpty('MailPoet\Test\Segments\DynamicListingsHandlerMock', ['get']); $mock ->expects($this->once()) diff --git a/tests/integration/Services/BridgeTest.php b/tests/integration/Services/BridgeTest.php index 1d0f38ddcb..8d0f2cf6ab 100644 --- a/tests/integration/Services/BridgeTest.php +++ b/tests/integration/Services/BridgeTest.php @@ -10,6 +10,7 @@ use MailPoet\Services\Bridge\BridgeTestMockAPI as MockAPI; use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsRepository; use MailPoet\WP\Functions as WPFunctions; +use PHPUnit_Framework_MockObject_MockObject as MockObject; require_once('BridgeTestMockAPI.php'); @@ -227,6 +228,7 @@ class BridgeTest extends \MailPoetTest { public function testItChecksAndStoresKeysOnSettingsSave() { $response = ['abc' => 'def']; + /** @var MockObject $bridge */ $bridge = Stub::makeEmptyExcept( $this->bridge, 'onSettingsSave',