Add public keyword to methods
[MAILPOET-2413]
This commit is contained in:
@@ -10,7 +10,7 @@ use MailPoet\Models\Subscriber;
|
||||
|
||||
class EmailActionTest extends \MailPoetTest {
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->newsletter = Newsletter::createOrUpdate([
|
||||
'subject' => 'newsletter 1',
|
||||
'status' => 'sent',
|
||||
@@ -38,55 +38,55 @@ class EmailActionTest extends \MailPoetTest {
|
||||
StatisticsClicks::createOrUpdateClickCount(1, $this->subscriber_opened_clicked->id, $this->newsletter->id, 1);
|
||||
}
|
||||
|
||||
function testGetOpened() {
|
||||
public function testGetOpened() {
|
||||
$emailAction = new EmailAction(EmailAction::ACTION_OPENED, $this->newsletter->id);
|
||||
$sql = $emailAction->toSql(Subscriber::selectExpr('*'));
|
||||
expect($sql->count())->equals(2);
|
||||
}
|
||||
|
||||
function testNotOpened() {
|
||||
public function testNotOpened() {
|
||||
$emailAction = new EmailAction(EmailAction::ACTION_NOT_OPENED, $this->newsletter->id);
|
||||
$sql = $emailAction->toSql(Subscriber::selectExpr('*'));
|
||||
expect($sql->count())->equals(1);
|
||||
}
|
||||
|
||||
function testGetClickedWithoutLink() {
|
||||
public function testGetClickedWithoutLink() {
|
||||
$emailAction = new EmailAction(EmailAction::ACTION_CLICKED, $this->newsletter->id);
|
||||
$sql = $emailAction->toSql(Subscriber::selectExpr('*'));
|
||||
expect($sql->count())->equals(1);
|
||||
}
|
||||
|
||||
function testGetClickedWithLink() {
|
||||
public function testGetClickedWithLink() {
|
||||
$emailAction = new EmailAction(EmailAction::ACTION_CLICKED, $this->newsletter->id, 1);
|
||||
$sql = $emailAction->toSql(Subscriber::selectExpr('*'));
|
||||
expect($sql->count())->equals(1);
|
||||
}
|
||||
|
||||
function testGetClickedWithWrongLink() {
|
||||
public function testGetClickedWithWrongLink() {
|
||||
$emailAction = new EmailAction(EmailAction::ACTION_CLICKED, $this->newsletter->id, 2);
|
||||
$sql = $emailAction->toSql(Subscriber::selectExpr('*'));
|
||||
expect($sql->count())->equals(0);
|
||||
}
|
||||
|
||||
function testGetNotClickedWithLink() {
|
||||
public function testGetNotClickedWithLink() {
|
||||
$emailAction = new EmailAction(EmailAction::ACTION_NOT_CLICKED, $this->newsletter->id, 1);
|
||||
$sql = $emailAction->toSql(Subscriber::selectExpr('*'));
|
||||
expect($sql->count())->equals(2);
|
||||
}
|
||||
|
||||
function testGetNotClickedWithWrongLink() {
|
||||
public function testGetNotClickedWithWrongLink() {
|
||||
$emailAction = new EmailAction(EmailAction::ACTION_NOT_CLICKED, $this->newsletter->id, 2);
|
||||
$sql = $emailAction->toSql(Subscriber::selectExpr('*'));
|
||||
expect($sql->count())->equals(3);
|
||||
}
|
||||
|
||||
function testGetNotClickedWithoutLink() {
|
||||
public function testGetNotClickedWithoutLink() {
|
||||
$emailAction = new EmailAction(EmailAction::ACTION_NOT_CLICKED, $this->newsletter->id);
|
||||
$sql = $emailAction->toSql(Subscriber::selectExpr('*'));
|
||||
expect($sql->count())->equals(2);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
$this->cleanData();
|
||||
}
|
||||
|
||||
|
@@ -6,7 +6,7 @@ use MailPoet\Models\Subscriber;
|
||||
|
||||
class UserRoleTest extends \MailPoetTest {
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->cleanData();
|
||||
wp_insert_user([
|
||||
'user_login' => 'user-role-test1',
|
||||
@@ -28,19 +28,19 @@ class UserRoleTest extends \MailPoetTest {
|
||||
]);
|
||||
}
|
||||
|
||||
function testItConstructsQuery() {
|
||||
public function testItConstructsQuery() {
|
||||
$userRole = new UserRole('editor', 'and');
|
||||
$sql = $userRole->toSql(Subscriber::selectExpr('*'));
|
||||
expect($sql->count())->equals(2);
|
||||
}
|
||||
|
||||
function testItDoesntGetSubString() {
|
||||
public function testItDoesntGetSubString() {
|
||||
$userRole = new UserRole('edit', 'and');
|
||||
$sql = $userRole->toSql(Subscriber::selectExpr('*'));
|
||||
expect($sql->count())->equals(0);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
$this->cleanData();
|
||||
}
|
||||
|
||||
|
@@ -8,7 +8,7 @@ use MailPoet\Models\DynamicSegment;
|
||||
|
||||
class AddToNewslettersSegmentsTest extends \MailPoetTest {
|
||||
|
||||
function testItReturnsOriginalArray() {
|
||||
public function testItReturnsOriginalArray() {
|
||||
$dynamic_segment = DynamicSegment::create();
|
||||
$dynamic_segment->hydrate([
|
||||
'name' => 'segment1',
|
||||
@@ -26,7 +26,7 @@ class AddToNewslettersSegmentsTest extends \MailPoetTest {
|
||||
expect($result)->equals([$dynamic_segment]);
|
||||
}
|
||||
|
||||
function testItAddsDynamicSegments() {
|
||||
public function testItAddsDynamicSegments() {
|
||||
$dynamic_segment = DynamicSegment::create();
|
||||
$dynamic_segment->hydrate([
|
||||
'name' => 'segment2',
|
||||
|
@@ -8,7 +8,7 @@ use MailPoet\Models\DynamicSegment;
|
||||
|
||||
class AddToSubscribersFiltersTest extends \MailPoetTest {
|
||||
|
||||
function testItReturnsOriginalArray() {
|
||||
public function testItReturnsOriginalArray() {
|
||||
$original_segment = [
|
||||
'label' => 'segment1',
|
||||
'value' => '',
|
||||
@@ -25,7 +25,7 @@ class AddToSubscribersFiltersTest extends \MailPoetTest {
|
||||
expect($result)->equals([$original_segment]);
|
||||
}
|
||||
|
||||
function testItAddsDynamicSegments() {
|
||||
public function testItAddsDynamicSegments() {
|
||||
$dynamic_segment = DynamicSegment::create();
|
||||
$dynamic_segment->hydrate([
|
||||
'name' => 'segment2',
|
||||
@@ -54,7 +54,7 @@ class AddToSubscribersFiltersTest extends \MailPoetTest {
|
||||
]);
|
||||
}
|
||||
|
||||
function testItSortsTheResult() {
|
||||
public function testItSortsTheResult() {
|
||||
$dynamic_segment1 = DynamicSegment::create();
|
||||
$dynamic_segment1->hydrate([
|
||||
'name' => 'segment b',
|
||||
|
@@ -20,13 +20,13 @@ class SendingNewslettersSubscribersFinderTest extends \MailPoetTest {
|
||||
/** @var SendingNewslettersSubscribersFinder */
|
||||
private $subscribers_in_segments_finder;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->single_segment_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SingleSegmentLoader');
|
||||
$this->subscribers_ids_loader = Stub::makeEmpty('\MailPoet\DynamicSegments\Persistence\Loading\SubscribersIds');
|
||||
$this->subscribers_in_segments_finder = new SendingNewslettersSubscribersFinder($this->single_segment_loader, $this->subscribers_ids_loader);
|
||||
}
|
||||
|
||||
function testFindSubscribersInSegmentReturnsEmptyIfNotDynamic() {
|
||||
public function testFindSubscribersInSegmentReturnsEmptyIfNotDynamic() {
|
||||
$this->single_segment_loader
|
||||
->expects($this->never())
|
||||
->method('load');
|
||||
@@ -40,7 +40,7 @@ class SendingNewslettersSubscribersFinderTest extends \MailPoetTest {
|
||||
expect($result)->count(0);
|
||||
}
|
||||
|
||||
function testFindSubscribersInSegmentReturnsSubscribers() {
|
||||
public function testFindSubscribersInSegmentReturnsSubscribers() {
|
||||
$dynamic_segment = DynamicSegment::create();
|
||||
$dynamic_segment->hydrate([
|
||||
'name' => 'segment 1',
|
||||
@@ -65,7 +65,7 @@ class SendingNewslettersSubscribersFinderTest extends \MailPoetTest {
|
||||
}
|
||||
|
||||
|
||||
function testGetSubscriberIdsInSegmentReturnsEmptyIfNotDynamic() {
|
||||
public function testGetSubscriberIdsInSegmentReturnsEmptyIfNotDynamic() {
|
||||
$this->single_segment_loader
|
||||
->expects($this->never())
|
||||
->method('load');
|
||||
@@ -78,7 +78,7 @@ class SendingNewslettersSubscribersFinderTest extends \MailPoetTest {
|
||||
expect($result)->count(0);
|
||||
}
|
||||
|
||||
function testGetSubscriberIdsInSegmentReturnsSubscribers() {
|
||||
public function testGetSubscriberIdsInSegmentReturnsSubscribers() {
|
||||
$dynamic_segment = DynamicSegment::create();
|
||||
$dynamic_segment->hydrate([
|
||||
'name' => 'segment 2',
|
||||
|
@@ -7,7 +7,7 @@ use MailPoetVendor\Idiorm\ORM;
|
||||
|
||||
class SubscribersBulkActionHandlerTest extends \MailPoetTest {
|
||||
|
||||
function testItReturnsNullWithUnknownSegment() {
|
||||
public function testItReturnsNullWithUnknownSegment() {
|
||||
$segment = [
|
||||
'name' => 'name',
|
||||
'description' => 'desc',
|
||||
@@ -21,7 +21,7 @@ class SubscribersBulkActionHandlerTest extends \MailPoetTest {
|
||||
expect($result)->null();
|
||||
}
|
||||
|
||||
function testItReturnsDataForDynamicSegment() {
|
||||
public function testItReturnsDataForDynamicSegment() {
|
||||
$segment = DynamicSegment::createOrUpdate([
|
||||
'name' => 'name',
|
||||
'description' => 'desc',
|
||||
@@ -35,11 +35,11 @@ class SubscribersBulkActionHandlerTest extends \MailPoetTest {
|
||||
expect($result)->notNull();
|
||||
}
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->cleanData();
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
$this->cleanData();
|
||||
}
|
||||
|
||||
|
@@ -7,7 +7,7 @@ use MailPoetVendor\Idiorm\ORM;
|
||||
|
||||
class SubscribersListingsHandlerFactoryTest extends \MailPoetTest {
|
||||
|
||||
function testItReturnsNullWithUnknownSegment() {
|
||||
public function testItReturnsNullWithUnknownSegment() {
|
||||
$segment = DynamicSegment::create();
|
||||
$segment->id = 1;
|
||||
$segment->name = 'name';
|
||||
@@ -17,7 +17,7 @@ class SubscribersListingsHandlerFactoryTest extends \MailPoetTest {
|
||||
expect($result)->null();
|
||||
}
|
||||
|
||||
function testItReturnsDataForDynamicSegment() {
|
||||
public function testItReturnsDataForDynamicSegment() {
|
||||
$segment = DynamicSegment::createOrUpdate([
|
||||
'name' => 'name',
|
||||
'description' => 'desc',
|
||||
@@ -28,11 +28,11 @@ class SubscribersListingsHandlerFactoryTest extends \MailPoetTest {
|
||||
expect($result)->notNull();
|
||||
}
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->cleanData();
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
$this->cleanData();
|
||||
}
|
||||
|
||||
|
@@ -9,7 +9,7 @@ class FormDataMapperTest extends \MailPoetTest {
|
||||
/** @var FormDataMapper */
|
||||
private $mapper;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->mapper = new FormDataMapper();
|
||||
}
|
||||
|
||||
|
@@ -15,7 +15,7 @@ class LoaderTest extends \MailPoetTest {
|
||||
/** @var Loader */
|
||||
private $loader;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->loader = new Loader(new DBMapper());
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegment::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegmentFilter::$_table);
|
||||
@@ -43,14 +43,14 @@ class LoaderTest extends \MailPoetTest {
|
||||
$filter_data->save();
|
||||
}
|
||||
|
||||
function testItLoadsSegments() {
|
||||
public function testItLoadsSegments() {
|
||||
$data = $this->loader->load();
|
||||
expect($data)->count(2);
|
||||
expect($data[0])->isInstanceOf('\MailPoet\Models\DynamicSegment');
|
||||
expect($data[1])->isInstanceOf('\MailPoet\Models\DynamicSegment');
|
||||
}
|
||||
|
||||
function testItDoesNotLoadTrashedSegments() {
|
||||
public function testItDoesNotLoadTrashedSegments() {
|
||||
$this->segments[0]->trash();
|
||||
$data = $this->loader->load();
|
||||
expect($data)->count(1);
|
||||
@@ -58,7 +58,7 @@ class LoaderTest extends \MailPoetTest {
|
||||
expect($data[0]->name)->equals('segment 2');
|
||||
}
|
||||
|
||||
function testItPopulatesCommonData() {
|
||||
public function testItPopulatesCommonData() {
|
||||
$data = $this->loader->load();
|
||||
expect($data[0]->name)->equals('segment 1');
|
||||
expect($data[1]->name)->equals('segment 2');
|
||||
@@ -66,7 +66,7 @@ class LoaderTest extends \MailPoetTest {
|
||||
expect($data[1]->description)->equals('description');
|
||||
}
|
||||
|
||||
function testItPopulatesFilters() {
|
||||
public function testItPopulatesFilters() {
|
||||
$data = $this->loader->load();
|
||||
$filters0 = $data[0]->getFilters();
|
||||
$filters1 = $data[1]->getFilters();
|
||||
@@ -78,7 +78,7 @@ class LoaderTest extends \MailPoetTest {
|
||||
expect($filters1[0]->getRole())->equals('Administrator');
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegment::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegmentFilter::$_table);
|
||||
}
|
||||
|
@@ -15,7 +15,7 @@ class SingleSegmentLoaderTest extends \MailPoetTest {
|
||||
/** @var SingleSegmentLoader */
|
||||
private $loader;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->loader = new SingleSegmentLoader(new DBMapper());
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegment::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegmentFilter::$_table);
|
||||
@@ -32,23 +32,23 @@ class SingleSegmentLoaderTest extends \MailPoetTest {
|
||||
$filter_data->save();
|
||||
}
|
||||
|
||||
function testItLoadsSegments() {
|
||||
public function testItLoadsSegments() {
|
||||
$data = $this->loader->load($this->segment->id);
|
||||
expect($data)->isInstanceOf('\MailPoet\Models\DynamicSegment');
|
||||
}
|
||||
|
||||
function testItThrowsForUnknownSegment() {
|
||||
public function testItThrowsForUnknownSegment() {
|
||||
$this->setExpectedException('InvalidArgumentException');
|
||||
$this->loader->load($this->segment->id + 11564564);
|
||||
}
|
||||
|
||||
function testItPopulatesCommonData() {
|
||||
public function testItPopulatesCommonData() {
|
||||
$data = $this->loader->load($this->segment->id);
|
||||
expect($data->name)->equals('segment 1');
|
||||
expect($data->description)->equals('description');
|
||||
}
|
||||
|
||||
function testItPopulatesFilters() {
|
||||
public function testItPopulatesFilters() {
|
||||
$data = $this->loader->load($this->segment->id);
|
||||
$filters0 = $data->getFilters();
|
||||
expect($filters0)->count(1);
|
||||
@@ -56,7 +56,7 @@ class SingleSegmentLoaderTest extends \MailPoetTest {
|
||||
expect($filters0[0]->getRole())->equals('Administrator');
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegment::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegmentFilter::$_table);
|
||||
}
|
||||
|
@@ -13,7 +13,7 @@ class SubscribersCountTest extends \MailPoetTest {
|
||||
/** @var RequirementsChecker|\PHPUnit_Framework_MockObject_MockObject */
|
||||
private $requirement_checker;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->cleanData();
|
||||
wp_insert_user([
|
||||
'user_login' => 'user-role-test1',
|
||||
@@ -39,7 +39,7 @@ class SubscribersCountTest extends \MailPoetTest {
|
||||
->getMock();
|
||||
}
|
||||
|
||||
function testItConstructsQuery() {
|
||||
public function testItConstructsQuery() {
|
||||
$this->requirement_checker->method('shouldSkipSegment')->willReturn(false);
|
||||
$userRole = DynamicSegment::create();
|
||||
$userRole->hydrate([
|
||||
@@ -53,7 +53,7 @@ class SubscribersCountTest extends \MailPoetTest {
|
||||
expect($count)->equals(2);
|
||||
}
|
||||
|
||||
function testItSkipsIfRequirementNotMet() {
|
||||
public function testItSkipsIfRequirementNotMet() {
|
||||
$this->requirement_checker->method('shouldSkipSegment')->willReturn(true);
|
||||
$userRole = DynamicSegment::create();
|
||||
$userRole->hydrate([
|
||||
@@ -67,7 +67,7 @@ class SubscribersCountTest extends \MailPoetTest {
|
||||
expect($count)->equals(0);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
$this->cleanData();
|
||||
}
|
||||
|
||||
|
@@ -16,7 +16,7 @@ class SubscribersIdsTest extends \MailPoetTest {
|
||||
/** @var RequirementsChecker|\PHPUnit_Framework_MockObject_MockObject */
|
||||
private $requirement_checker;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->cleanData();
|
||||
$this->editors_wp_ids[] = wp_insert_user([
|
||||
'user_login' => 'user-role-test1',
|
||||
@@ -42,7 +42,7 @@ class SubscribersIdsTest extends \MailPoetTest {
|
||||
->getMock();
|
||||
}
|
||||
|
||||
function testItConstructsSubscribersIdQueryForAnyDynamicSegment() {
|
||||
public function testItConstructsSubscribersIdQueryForAnyDynamicSegment() {
|
||||
$this->requirement_checker->method('shouldSkipSegment')->willReturn(false);
|
||||
$userRole = DynamicSegment::create();
|
||||
$userRole->hydrate([
|
||||
@@ -59,7 +59,7 @@ class SubscribersIdsTest extends \MailPoetTest {
|
||||
$this->assertEquals($wp_ids, $this->editors_wp_ids, $message = '', $delta = 0.0, $maxDepth = 10, $canonicalize = true);
|
||||
}
|
||||
|
||||
function testItSkipsConstructingSubscribersIdQueryForAnyDynamicSegmentIfRequirementsNotMet() {
|
||||
public function testItSkipsConstructingSubscribersIdQueryForAnyDynamicSegmentIfRequirementsNotMet() {
|
||||
$this->requirement_checker->method('shouldSkipSegment')->willReturn(true);
|
||||
$userRole = DynamicSegment::create();
|
||||
$userRole->hydrate([
|
||||
@@ -72,7 +72,7 @@ class SubscribersIdsTest extends \MailPoetTest {
|
||||
expect($result)->isEmpty();
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
$this->cleanData();
|
||||
}
|
||||
|
||||
|
@@ -13,18 +13,18 @@ class SaverTest extends \MailPoetTest {
|
||||
/** @var Saver */
|
||||
private $saver;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->saver = new Saver();
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegment::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegmentFilter::$_table);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegment::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . DynamicSegmentFilter::$_table);
|
||||
}
|
||||
|
||||
function testItSavesSegment() {
|
||||
public function testItSavesSegment() {
|
||||
$dynamic_segment = DynamicSegment::create();
|
||||
$dynamic_segment->hydrate([
|
||||
'name' => 'segment 1',
|
||||
@@ -36,7 +36,7 @@ class SaverTest extends \MailPoetTest {
|
||||
expect($loaded->description)->equals('desc');
|
||||
}
|
||||
|
||||
function testItThrowsOnDuplicateSegment() {
|
||||
public function testItThrowsOnDuplicateSegment() {
|
||||
$dynamic_segment1 = DynamicSegment::createOrUpdate([
|
||||
'name' => 'segment 1',
|
||||
'description' => 'description',
|
||||
@@ -51,7 +51,7 @@ class SaverTest extends \MailPoetTest {
|
||||
$this->saver->save($dynamic_segment2);
|
||||
}
|
||||
|
||||
function testItSavesFilters() {
|
||||
public function testItSavesFilters() {
|
||||
$dynamic_segment = DynamicSegment::create();
|
||||
$dynamic_segment->hydrate([
|
||||
'name' => 'segment 1',
|
||||
|
Reference in New Issue
Block a user