Add public keyword to methods
[MAILPOET-2413]
This commit is contained in:
@@ -10,13 +10,13 @@ use MailPoet\Subscription\Pages;
|
||||
use MailPoet\WP\Functions as WPFunctions;
|
||||
|
||||
class SubscriptionTest extends \MailPoetTest {
|
||||
function _before() {
|
||||
public function _before() {
|
||||
$this->data = [];
|
||||
// instantiate class
|
||||
$this->subscription = ContainerWrapper::getInstance()->get(Subscription::class);
|
||||
}
|
||||
|
||||
function testItDisplaysConfirmPage() {
|
||||
public function testItDisplaysConfirmPage() {
|
||||
$pages = Stub::make(Pages::class, [
|
||||
'wp' => new WPFunctions,
|
||||
'confirm' => Expected::exactly(1),
|
||||
@@ -25,7 +25,7 @@ class SubscriptionTest extends \MailPoetTest {
|
||||
$subscription->confirm($this->data);
|
||||
}
|
||||
|
||||
function testItDisplaysManagePage() {
|
||||
public function testItDisplaysManagePage() {
|
||||
$pages = Stub::make(Pages::class, [
|
||||
'wp' => new WPFunctions,
|
||||
'getManageLink' => Expected::exactly(1),
|
||||
@@ -37,7 +37,7 @@ class SubscriptionTest extends \MailPoetTest {
|
||||
do_shortcode('[mailpoet_manage_subscription]');
|
||||
}
|
||||
|
||||
function testItDisplaysUnsubscribePage() {
|
||||
public function testItDisplaysUnsubscribePage() {
|
||||
$pages = Stub::make(Pages::class, [
|
||||
'wp' => new WPFunctions,
|
||||
'unsubscribe' => Expected::exactly(1),
|
||||
|
@@ -19,7 +19,7 @@ use MailPoet\Util\Cookies;
|
||||
use MailPoetVendor\Idiorm\ORM;
|
||||
|
||||
class TrackTest extends \MailPoetTest {
|
||||
function _before() {
|
||||
public function _before() {
|
||||
parent::_before();
|
||||
// create newsletter
|
||||
$newsletter = Newsletter::create();
|
||||
@@ -58,7 +58,7 @@ class TrackTest extends \MailPoetTest {
|
||||
$this->track = new Track(new Clicks(SettingsController::getInstance(), new Cookies()), new Opens(), new LinkTokens());
|
||||
}
|
||||
|
||||
function testItReturnsFalseWhenTrackDataIsMissing() {
|
||||
public function testItReturnsFalseWhenTrackDataIsMissing() {
|
||||
// queue ID is required
|
||||
$data = $this->track_data;
|
||||
unset($data['queue_id']);
|
||||
@@ -73,7 +73,7 @@ class TrackTest extends \MailPoetTest {
|
||||
expect($this->track->_processTrackData($data))->false();
|
||||
}
|
||||
|
||||
function testItFailsWhenSubscriberTokenDoesNotMatch() {
|
||||
public function testItFailsWhenSubscriberTokenDoesNotMatch() {
|
||||
$data = (object)array_merge(
|
||||
$this->track_data,
|
||||
[
|
||||
@@ -92,7 +92,7 @@ class TrackTest extends \MailPoetTest {
|
||||
$track->_validateTrackData($data);
|
||||
}
|
||||
|
||||
function testItFailsWhenSubscriberIsNotOnProcessedList() {
|
||||
public function testItFailsWhenSubscriberIsNotOnProcessedList() {
|
||||
$data = (object)array_merge(
|
||||
$this->track_data,
|
||||
[
|
||||
@@ -105,7 +105,7 @@ class TrackTest extends \MailPoetTest {
|
||||
expect($this->track->_validateTrackData($data))->false();
|
||||
}
|
||||
|
||||
function testItDoesNotRequireWpUsersToBeOnProcessedListWhenPreviewIsEnabled() {
|
||||
public function testItDoesNotRequireWpUsersToBeOnProcessedListWhenPreviewIsEnabled() {
|
||||
$data = (object)array_merge(
|
||||
$this->track_data,
|
||||
[
|
||||
@@ -119,7 +119,7 @@ class TrackTest extends \MailPoetTest {
|
||||
expect($this->track->_validateTrackData($data))->equals($data);
|
||||
}
|
||||
|
||||
function testItRequiresValidQueueToGetNewsletter() {
|
||||
public function testItRequiresValidQueueToGetNewsletter() {
|
||||
$data = $this->track_data;
|
||||
$data['newsletter_id'] = false;
|
||||
$data['queue_id'] = 99;
|
||||
@@ -127,14 +127,14 @@ class TrackTest extends \MailPoetTest {
|
||||
expect($processed_data)->false();
|
||||
}
|
||||
|
||||
function testItGetsNewsletterFromQueue() {
|
||||
public function testItGetsNewsletterFromQueue() {
|
||||
$data = $this->track_data;
|
||||
$data['newsletter_id'] = false;
|
||||
$processed_data = $this->track->_processTrackData($data);
|
||||
expect($processed_data->newsletter->id)->equals($this->newsletter->id);
|
||||
}
|
||||
|
||||
function testItProcessesTrackData() {
|
||||
public function testItProcessesTrackData() {
|
||||
$processed_data = $this->track->_processTrackData($this->track_data);
|
||||
expect($processed_data->queue->id)->equals($this->queue->id);
|
||||
expect($processed_data->subscriber->id)->equals($this->subscriber->id);
|
||||
@@ -142,7 +142,7 @@ class TrackTest extends \MailPoetTest {
|
||||
expect($processed_data->link->id)->equals($this->link->id);
|
||||
}
|
||||
|
||||
function testItGetsProperHashWhenDuplicateHashesExist() {
|
||||
public function testItGetsProperHashWhenDuplicateHashesExist() {
|
||||
// create another newsletter and queue
|
||||
$newsletter = Newsletter::create();
|
||||
$newsletter->type = 'type';
|
||||
@@ -171,7 +171,7 @@ class TrackTest extends \MailPoetTest {
|
||||
expect($processed_data->link->id)->equals($link->id);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . NewsletterLink::$_table);
|
||||
|
@@ -18,7 +18,7 @@ use MailPoet\WP\Functions;
|
||||
use MailPoetVendor\Idiorm\ORM;
|
||||
|
||||
class ViewInBrowserTest extends \MailPoetTest {
|
||||
function _before() {
|
||||
public function _before() {
|
||||
parent::_before();
|
||||
// create newsletter
|
||||
$newsletter = Newsletter::create();
|
||||
@@ -49,7 +49,7 @@ class ViewInBrowserTest extends \MailPoetTest {
|
||||
$this->view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji());
|
||||
}
|
||||
|
||||
function testItAbortsWhenBrowserPreviewDataIsMissing() {
|
||||
public function testItAbortsWhenBrowserPreviewDataIsMissing() {
|
||||
$view_in_browser = Stub::make($this->view_in_browser, [
|
||||
'_abort' => Expected::exactly(2),
|
||||
], $this);
|
||||
@@ -63,7 +63,7 @@ class ViewInBrowserTest extends \MailPoetTest {
|
||||
$view_in_browser->_processBrowserPreviewData($data);
|
||||
}
|
||||
|
||||
function testItAbortsWhenBrowserPreviewDataIsInvalid() {
|
||||
public function testItAbortsWhenBrowserPreviewDataIsInvalid() {
|
||||
$view_in_browser = Stub::make($this->view_in_browser, [
|
||||
'link_tokens' => new LinkTokens,
|
||||
'_abort' => Expected::exactly(3),
|
||||
@@ -83,7 +83,7 @@ class ViewInBrowserTest extends \MailPoetTest {
|
||||
// subscriber has not received the newsletter
|
||||
}
|
||||
|
||||
function testItFailsValidationWhenSubscriberTokenDoesNotMatch() {
|
||||
public function testItFailsValidationWhenSubscriberTokenDoesNotMatch() {
|
||||
$subscriber = $this->subscriber;
|
||||
$subscriber->email = 'random@email.com';
|
||||
$subscriber->save();
|
||||
@@ -99,13 +99,13 @@ class ViewInBrowserTest extends \MailPoetTest {
|
||||
expect($this->view_in_browser->_validateBrowserPreviewData($data))->false();
|
||||
}
|
||||
|
||||
function testItFailsValidationWhenNewsletterIdIsProvidedButSubscriberDoesNotExist() {
|
||||
public function testItFailsValidationWhenNewsletterIdIsProvidedButSubscriberDoesNotExist() {
|
||||
$data = (object)$this->browser_preview_data;
|
||||
$data->subscriber_id = false;
|
||||
expect($this->view_in_browser->_validateBrowserPreviewData($data))->false();
|
||||
}
|
||||
|
||||
function testItValidatesThatNewsletterExistsByCheckingHashFirst() {
|
||||
public function testItValidatesThatNewsletterExistsByCheckingHashFirst() {
|
||||
$newsletter_1 = $this->newsletter;
|
||||
$newsletter_2 = Newsletter::create();
|
||||
$newsletter_2->type = 'type';
|
||||
@@ -119,14 +119,14 @@ class ViewInBrowserTest extends \MailPoetTest {
|
||||
expect($result->newsletter->id)->equals($newsletter_1->id);
|
||||
}
|
||||
|
||||
function testItFailsValidationWhenPreviewIsEnabledButNewsletterHashNotProvided() {
|
||||
public function testItFailsValidationWhenPreviewIsEnabledButNewsletterHashNotProvided() {
|
||||
$data = (object)$this->browser_preview_data;
|
||||
$data->newsletter_hash = false;
|
||||
$data->preview = true;
|
||||
expect($this->view_in_browser->_validateBrowserPreviewData($data))->false();
|
||||
}
|
||||
|
||||
function testItFailsValidationWhenSubscriberIsNotOnProcessedList() {
|
||||
public function testItFailsValidationWhenSubscriberIsNotOnProcessedList() {
|
||||
$data = (object)$this->browser_preview_data;
|
||||
$result = $this->view_in_browser->_validateBrowserPreviewData($data);
|
||||
expect($result)->notEmpty();
|
||||
@@ -138,7 +138,7 @@ class ViewInBrowserTest extends \MailPoetTest {
|
||||
expect($result)->false();
|
||||
}
|
||||
|
||||
function testItDoesNotRequireWpAdministratorToBeOnProcessedListWhenPreviewIsEnabled() {
|
||||
public function testItDoesNotRequireWpAdministratorToBeOnProcessedListWhenPreviewIsEnabled() {
|
||||
$view_in_browser = $this->view_in_browser;
|
||||
$data = (object)array_merge(
|
||||
$this->browser_preview_data,
|
||||
@@ -165,7 +165,7 @@ class ViewInBrowserTest extends \MailPoetTest {
|
||||
expect($view_in_browser->_validateBrowserPreviewData($data))->equals($data);
|
||||
}
|
||||
|
||||
function testItSetsSubscriberToLoggedInWPUserWhenPreviewIsEnabled() {
|
||||
public function testItSetsSubscriberToLoggedInWPUserWhenPreviewIsEnabled() {
|
||||
$view_in_browser = $this->view_in_browser;
|
||||
$data = (object)array_merge(
|
||||
$this->browser_preview_data,
|
||||
@@ -182,7 +182,7 @@ class ViewInBrowserTest extends \MailPoetTest {
|
||||
expect($result->subscriber->id)->equals(1);
|
||||
}
|
||||
|
||||
function testItGetsOrFindsQueueWhenItIsNotAWelcomeEmail() {
|
||||
public function testItGetsOrFindsQueueWhenItIsNotAWelcomeEmail() {
|
||||
$data = (object)$this->browser_preview_data;
|
||||
// queue will be found when not defined
|
||||
$data->queue_id = null;
|
||||
@@ -201,14 +201,14 @@ class ViewInBrowserTest extends \MailPoetTest {
|
||||
expect($result->queue)->false();
|
||||
}
|
||||
|
||||
function testItProcessesBrowserPreviewData() {
|
||||
public function testItProcessesBrowserPreviewData() {
|
||||
$processed_data = $this->view_in_browser->_processBrowserPreviewData($this->browser_preview_data);
|
||||
expect($processed_data->queue->id)->equals($this->queue->id);
|
||||
expect($processed_data->subscriber->id)->equals($this->subscriber->id);
|
||||
expect($processed_data->newsletter->id)->equals($this->newsletter->id);
|
||||
}
|
||||
|
||||
function testItReturnsViewActionResult() {
|
||||
public function testItReturnsViewActionResult() {
|
||||
$view_in_browser = Stub::make($this->view_in_browser, [
|
||||
'link_tokens' => new LinkTokens,
|
||||
'_displayNewsletter' => Expected::exactly(1),
|
||||
@@ -218,7 +218,7 @@ class ViewInBrowserTest extends \MailPoetTest {
|
||||
$view_in_browser->view($this->browser_preview_data);
|
||||
}
|
||||
|
||||
function _after() {
|
||||
public function _after() {
|
||||
ORM::raw_execute('TRUNCATE ' . Newsletter::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . Subscriber::$_table);
|
||||
ORM::raw_execute('TRUNCATE ' . ScheduledTask::$_table);
|
||||
|
@@ -20,7 +20,7 @@ class RouterTest extends \MailPoetTest {
|
||||
/** @var Container */
|
||||
private $container;
|
||||
|
||||
function _before() {
|
||||
public function _before() {
|
||||
parent::_before();
|
||||
$this->router_data = [
|
||||
Router::NAME => '',
|
||||
@@ -36,7 +36,7 @@ class RouterTest extends \MailPoetTest {
|
||||
$this->router = new Router($this->access_control, $this->container, $this->router_data);
|
||||
}
|
||||
|
||||
function testItCanGetAPIDataFromGetRequest() {
|
||||
public function testItCanGetAPIDataFromGetRequest() {
|
||||
$data = ['data' => 'dummy data'];
|
||||
$url = 'http://example.com/?' . Router::NAME . '&endpoint=view_in_browser&action=view&data='
|
||||
. base64_encode(json_encode($data));
|
||||
@@ -48,7 +48,7 @@ class RouterTest extends \MailPoetTest {
|
||||
expect($router->data)->equals($data);
|
||||
}
|
||||
|
||||
function testItContinuesExecutionWhenAPIRequestNotDetected() {
|
||||
public function testItContinuesExecutionWhenAPIRequestNotDetected() {
|
||||
$router_data = $this->router_data;
|
||||
unset($router_data[Router::NAME]);
|
||||
$router = Stub::construct(
|
||||
@@ -59,7 +59,7 @@ class RouterTest extends \MailPoetTest {
|
||||
expect($result)->null();
|
||||
}
|
||||
|
||||
function testItTerminatesRequestWhenEndpointNotFound() {
|
||||
public function testItTerminatesRequestWhenEndpointNotFound() {
|
||||
$router_data = $this->router_data;
|
||||
$router_data['endpoint'] = 'invalid_endpoint';
|
||||
$router = Stub::construct(
|
||||
@@ -83,7 +83,7 @@ class RouterTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function testItTerminatesRequestWhenEndpointActionNotFound() {
|
||||
public function testItTerminatesRequestWhenEndpointActionNotFound() {
|
||||
$router_data = $this->router_data;
|
||||
$router_data['action'] = 'invalid_action';
|
||||
$router = Stub::construct(
|
||||
@@ -107,7 +107,7 @@ class RouterTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function testItValidatesGlobalPermission() {
|
||||
public function testItValidatesGlobalPermission() {
|
||||
$router = $this->router;
|
||||
|
||||
$permissions = [
|
||||
@@ -138,7 +138,7 @@ class RouterTest extends \MailPoetTest {
|
||||
expect($router->validatePermissions(null, $permissions))->true();
|
||||
}
|
||||
|
||||
function testItValidatesEndpointActionPermission() {
|
||||
public function testItValidatesEndpointActionPermission() {
|
||||
$router = $this->router;
|
||||
|
||||
$permissions = [
|
||||
@@ -173,7 +173,7 @@ class RouterTest extends \MailPoetTest {
|
||||
expect($router->validatePermissions('test', $permissions))->true();
|
||||
}
|
||||
|
||||
function testItValidatesPermissionBeforeProcessingEndpointAction() {
|
||||
public function testItValidatesPermissionBeforeProcessingEndpointAction() {
|
||||
$router = Stub::construct(
|
||||
'\MailPoet\Router\Router',
|
||||
[$this->access_control, $this->container, $this->router_data],
|
||||
@@ -195,7 +195,7 @@ class RouterTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function testItReturnsForbiddenResponseWhenPermissionFailsValidation() {
|
||||
public function testItReturnsForbiddenResponseWhenPermissionFailsValidation() {
|
||||
$router = Stub::construct(
|
||||
'\MailPoet\Router\Router',
|
||||
[$this->access_control, $this->container, $this->router_data],
|
||||
@@ -218,18 +218,18 @@ class RouterTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function testItCallsEndpointAction() {
|
||||
public function testItCallsEndpointAction() {
|
||||
$data = ['data' => 'dummy data'];
|
||||
$result = $this->router->init();
|
||||
expect($result)->equals($data);
|
||||
}
|
||||
|
||||
function testItExecutesUrlParameterConflictResolverAction() {
|
||||
public function testItExecutesUrlParameterConflictResolverAction() {
|
||||
$this->router->init();
|
||||
expect((boolean)did_action('mailpoet_conflict_resolver_router_url_query_parameters'))->true();
|
||||
}
|
||||
|
||||
function testItCanEncodeRequestData() {
|
||||
public function testItCanEncodeRequestData() {
|
||||
$data = ['data' => 'dummy data'];
|
||||
$result = Router::encodeRequestData($data);
|
||||
expect($result)->equals(
|
||||
@@ -237,25 +237,25 @@ class RouterTest extends \MailPoetTest {
|
||||
);
|
||||
}
|
||||
|
||||
function testItReturnsEmptyArrayWhenRequestDataIsAString() {
|
||||
public function testItReturnsEmptyArrayWhenRequestDataIsAString() {
|
||||
$encoded_data = 'test';
|
||||
$result = Router::decodeRequestData($encoded_data);
|
||||
expect($result)->equals([]);
|
||||
}
|
||||
|
||||
function testItCanDecodeRequestData() {
|
||||
public function testItCanDecodeRequestData() {
|
||||
$data = ['data' => 'dummy data'];
|
||||
$encoded_data = rtrim(base64_encode(json_encode($data)), '=');
|
||||
$result = Router::decodeRequestData($encoded_data);
|
||||
expect($result)->equals($data);
|
||||
}
|
||||
|
||||
function testItCanConvertInvalidRequestDataToArray() {
|
||||
public function testItCanConvertInvalidRequestDataToArray() {
|
||||
$result = Router::decodeRequestData('some_invalid_data');
|
||||
expect($result)->equals([]);
|
||||
}
|
||||
|
||||
function testItCanBuildRequest() {
|
||||
public function testItCanBuildRequest() {
|
||||
$data = ['data' => 'dummy data'];
|
||||
$encoded_data = rtrim(base64_encode(json_encode($data)), '=');
|
||||
$result = Router::buildRequest(
|
||||
|
@@ -14,7 +14,7 @@ class RouterTestMockEndpoint {
|
||||
'global' => AccessControl::NO_ACCESS_RESTRICTION,
|
||||
];
|
||||
|
||||
function test($data) {
|
||||
public function test($data) {
|
||||
return $data;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user