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

Rename transient attribute to data_notice_name

Browse Source
This commit is contained in:
Tautvidas Sipavičius
2018-08-27 17:36:52 +03:00
parent d1406970cc
commit 8b725f1c91
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Config/PHPVersionWarnings.php
View File

@ -28,10 +28,10 @@ class PHPVersionWarnings {
$error_string = __('Your website is running on PHP %s. MailPoet will require version 7 by the end of the year. Please consider upgrading your site\'s PHP version. [link]Your host can help you.[/link]', 'mailpoet'); $error_string = __('Your website is running on PHP %s. MailPoet will require version 7 by the end of the year. Please consider upgrading your site\'s PHP version. [link]Your host can help you.[/link]', 'mailpoet');
$error_string = sprintf($error_string, $php_version); $error_string = sprintf($error_string, $php_version);
$error = Helpers::replaceLinkTags($error_string, 'https://beta.docs.mailpoet.com/article/251-upgrading-the-websites-php-version', array('target' => '_blank')); $error = Helpers::replaceLinkTags($error_string, 'https://beta.docs.mailpoet.com/article/251-upgrading-the-websites-php-version', array('target' => '_blank'));
$classes = 'notice-php-warning is-dismissible'; $extra_classes = 'notice-php-warning is-dismissible';
$transient = 'php-version-outdated'; $data_notice_name = 'php-version-outdated';
return WPNotice::displayError($error, $classes, $transient); return WPNotice::displayError($error, $extra_classes, $data_notice_name);
} }
function ajaxDismissNoticeHandler() { function ajaxDismissNoticeHandler() {

28
lib/WP/Notice.php
View File

@ -11,44 +11,44 @@ class Notice {
private $type; private $type;
private $message; private $message;
function __construct($type, $message, $classes = '', $transient = '') { function __construct($type, $message, $classes = '', $data_notice_name = '') {
$this->type = $type; $this->type = $type;
$this->message = $message; $this->message = $message;
$this->classes = $classes; $this->classes = $classes;
$this->transient = $transient; $this->data_notice_name = $data_notice_name;
} }
static function displayError($message, $classes = '', $transient = '') { static function displayError($message, $classes = '', $data_notice_name = '') {
$message = sprintf( $message = sprintf(
"<b>%s </b> %s", "<b>%s </b> %s",
__('MailPoet Error:', 'mailpoet'), __('MailPoet Error:', 'mailpoet'),
$message $message
); );
self::createNotice(self::TYPE_ERROR, $message, $classes, $transient); self::createNotice(self::TYPE_ERROR, $message, $classes, $data_notice_name);
} }
static function displayWarning($message, $classes = '', $transient = '') { static function displayWarning($message, $classes = '', $data_notice_name = '') {
self::createNotice(self::TYPE_WARNING, $message, $classes, $transient); self::createNotice(self::TYPE_WARNING, $message, $classes, $data_notice_name);
} }
static function displaySuccess($message, $classes = '', $transient = '') { static function displaySuccess($message, $classes = '', $data_notice_name = '') {
self::createNotice(self::TYPE_SUCCESS, $message, $classes, $transient); self::createNotice(self::TYPE_SUCCESS, $message, $classes, $data_notice_name);
} }
static function displayInfo($message, $classes = '', $transient = '') { static function displayInfo($message, $classes = '', $data_notice_name = '') {
self::createNotice(self::TYPE_INFO, $message, $classes, $transient); self::createNotice(self::TYPE_INFO, $message, $classes, $data_notice_name);
} }
protected static function createNotice($type, $message, $classes, $transient) { protected static function createNotice($type, $message, $classes, $data_notice_name) {
$notice = new Notice($type, $message, $classes, $transient); $notice = new Notice($type, $message, $classes, $data_notice_name);
add_action('admin_notices', array($notice, 'displayWPNotice')); add_action('admin_notices', array($notice, 'displayWPNotice'));
} }
function displayWPNotice() { function displayWPNotice() {
$class = sprintf('notice notice-%s mailpoet_notice_server %s', $this->type, $this->classes); $class = sprintf('notice notice-%s mailpoet_notice_server %s', $this->type, $this->classes);
$message = nl2br($this->message); $message = nl2br($this->message);
$transient = !empty($this->transient) ? sprintf('data-notice="%s"', $this->transient) : ''; $data_notice_name = !empty($this->data_notice_name) ? sprintf('data-notice="%s"', $this->data_notice_name) : '';
printf('<div class="%1$s" %3$s><p>%2$s</p></div>', $class, $message, $transient); printf('<div class="%1$s" %3$s><p>%2$s</p></div>', $class, $message, $data_notice_name);
} }
} }

4
tests/unit/Config/PHPVersionWarningsTest.php
View File

@ -33,7 +33,7 @@ class PHPVersionWarningsTest extends \MailPoetTest {
function testItPrintsWarningFor55() { function testItPrintsWarningFor55() {
$mock = Mock::double('MailPoet\WP\Notice', [ $mock = Mock::double('MailPoet\WP\Notice', [
'displayError' => function($message, $classes, $transient) { 'displayError' => function($message, $classes, $data_notice_name) {
return $message; return $message;
} }
]); ]);
@ -46,7 +46,7 @@ class PHPVersionWarningsTest extends \MailPoetTest {
function testItPrintsWarningFor56() { function testItPrintsWarningFor56() {
$mock = Mock::double('MailPoet\WP\Notice', [ $mock = Mock::double('MailPoet\WP\Notice', [
'displayError' => function($message, $classes, $transient) { 'displayError' => function($message, $classes, $data_notice_name) {
return $message; return $message;
} }
]); ]);