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

@@ -7,19 +7,20 @@ use MailPoet\Entities\ScheduledTaskEntity;
use MailPoet\Entities\StatsNotificationEntity;
use MailPoet\Settings\SettingsController;
use MailPoetVendor\Doctrine\ORM\EntityManager;
use PHPUnit\Framework\MockObject\MockObject;
class SchedulerTest extends \MailPoetUnitTest {
/** @var Scheduler */
private $statsNotifications;
/** @var SettingsController|\PHPUnit_Framework_MockObject_MockObject */
/** @var SettingsController|MockObject */
private $settings;
/** @var EntityManager|\PHPUnit_Framework_MockObject_MockObject */
/** @var EntityManager|MockObject */
private $entityManager;
/** @var StatsNotificationsRepository|\PHPUnit_Framework_MockObject_MockObject */
/** @var StatsNotificationsRepository|MockObject */
private $repository;
public function _before() {

View File

@@ -6,10 +6,11 @@ use MailPoet\DynamicSegments\Filters\EmailAction;
use MailPoet\DynamicSegments\Filters\WooCommerceCategory;
use MailPoet\Models\DynamicSegment;
use MailPoet\WooCommerce\Helper;
use PHPUnit\Framework\MockObject\MockObject;
class RequirementsCheckerTest extends \MailPoetUnitTest {
/** @var Helper|\PHPUnit_Framework_MockObject_MockObject */
/** @var Helper|MockObject */
private $woocommerceHelper;
/** @var RequirementsChecker */

View File

@@ -4,7 +4,7 @@ namespace MailPoet\Logging;
use MailPoet\Settings\SettingsController;
use MailPoetVendor\Monolog\Handler\AbstractHandler;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
use PHPUnit\Framework\MockObject\MockObject;
class LoggerFactoryTest extends \MailPoetUnitTest {

View File

@@ -4,7 +4,7 @@ namespace MailPoet\Referrals;
use MailPoet\Settings\SettingsController;
use MailPoet\WP\Functions as WPFunctions;
use PHPUnit_Framework_MockObject_MockObject as MockObject;
use PHPUnit\Framework\MockObject\MockObject;
class ReferralDetectorTest extends \MailPoetUnitTest {

View File

@@ -7,7 +7,7 @@ if (!function_exists('__')) {
}
// Fix for mocking WPFunctions
// [PHPUnit_Framework_Exception] Use of undefined constant OBJECT - assumed 'OBJECT' (this will throw an Error in a future version of PHP)
// [PHPUnit\Framework\Exception] Use of undefined constant OBJECT - assumed 'OBJECT' (this will throw an Error in a future version of PHP)
if (!defined('OBJECT')) {
define( 'OBJECT', 'OBJECT' );
}