Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Add space between elseif/else if and ‘(‘

Browse Source 
[MAILPOET-1791]
This commit is contained in:
Ján Mikláš
2019-02-13 13:01:57 +01:00
committed by M. Shull
parent 100db25ed9
commit a935b091d3
26 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RoboFile.php
View File

@ -443,10 +443,10 @@ class RoboFile extends \Robo\Tasks {
if(!is_readable($plugin_dist_file)) {
$this->say("Failed to access " . $plugin_dist_file);
return;
} elseif(!file_exists($svn_dir . "/.svn/")) {
} elseif (!file_exists($svn_dir . "/.svn/")) {
$this->say("$svn_dir/.svn/ dir not found, is it a SVN repository?");
return;
} elseif(file_exists($svn_dir . "/tags/" . $plugin_version)) {
} elseif (file_exists($svn_dir . "/tags/" . $plugin_version)) {
$this->say("A SVN tag already exists: " . $plugin_version);
return;
}

2
lib/API/JSON/API.php
View File

@ -115,7 +115,7 @@ class API {
$error_message = __('Invalid API request.', 'mailpoet');
$error_response = $this->createErrorResponse(Error::BAD_REQUEST, $error_message, Response::STATUS_BAD_REQUEST);
return $error_response;
} else if(!empty($this->_endpoint_namespaces[$this->_request_api_version])) {
} else if (!empty($this->_endpoint_namespaces[$this->_request_api_version])) {
foreach ($this->_endpoint_namespaces[$this->_request_api_version] as $namespace) {
$endpoint_class = sprintf(
'%s\%s',

6
lib/API/JSON/v1/Newsletters.php
View File

@ -414,18 +414,18 @@ class Newsletters extends APIEndpoint {
->withSegments(true)
->withSendingQueue()
->withStatistics();
} else if($newsletter->type === Newsletter::TYPE_WELCOME || $newsletter->type === Newsletter::TYPE_AUTOMATIC) {
} else if ($newsletter->type === Newsletter::TYPE_WELCOME || $newsletter->type === Newsletter::TYPE_AUTOMATIC) {
$newsletter
->withOptions()
->withTotalSent()
->withScheduledToBeSent()
->withStatistics();
} else if($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
} else if ($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
$newsletter
->withOptions()
->withSegments(true)
->withChildrenCount();
} else if($newsletter->type === Newsletter::TYPE_NOTIFICATION_HISTORY) {
} else if ($newsletter->type === Newsletter::TYPE_NOTIFICATION_HISTORY) {
$newsletter
->withSegments(true)
->withSendingQueue()

4
lib/API/JSON/v1/Services.php
View File

@ -48,7 +48,7 @@ class Services extends APIEndpoint {
$success_message = null;
if($state == Bridge::KEY_VALID) {
$success_message = __('Your MailPoet Sending Service key has been successfully validated.', 'mailpoet');
} elseif($state == Bridge::KEY_EXPIRING) {
} elseif ($state == Bridge::KEY_EXPIRING) {
$success_message = sprintf(
__('Your MailPoet Sending Service key expires on %s!', 'mailpoet'),
$this->date_time->formatDate(strtotime($result['data']['expire_at']))
@ -110,7 +110,7 @@ class Services extends APIEndpoint {
$success_message = null;
if($state == Bridge::KEY_VALID) {
$success_message = __('Your Premium key has been successfully validated.', 'mailpoet');
} elseif($state == Bridge::KEY_EXPIRING) {
} elseif ($state == Bridge::KEY_EXPIRING) {
$success_message = sprintf(
__('Your Premium key expires on %s.', 'mailpoet'),
$this->date_time->formatDate(strtotime($result['data']['expire_at']))

2
lib/API/JSON/v1/Subscribers.php
View File

@ -201,7 +201,7 @@ class Subscribers extends APIEndpoint {
if($form['settings']['on_success'] === 'page') {
// redirect to a page on a success, pass the page url in the meta
$meta['redirect_url'] = get_permalink($form['settings']['success_page']);
} else if($form['settings']['on_success'] === 'url') {
} else if ($form['settings']['on_success'] === 'url') {
$meta['redirect_url'] = $form['settings']['success_url'];
}
}

8
lib/Config/ServicesChecker.php
View File

@ -42,7 +42,7 @@ class ServicesChecker {
WPNotice::displayError($error);
}
return false;
} elseif($mss_key['state'] == Bridge::KEY_EXPIRING
} elseif ($mss_key['state'] == Bridge::KEY_EXPIRING
&& !empty($mss_key['data']['expire_at'])
) {
if($display_error_notice) {
@ -57,7 +57,7 @@ class ServicesChecker {
WPNotice::displayWarning($error);
}
return true;
} elseif($mss_key['state'] == Bridge::KEY_VALID) {
} elseif ($mss_key['state'] == Bridge::KEY_VALID) {
return true;
}
@ -95,7 +95,7 @@ class ServicesChecker {
WPNotice::displayWarning($error);
}
return false;
} elseif($premium_key['state'] === Bridge::KEY_EXPIRING
} elseif ($premium_key['state'] === Bridge::KEY_EXPIRING
&& !empty($premium_key['data']['expire_at'])
) {
if($display_error_notice) {
@ -110,7 +110,7 @@ class ServicesChecker {
WPNotice::displayWarning($error);
}
return true;
} elseif($premium_key['state'] === Bridge::KEY_VALID) {
} elseif ($premium_key['state'] === Bridge::KEY_VALID) {
return true;
}

10
lib/Cron/Workers/Scheduler.php
View File

@ -38,15 +38,15 @@ class Scheduler {
$newsletter = Newsletter::findOneWithOptions($queue->newsletter_id);
if(!$newsletter || $newsletter->deleted_at !== null) {
$queue->delete();
} elseif($newsletter->status !== Newsletter::STATUS_ACTIVE && $newsletter->status !== Newsletter::STATUS_SCHEDULED) {
} elseif ($newsletter->status !== Newsletter::STATUS_ACTIVE && $newsletter->status !== Newsletter::STATUS_SCHEDULED) {
continue;
} elseif($newsletter->type === Newsletter::TYPE_WELCOME) {
} elseif ($newsletter->type === Newsletter::TYPE_WELCOME) {
$this->processWelcomeNewsletter($newsletter, $queue);
} elseif($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
} elseif ($newsletter->type === Newsletter::TYPE_NOTIFICATION) {
$this->processPostNotificationNewsletter($newsletter, $queue);
} elseif($newsletter->type === Newsletter::TYPE_STANDARD) {
} elseif ($newsletter->type === Newsletter::TYPE_STANDARD) {
$this->processScheduledStandardNewsletter($newsletter, $queue);
} elseif($newsletter->type === Newsletter::TYPE_AUTOMATIC) {
} elseif ($newsletter->type === Newsletter::TYPE_AUTOMATIC) {
$this->processScheduledAutomaticEmail($newsletter, $queue);
}
CronHelper::enforceExecutionLimit($this->timer);

10
lib/Form/Block/Date.php
View File

@ -77,7 +77,7 @@ class Date extends Base {
$html .= 'name="'.$field_name.'[day]" placeholder="'.__('Day', 'mailpoet').'">';
$html .= static::getDays($block);
$html .= '</select>';
} else if($date_selector === 'MM') {
} else if ($date_selector === 'MM') {
$block['selected'] = $month;
$html .= '<select class="mailpoet_select mailpoet_date_month" ';
$html .= static::getInputValidation($block, array(
@ -86,7 +86,7 @@ class Date extends Base {
$html .= 'name="'.$field_name.'[month]" placeholder="'.__('Month', 'mailpoet').'">';
$html .= static::getMonths($block);
$html .= '</select>';
} else if($date_selector === 'YYYY') {
} else if ($date_selector === 'YYYY') {
$block['selected'] = $year;
$html .= '<select class="mailpoet_date_year" ';
$html .= static::getInputValidation($block, array(
@ -224,14 +224,14 @@ class Date extends Base {
'month' => $parsed_date[$month_position],
'day' => $parsed_date[$day_position]
);
} else if(count($parsed_date) === 2) {
} else if (count($parsed_date) === 2) {
// create date from any combination of month and year
$parsed_date = array(
'year' => $parsed_date[$year_position],
'month' => $parsed_date[$month_position],
'day' => '01'
);
} else if($date_format === 'MM' && count($parsed_date) === 1) {
} else if ($date_format === 'MM' && count($parsed_date) === 1) {
// create date from month
if((int)$parsed_date[$month_position] === 0) {
$datetime = '';
@ -243,7 +243,7 @@ class Date extends Base {
'year' => date('Y')
);
}
} else if($date_format === 'YYYY' && count($parsed_date) === 1) {
} else if ($date_format === 'YYYY' && count($parsed_date) === 1) {
// create date from year
if((int)$parsed_date[$year_position] === 0) {
$datetime = '';

2
lib/Models/ModelValidator.php
View File

@ -39,7 +39,7 @@ class ModelValidator extends \Sudzy\Engine {
function validateRenderedNewsletterBody($newsletter_body) {
if(is_serialized($newsletter_body)) {
$newsletter_body = unserialize($newsletter_body);
} else if(Helpers::isJson($newsletter_body)) {
} else if (Helpers::isJson($newsletter_body)) {
$newsletter_body = json_decode($newsletter_body, true);
}
return (is_null($newsletter_body) || (is_array($newsletter_body) && !empty($newsletter_body['html']) && !empty($newsletter_body['text'])));

4
lib/Models/Subscriber.php
View File

@ -41,7 +41,7 @@ class Subscriber extends Model {
static function findOne($id = false) {
if(is_int($id) || (string)(int)$id === $id) {
return parent::findOne($id);
} else if(strlen(trim($id)) > 0) {
} else if (strlen(trim($id)) > 0) {
return parent::where('email', $id)->findOne();
}
return false;
@ -323,7 +323,7 @@ class Subscriber extends Model {
static function groupBy($orm, $group = null) {
if($group === 'trash') {
return $orm->whereNotNull('deleted_at');
} else if($group === 'all') {
} else if ($group === 'all') {
return $orm->whereNull('deleted_at');
} else {
return $orm->filter($group);

2
lib/Newsletter/Editor/MetaInformationManager.php
View File

@ -29,7 +29,7 @@ class MetaInformationManager {
if(!empty($text)) {
$text = '<p>' . implode('<br />', $text) . '</p>';
if($position === 'above') $content = $text . $content;
else if($position === 'below') $content .= $text;
else if ($position === 'below') $content .= $text;
}
}

2
lib/Newsletter/Editor/PostContentManager.php
View File

@ -20,7 +20,7 @@ class PostContentManager {
function getContent($post, $displayType) {
if($displayType === 'titleOnly') {
return '';
} elseif($displayType === 'excerpt') {
} elseif ($displayType === 'excerpt') {
// get excerpt
if(!empty($post->post_excerpt)) {
return self::stripShortCodes($post->post_excerpt);

2
lib/Newsletter/Editor/PostTransformer.php
View File

@ -210,7 +210,7 @@ class PostTransformer {
if(in_array($this->args['titleFormat'], array('h1', 'h2', 'h3'))) {
$tag = $this->args['titleFormat'];
} elseif($this->args['titleFormat'] === 'ul') {
} elseif ($this->args['titleFormat'] === 'ul') {
$tag = 'li';
$top_padding = '0';
} else {

4
lib/Newsletter/Editor/StructureTransformer.php
View File

@ -88,9 +88,9 @@ class StructureTransformer {
$alignItem = $image->hasParent('figure') ? $image->parent : $image;
if($alignItem->hasClass('aligncenter')) {
$align = 'center';
} elseif($alignItem->hasClass('alignleft')) {
} elseif ($alignItem->hasClass('alignleft')) {
$align = 'left';
} elseif($alignItem->hasClass('alignright')) {
} elseif ($alignItem->hasClass('alignright')) {
$align = 'right';
} else {
$align = 'left';

2
lib/Router/Endpoints/ViewInBrowser.php
View File

@ -59,7 +59,7 @@ class ViewInBrowser {
if(empty($data->subscriber_token) ||
!Subscriber::verifyToken($data->subscriber->email, $data->subscriber_token)
) return false;
} else if(!$data->subscriber && !empty($data->preview)) {
} else if (!$data->subscriber && !empty($data->preview)) {
// if this is a preview and subscriber does not exist,
// attempt to set subscriber to the current logged-in WP user
$data->subscriber = Subscriber::getCurrentWPUser();

2
lib/Segments/SubscribersFinder.php
View File

@ -134,7 +134,7 @@ class SubscribersFinder {
foreach ($subscribers as $subscriber) {
if(is_a($subscriber, 'MailPoet\Models\Model')) {
$result[$subscriber->id] = $subscriber;
} elseif(is_scalar($subscriber)) {
} elseif (is_scalar($subscriber)) {
$result[$subscriber] = $subscriber;
} else {
$result[$subscriber['id']] = $subscriber;

2
lib/Subscribers/ImportExport/Import/MailChimp.php
View File

@ -86,7 +86,7 @@ class MailChimp {
}
if(!isset($header_hash)) {
$header_hash = md5(implode(',', $header));
} elseif(md5(implode(',', $header) !== $header_hash)) {
} elseif (md5(implode(',', $header) !== $header_hash)) {
return $this->throwException('headers');
}
} else {

2
lib/Subscription/Comment.php
View File

@ -52,7 +52,7 @@ class Comment {
'subscribe_on_comment',
true
);
} else if($comment_status === Comment::APPROVED) {
} else if ($comment_status === Comment::APPROVED) {
static::subscribeAuthorOfComment($comment_id);
}
}

2
lib/Subscription/Pages.php
View File

@ -241,7 +241,7 @@ class Pages {
'first_name' => 'John',
'last_name' => 'Doe'
));
} else if($this->subscriber !== false) {
} else if ($this->subscriber !== false) {
$subscriber = $this->subscriber
->withCustomFields()
->withSubscriptions();

2
lib/Tasks/Sending.php
View File

@ -208,7 +208,7 @@ class Sending {
if($this->isCommonProperty($prop)) {
$this->queue->$prop = $value;
$this->task->$prop = $value;
} elseif($this->isQueueProperty($prop)) {
} elseif ($this->isQueueProperty($prop)) {
$this->queue->$prop = $value;
} else {
$this->task->$prop = $value;

2
lib/Tasks/Subscribers/BatchIterator.php
View File

@ -15,7 +15,7 @@ class BatchIterator implements \Iterator, \Countable {
function __construct($task_id, $batch_size) {
if($task_id <= 0) {
throw new \Exception('Task ID must be greater than zero');
} elseif($batch_size <= 0) {
} elseif ($batch_size <= 0) {
throw new \Exception('Batch size must be greater than zero');
}
$this->task_id = (int)$task_id;

2
lib/Twig/I18n.php
View File

@ -85,7 +85,7 @@ class I18n extends \Twig_Extension {
// check if it's an int passed as a string
if((string)(int)$date === $date) {
$date = (int)$date;
} else if(!is_int($date)) {
} else if (!is_int($date)) {
$date = strtotime($date);
}

2
lib/Util/ArrayColumn.php
View File

@ -64,7 +64,7 @@ function array_column($input = null, $column_key = null, $index_key = null) {
if($params_column_key === null) {
$value_set = true;
$value = $row;
} elseif(is_array($row) && array_key_exists($params_column_key, $row)) {
} elseif (is_array($row) && array_key_exists($params_column_key, $row)) {
$value_set = true;
$value = $row[$params_column_key];
}

6
lib/Util/CSS.php
View File

@ -149,7 +149,7 @@ class CSS {
usort($rules, function($a, $b) {
if($a['specificity'] > $b['specificity']) {
return -1;
} else if($a['specificity'] < $b['specificity']) {
} else if ($a['specificity'] < $b['specificity']) {
return 1;
} else {
if($a['position'] > $b['position']) {
@ -195,7 +195,7 @@ class CSS {
// if the character is an opening bracket, push it onto the stack, otherwise pop the stack
if($css[$i] == "{") {
array_push($s, "{");
} else if($css[$i] == "}") {
} else if ($css[$i] == "}") {
array_pop($s);
}
@ -238,7 +238,7 @@ class CSS {
if(strstr($chunk, '#') !== false) $specifity += 100;
// classes are more important than a tag, but less important then an ID
elseif(strstr($chunk, '.')) $specifity += 10;
elseif (strstr($chunk, '.')) $specifity += 10;
// anything else isn't that important
else $specifity += 1;

4
tests/_support/AcceptanceTester.php
View File

@ -71,9 +71,9 @@ class AcceptanceTester extends \Codeception\Actor {
$I = $this;
if($page === 'Emails') {
$path = 'newsletters';
} elseif($page === 'Lists') {
} elseif ($page === 'Lists') {
$path = 'segments';
} elseif($page === 'Segments') {
} elseif ($page === 'Segments') {
$path = 'dynamic-segments';
} else {
$path = strtolower($page);

2
tests/integration/Subscribers/ImportExport/Export/DynamicSubscribersGetterTest.php
View File

@ -93,7 +93,7 @@ class DynamicSubscribersGetterTest extends \MailPoetTest {
function($segment_id) {
if($segment_id == 1) {
return array(new \DynamicSegmentFilter([1, 2]));
} else if($segment_id == 2) {
} else if ($segment_id == 2) {
return array(new \DynamicSegmentFilter([1, 3, 4]));
}
return array();