Fix types by casting [MAILPOET-2488]

This commit is contained in:
wxa
2019-12-26 18:03:32 +03:00
committed by amine-mp
parent c493a43c35
commit bd1a84c5c3
25 changed files with 41 additions and 41 deletions

View File

@ -974,7 +974,7 @@ class NewslettersTest extends \MailPoetTest {
public function testItGeneratesPreviewLinksWithNewsletterHashAndNoSubscriberData() { public function testItGeneratesPreviewLinksWithNewsletterHashAndNoSubscriberData() {
$response = $this->endpoint->listing(); $response = $this->endpoint->listing();
$preview_link = $response->data[0]['preview_url']; $preview_link = $response->data[0]['preview_url'];
parse_str(parse_url($preview_link, PHP_URL_QUERY), $preview_link_data); parse_str((string)parse_url($preview_link, PHP_URL_QUERY), $preview_link_data);
$preview_link_data = Url::transformUrlDataObject(Router::decodeRequestData($preview_link_data['data'])); $preview_link_data = Url::transformUrlDataObject(Router::decodeRequestData($preview_link_data['data']));
expect($preview_link_data['newsletter_hash'])->notEmpty(); expect($preview_link_data['newsletter_hash'])->notEmpty();
expect($preview_link_data['subscriber_id'])->false(); expect($preview_link_data['subscriber_id'])->false();

View File

@ -122,7 +122,7 @@ class SendingQueueTest extends \MailPoetTest {
->findOne(); ->findOne();
if (!$newsletter_option) { if (!$newsletter_option) {
$newsletter_option = NewsletterOption::create(); $newsletter_option = NewsletterOption::create();
$newsletter_option->option_field_id = $newsletter_option_field->id; $newsletter_option->option_field_id = (int)$newsletter_option_field->id;
$newsletter_option->newsletter_id = $newsletter_id; $newsletter_option->newsletter_id = $newsletter_id;
} }
$newsletter_option->value = $value; $newsletter_option->value = $value;

View File

@ -805,7 +805,7 @@ class SubscribersTest extends \MailPoetTest {
expect($newsletter_option_field->getErrors())->false(); expect($newsletter_option_field->getErrors())->false();
$newsletter_option = NewsletterOption::create(); $newsletter_option = NewsletterOption::create();
$newsletter_option->option_field_id = $newsletter_option_field->id; $newsletter_option->option_field_id = (int)$newsletter_option_field->id;
$newsletter_option->newsletter_id = $welcome_newsletter->id; $newsletter_option->newsletter_id = $welcome_newsletter->id;
$newsletter_option->value = $value; $newsletter_option->value = $value;
$newsletter_option->save(); $newsletter_option->save();

View File

@ -52,8 +52,8 @@ class ShortcodesTest extends \MailPoetTest {
$link = $link->attr('href'); $link = $link->attr('href');
expect($link)->contains('endpoint=view_in_browser'); expect($link)->contains('endpoint=view_in_browser');
// request data object contains newsletter hash but not newsletter id // request data object contains newsletter hash but not newsletter id
$parsed_link = parse_url($link); $parsed_link = parse_url($link, PHP_URL_QUERY);
parse_str(html_entity_decode($parsed_link['query']), $data); parse_str(html_entity_decode((string)$parsed_link), $data);
$request_data = Url::transformUrlDataObject( $request_data = Url::transformUrlDataObject(
Router::decodeRequestData($data['data']) Router::decodeRequestData($data['data'])
); );

View File

@ -110,7 +110,7 @@ class CronWorkerRunnerTest extends \MailPoetTest {
expect($result)->true(); expect($result)->true();
$scheduled_at = $task->scheduled_at; $scheduled_at = $task->scheduled_at;
$task->updated_at = Carbon::createFromTimestamp((int)strtotime($task->updated_at)) $task->updated_at = Carbon::createFromTimestamp((int)strtotime((string)$task->updated_at))
->subMinutes(CronWorkerRunner::TASK_RUN_TIMEOUT + 1); ->subMinutes(CronWorkerRunner::TASK_RUN_TIMEOUT + 1);
$task->save(); $task->save();

View File

@ -84,7 +84,7 @@ class SendingQueueTest extends \MailPoetTest {
$this->segment->save(); $this->segment->save();
$this->subscriber_segment = SubscriberSegment::create(); $this->subscriber_segment = SubscriberSegment::create();
$this->subscriber_segment->subscriber_id = $this->subscriber->id; $this->subscriber_segment->subscriber_id = $this->subscriber->id;
$this->subscriber_segment->segment_id = $this->segment->id; $this->subscriber_segment->segment_id = (int)$this->segment->id;
$this->subscriber_segment->save(); $this->subscriber_segment->save();
$this->newsletter = Newsletter::create(); $this->newsletter = Newsletter::create();
$this->newsletter->type = Newsletter::TYPE_STANDARD; $this->newsletter->type = Newsletter::TYPE_STANDARD;
@ -94,7 +94,7 @@ class SendingQueueTest extends \MailPoetTest {
$this->newsletter->save(); $this->newsletter->save();
$this->newsletter_segment = NewsletterSegment::create(); $this->newsletter_segment = NewsletterSegment::create();
$this->newsletter_segment->newsletter_id = $this->newsletter->id; $this->newsletter_segment->newsletter_id = $this->newsletter->id;
$this->newsletter_segment->segment_id = $this->segment->id; $this->newsletter_segment->segment_id = (int)$this->segment->id;
$this->newsletter_segment->save(); $this->newsletter_segment->save();
$this->queue = SendingTask::create(); $this->queue = SendingTask::create();
$this->queue->newsletter_id = $this->newsletter->id; $this->queue->newsletter_id = $this->newsletter->id;

View File

@ -58,7 +58,7 @@ class SimpleWorkerTest extends \MailPoetTest {
$next_run_date = (new MockSimpleWorker())->getNextRunDate(); $next_run_date = (new MockSimpleWorker())->getNextRunDate();
$difference = $next_run_date->diffInDays($current_date); $difference = $next_run_date->diffInDays($current_date);
// Subtract days left in the current week // Subtract days left in the current week
$difference -= (Carbon::DAYS_PER_WEEK - $current_date->format('N')); $difference -= (Carbon::DAYS_PER_WEEK - (int)$current_date->format('N'));
expect($difference)->lessOrEquals(7); expect($difference)->lessOrEquals(7);
expect($difference)->greaterOrEquals(0); expect($difference)->greaterOrEquals(0);
} }

View File

@ -184,7 +184,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
$statistics->newsletter_id = $click->newsletter_id; $statistics->newsletter_id = $click->newsletter_id;
$statistics->subscriber_id = $click->subscriber_id; $statistics->subscriber_id = $click->subscriber_id;
$statistics->queue_id = $click->queue_id; $statistics->queue_id = $click->queue_id;
$statistics->click_id = $click->id; $statistics->click_id = (int)$click->id;
$statistics->order_id = $id; $statistics->order_id = $id;
$statistics->order_currency = 'EUR'; $statistics->order_currency = 'EUR';
$statistics->order_price_total = 123.0; $statistics->order_price_total = 123.0;

View File

@ -289,7 +289,7 @@ class NewsletterTest extends \MailPoetTest {
$option_field->save(); $option_field->save();
$association = NewsletterOption::create(); $association = NewsletterOption::create();
$association->newsletter_id = $this->newsletter->id; $association->newsletter_id = $this->newsletter->id;
$association->option_field_id = $option_field->id; $association->option_field_id = (int)$option_field->id;
$association->value = 'list'; $association->value = 'list';
$association->save(); $association->save();
$newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_WELCOME) $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_WELCOME)

View File

@ -92,7 +92,7 @@ class SendingQueueTest extends \MailPoetTest {
$queue = SendingQueue::findOne($queue->id); $queue = SendingQueue::findOne($queue->id);
expect(Helpers::isJson($queue->meta))->true(); expect(Helpers::isJson($queue->meta))->true();
expect(json_decode($queue->meta, true))->equals($meta); expect(json_decode((string)$queue->meta, true))->equals($meta);
} }
public function testItDoesNotJsonEncodesMetaEqualToNull() { public function testItDoesNotJsonEncodesMetaEqualToNull() {

View File

@ -764,7 +764,7 @@ class SubscriberTest extends \MailPoetTest {
$segment[$i]->save(); $segment[$i]->save();
$subscriber_segment[$i] = SubscriberSegment::create(); $subscriber_segment[$i] = SubscriberSegment::create();
$subscriber_segment[$i]->subscriber_id = $subscriber[$i]->id; $subscriber_segment[$i]->subscriber_id = $subscriber[$i]->id;
$subscriber_segment[$i]->segment_id = $segment[$i]->id; $subscriber_segment[$i]->segment_id = (int)$segment[$i]->id;
$subscriber_segment[$i]->save(); $subscriber_segment[$i]->save();
} }
return [ return [

View File

@ -25,7 +25,7 @@ class RendererTest extends \MailPoetTest {
parent::__construct(); parent::__construct();
$this->newsletter = [ $this->newsletter = [
'body' => json_decode( 'body' => json_decode(
file_get_contents(dirname(__FILE__) . '/RendererTestData.json'), true (string)file_get_contents(dirname(__FILE__) . '/RendererTestData.json'), true
), ),
'id' => 1, 'id' => 1,
'subject' => 'Some subject', 'subject' => 'Some subject',

View File

@ -205,7 +205,7 @@ class AutomaticEmailTest extends \MailPoetTest {
} }
$newsletter_option = NewsletterOption::create(); $newsletter_option = NewsletterOption::create();
$newsletter_option->option_field_id = $newsletter_option_field->id; $newsletter_option->option_field_id = (int)$newsletter_option_field->id;
$newsletter_option->newsletter_id = $newsletter_id; $newsletter_option->newsletter_id = $newsletter_id;
$newsletter_option->value = $value; $newsletter_option->value = $value;
$newsletter_option->save(); $newsletter_option->save();

View File

@ -322,7 +322,7 @@ class PostNotificationTest extends \MailPoetTest {
} }
$newsletter_option = NewsletterOption::create(); $newsletter_option = NewsletterOption::create();
$newsletter_option->option_field_id = $newsletter_option_field->id; $newsletter_option->option_field_id = (int)$newsletter_option_field->id;
$newsletter_option->newsletter_id = $newsletter_id; $newsletter_option->newsletter_id = $newsletter_id;
$newsletter_option->value = $value; $newsletter_option->value = $value;
$newsletter_option->save(); $newsletter_option->save();

View File

@ -94,7 +94,7 @@ class SchedulerTest extends \MailPoetTest {
} }
$newsletter_option = NewsletterOption::create(); $newsletter_option = NewsletterOption::create();
$newsletter_option->option_field_id = $newsletter_option_field->id; $newsletter_option->option_field_id = (int)$newsletter_option_field->id;
$newsletter_option->newsletter_id = $newsletter_id; $newsletter_option->newsletter_id = $newsletter_id;
$newsletter_option->value = $value; $newsletter_option->value = $value;
$newsletter_option->save(); $newsletter_option->save();

View File

@ -299,7 +299,7 @@ class WelcomeTest extends \MailPoetTest {
} }
$newsletter_option = NewsletterOption::create(); $newsletter_option = NewsletterOption::create();
$newsletter_option->option_field_id = $newsletter_option_field->id; $newsletter_option->option_field_id = (int)$newsletter_option_field->id;
$newsletter_option->newsletter_id = $newsletter_id; $newsletter_option->newsletter_id = $newsletter_id;
$newsletter_option->value = $value; $newsletter_option->value = $value;
$newsletter_option->save(); $newsletter_option->save();

View File

@ -244,7 +244,7 @@ class ShortcodesTest extends \MailPoetTest {
expect($result[0])->false(); expect($result[0])->false();
$subscriber_custom_field = SubscriberCustomField::create(); $subscriber_custom_field = SubscriberCustomField::create();
$subscriber_custom_field->subscriber_id = $subscriber->id; $subscriber_custom_field->subscriber_id = $subscriber->id;
$subscriber_custom_field->custom_field_id = $custom_field->id; $subscriber_custom_field->custom_field_id = (int)$custom_field->id;
$subscriber_custom_field->value = 'custom_field_value'; $subscriber_custom_field->value = 'custom_field_value';
$subscriber_custom_field->save(); $subscriber_custom_field->save();
$result = $shortcodes_object->process( $result = $shortcodes_object->process(

View File

@ -27,7 +27,7 @@ class RouterTest extends \MailPoetTest {
Router::NAME => '', Router::NAME => '',
'endpoint' => 'router_test_mock_endpoint', 'endpoint' => 'router_test_mock_endpoint',
'action' => 'test', 'action' => 'test',
'data' => base64_encode(json_encode(['data' => 'dummy data'])), 'data' => base64_encode((string)json_encode(['data' => 'dummy data'])),
]; ];
$this->access_control = new AccessControl(); $this->access_control = new AccessControl();
$container_factory = new ContainerFactory(new ContainerConfigurator()); $container_factory = new ContainerFactory(new ContainerConfigurator());
@ -40,8 +40,8 @@ class RouterTest extends \MailPoetTest {
public function testItCanGetAPIDataFromGetRequest() { public function testItCanGetAPIDataFromGetRequest() {
$data = ['data' => 'dummy data']; $data = ['data' => 'dummy data'];
$url = 'http://example.com/?' . Router::NAME . '&endpoint=view_in_browser&action=view&data=' $url = 'http://example.com/?' . Router::NAME . '&endpoint=view_in_browser&action=view&data='
. base64_encode(json_encode($data)); . base64_encode((string)json_encode($data));
parse_str(parse_url($url, PHP_URL_QUERY), $_GET); parse_str((string)parse_url($url, PHP_URL_QUERY), $_GET);
$router = new Router($this->access_control, $this->container); $router = new Router($this->access_control, $this->container);
expect($router->api_request)->equals(true); expect($router->api_request)->equals(true);
expect($router->endpoint)->equals('viewInBrowser'); expect($router->endpoint)->equals('viewInBrowser');
@ -234,7 +234,7 @@ class RouterTest extends \MailPoetTest {
$data = ['data' => 'dummy data']; $data = ['data' => 'dummy data'];
$result = Router::encodeRequestData($data); $result = Router::encodeRequestData($data);
expect($result)->equals( expect($result)->equals(
rtrim(base64_encode(json_encode($data)), '=') rtrim(base64_encode((string)json_encode($data)), '=')
); );
} }
@ -246,7 +246,7 @@ class RouterTest extends \MailPoetTest {
public function testItCanDecodeRequestData() { public function testItCanDecodeRequestData() {
$data = ['data' => 'dummy data']; $data = ['data' => 'dummy data'];
$encoded_data = rtrim(base64_encode(json_encode($data)), '='); $encoded_data = rtrim(base64_encode((string)json_encode($data)), '=');
$result = Router::decodeRequestData($encoded_data); $result = Router::decodeRequestData($encoded_data);
expect($result)->equals($data); expect($result)->equals($data);
} }
@ -258,7 +258,7 @@ class RouterTest extends \MailPoetTest {
public function testItCanBuildRequest() { public function testItCanBuildRequest() {
$data = ['data' => 'dummy data']; $data = ['data' => 'dummy data'];
$encoded_data = rtrim(base64_encode(json_encode($data)), '='); $encoded_data = rtrim(base64_encode((string)json_encode($data)), '=');
$result = Router::buildRequest( $result = Router::buildRequest(
'router_test_mock_endpoint', 'router_test_mock_endpoint',
'test', 'test',

View File

@ -136,7 +136,7 @@ class WPTest extends \MailPoetTest {
public function testItSynchronizeFirstNames() { public function testItSynchronizeFirstNames() {
$id = $this->insertUser(); $id = $this->insertUser();
WP::synchronizeUsers(); WP::synchronizeUsers();
update_user_meta($id, 'first_name', 'First name'); update_user_meta((int)$id, 'first_name', 'First name');
WP::synchronizeUsers(); WP::synchronizeUsers();
$subscriber = Subscriber::where('wp_user_id', $id)->findOne(); $subscriber = Subscriber::where('wp_user_id', $id)->findOne();
expect($subscriber->first_name)->equals('First name'); expect($subscriber->first_name)->equals('First name');
@ -145,7 +145,7 @@ class WPTest extends \MailPoetTest {
public function testItSynchronizeLastNames() { public function testItSynchronizeLastNames() {
$id = $this->insertUser(); $id = $this->insertUser();
WP::synchronizeUsers(); WP::synchronizeUsers();
update_user_meta($id, 'last_name', 'Last name'); update_user_meta((int)$id, 'last_name', 'Last name');
WP::synchronizeUsers(); WP::synchronizeUsers();
$subscriber = Subscriber::where('wp_user_id', $id)->findOne(); $subscriber = Subscriber::where('wp_user_id', $id)->findOne();
expect($subscriber->last_name)->equals('Last name'); expect($subscriber->last_name)->equals('Last name');
@ -162,7 +162,7 @@ class WPTest extends \MailPoetTest {
public function testItSynchronizeFirstNamesFromMetaNotDisplayName() { public function testItSynchronizeFirstNamesFromMetaNotDisplayName() {
$id = $this->insertUser(); $id = $this->insertUser();
update_user_meta($id, 'first_name', 'First name'); update_user_meta((int)$id, 'first_name', 'First name');
$this->updateWPUserDisplayName($id, 'display_name'); $this->updateWPUserDisplayName($id, 'display_name');
WP::synchronizeUsers(); WP::synchronizeUsers();
$subscriber = Subscriber::where('wp_user_id', $id)->findOne(); $subscriber = Subscriber::where('wp_user_id', $id)->findOne();
@ -195,7 +195,7 @@ class WPTest extends \MailPoetTest {
WP::synchronizeUsers(); WP::synchronizeUsers();
$subscribersCount = $this->getSubscribersCount(); $subscribersCount = $this->getSubscribersCount();
expect($subscribersCount)->equals(2); expect($subscribersCount)->equals(2);
wp_delete_user($id); wp_delete_user((int)$id);
$subscribersCount = $this->getSubscribersCount(); $subscribersCount = $this->getSubscribersCount();
expect($subscribersCount)->equals(1); expect($subscribersCount)->equals(1);
} }
@ -304,7 +304,7 @@ class WPTest extends \MailPoetTest {
'status' => Subscriber::STATUS_SUBSCRIBED, 'status' => Subscriber::STATUS_SUBSCRIBED,
'wp_user_id' => $id, 'wp_user_id' => $id,
]); ]);
update_user_meta($id, 'default_password_nag', '1'); update_user_meta((int)$id, 'default_password_nag', '1');
WP::synchronizeUsers(); WP::synchronizeUsers();
$db_subscriber = Subscriber::findOne($subscriber->id); $db_subscriber = Subscriber::findOne($subscriber->id);
expect($db_subscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED); expect($db_subscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED);

View File

@ -312,7 +312,7 @@ class WooCommercePurchasesTest extends \MailPoetTest {
$click->newsletter_id = $link->newsletter_id; $click->newsletter_id = $link->newsletter_id;
$click->subscriber_id = $subscriber->id; $click->subscriber_id = $subscriber->id;
$click->queue_id = $link->queue_id; $click->queue_id = $link->queue_id;
$click->link_id = $link->id; $click->link_id = (int)$link->id;
$click->count = 1; $click->count = 1;
$timestamp = new DateTime("-$created_days_ago days"); $timestamp = new DateTime("-$created_days_ago days");

View File

@ -21,7 +21,7 @@ class ExportTest extends \MailPoetTest {
public $JSON_data; public $JSON_data;
public function _before() { public function _before() {
parent::_before(); parent::_before();
$this->JSON_data = json_decode(file_get_contents(dirname(__FILE__) . '/ExportTestData.json'), true); $this->JSON_data = json_decode((string)file_get_contents(dirname(__FILE__) . '/ExportTestData.json'), true);
$this->subscriber_fields = [ $this->subscriber_fields = [
'first_name' => 'First name', 'first_name' => 'First name',
'last_name' => 'Last name', 'last_name' => 'Last name',

View File

@ -93,9 +93,9 @@ class SubscriberActionsTest extends \MailPoetTest {
expect($newsletter_option_field->getErrors())->false(); expect($newsletter_option_field->getErrors())->false();
$newsletter_option = NewsletterOption::create(); $newsletter_option = NewsletterOption::create();
$newsletter_option->option_field_id = $newsletter_option_field->id; $newsletter_option->option_field_id = (int)$newsletter_option_field->id;
$newsletter_option->newsletter_id = $newsletter->id; $newsletter_option->newsletter_id = $newsletter->id;
$newsletter_option->value = $value; $newsletter_option->value = (string)$value;
$newsletter_option->save(); $newsletter_option->save();
expect($newsletter_option->getErrors())->false(); expect($newsletter_option->getErrors())->false();
} }
@ -138,9 +138,9 @@ class SubscriberActionsTest extends \MailPoetTest {
expect($newsletter_option_field->getErrors())->false(); expect($newsletter_option_field->getErrors())->false();
$newsletter_option = NewsletterOption::create(); $newsletter_option = NewsletterOption::create();
$newsletter_option->option_field_id = $newsletter_option_field->id; $newsletter_option->option_field_id = (int)$newsletter_option_field->id;
$newsletter_option->newsletter_id = $newsletter->id; $newsletter_option->newsletter_id = $newsletter->id;
$newsletter_option->value = $value; $newsletter_option->value = (string)$value;
$newsletter_option->save(); $newsletter_option->save();
expect($newsletter_option->getErrors())->false(); expect($newsletter_option->getErrors())->false();
} }

View File

@ -95,9 +95,9 @@ class PagesTest extends \MailPoetTest {
expect($newsletter_option_field->getErrors())->false(); expect($newsletter_option_field->getErrors())->false();
$newsletter_option = NewsletterOption::create(); $newsletter_option = NewsletterOption::create();
$newsletter_option->option_field_id = $newsletter_option_field->id; $newsletter_option->option_field_id = (int)$newsletter_option_field->id;
$newsletter_option->newsletter_id = $newsletter->id; $newsletter_option->newsletter_id = $newsletter->id;
$newsletter_option->value = $value; $newsletter_option->value = (string)$value;
$newsletter_option->save(); $newsletter_option->save();
expect($newsletter_option->getErrors())->false(); expect($newsletter_option->getErrors())->false();
} }

View File

@ -117,8 +117,8 @@ class UrlTest extends \MailPoetTest {
private function checkData($url) { private function checkData($url) {
// extract & decode data from url // extract & decode data from url
$url_params = parse_url($url); $url_params_query = parse_url($url, PHP_URL_QUERY);
parse_str($url_params['query'], $params); parse_str((string)$url_params_query, $params);
$data = Router::decodeRequestData($params['data']); $data = Router::decodeRequestData($params['data']);
expect($data['email'])->contains('john@mailpoet.com'); expect($data['email'])->contains('john@mailpoet.com');

View File

@ -70,7 +70,7 @@ $settings = SettingsController::getInstance();
$settings->set('db_version', \MailPoet\Config\Env::$version); $settings->set('db_version', \MailPoet\Config\Env::$version);
$cacheDir = '/tmp'; $cacheDir = '/tmp';
if (is_dir(getenv('WP_TEST_CACHE_PATH'))) { if (is_dir((string)getenv('WP_TEST_CACHE_PATH'))) {
$cacheDir = getenv('WP_TEST_CACHE_PATH'); $cacheDir = getenv('WP_TEST_CACHE_PATH');
} }