Fix PHPUnit 6 & Codeception\Verify incompatibilities

[MAILPOET-2582]
This commit is contained in:
Jan Jakeš
2020-01-27 16:14:30 +01:00
committed by Jack Kitterhing
parent aa05ae4132
commit 835d8bc0af
34 changed files with 70 additions and 61 deletions

View File

@ -38,7 +38,7 @@ class SingleSegmentLoaderTest extends \MailPoetTest {
}
public function testItThrowsForUnknownSegment() {
$this->setExpectedException('InvalidArgumentException');
$this->expectException('InvalidArgumentException');
$this->loader->load($this->segment->id + 11564564);
}

View File

@ -7,10 +7,11 @@ require_once(ABSPATH . 'wp-admin/includes/user.php');
use MailPoet\DynamicSegments\Filters\UserRole;
use MailPoet\DynamicSegments\RequirementsChecker;
use MailPoet\Models\DynamicSegment;
use PHPUnit\Framework\MockObject\MockObject;
class SubscribersCountTest extends \MailPoetTest {
/** @var RequirementsChecker|\PHPUnit_Framework_MockObject_MockObject */
/** @var RequirementsChecker|MockObject */
private $requirementChecker;
public function _before() {

View File

@ -8,12 +8,13 @@ use MailPoet\DynamicSegments\Filters\UserRole;
use MailPoet\DynamicSegments\RequirementsChecker;
use MailPoet\Models\DynamicSegment;
use MailPoet\Models\Subscriber;
use PHPUnit\Framework\MockObject\MockObject;
class SubscribersIdsTest extends \MailPoetTest {
private $editorsWpIds = [];
/** @var RequirementsChecker|\PHPUnit_Framework_MockObject_MockObject */
/** @var RequirementsChecker|MockObject */
private $requirementChecker;
public function _before() {