From 828b60752ed9259a1946b25b70920fff4999166c Mon Sep 17 00:00:00 2001
From: Grzegorz Rola <grola@seostudio.pl>
Date: Thu, 21 Feb 2019 09:48:42 +0100
Subject: [PATCH] Changed functions names.
---
README.md | 4 +-
src/WPDesk/notice-functions.php | 70 ++++++++++++++---------------
tests/integration/TestFunctions.php | 40 ++++++++---------
3 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/README.md b/README.md
index eab1c2f..b481a19 100644
--- a/README.md
+++ b/README.md
@@ -45,10 +45,10 @@ require_once('/path/to/wp-desk/wp-notice/init.php');
Simple usage looks like:
```php
-$notice = wpdesk_notice('Notice text goes here');
+$notice = wpdesk_wp_notice('Notice text goes here');
// Is equivalent to:
-$notice = WPDeskNotice('Notice text goes here');
+$notice = WPDeskWpNotice('Notice text goes here');
// Is equivalent to:
$notice = \WPDesk\Notice\Factory::notice('Notice text goes here');
diff --git a/src/WPDesk/notice-functions.php b/src/WPDesk/notice-functions.php
index d8d3ac9..6f1e04b 100644
--- a/src/WPDesk/notice-functions.php
+++ b/src/WPDesk/notice-functions.php
@@ -1,6 +1,6 @@
<?php
-if (!function_exists('WPDeskInitNoticeAjaxHandler')) {
+if (!function_exists('WPDeskInitWpNoticeAjaxHandler')) {
/**
* Init notices AJAX Handler.
*
@@ -8,7 +8,7 @@ if (!function_exists('WPDeskInitNoticeAjaxHandler')) {
*
* @return \WPDesk\Notice\AjaxHandler
*/
- function WPDeskInitNoticeAjaxHandler($assetsUrl = null)
+ function WPDeskInitWpNoticeAjaxHandler($assetsUrl = null)
{
$ajax_handler = new \WPDesk\Notice\AjaxHandler($assetsUrl);
$ajax_handler->hooks();
@@ -16,7 +16,7 @@ if (!function_exists('WPDeskInitNoticeAjaxHandler')) {
}
}
-if (!function_exists('wpdesk_init_notice_ajax_handler')) {
+if (!function_exists('wpdesk_init_wp_notice_ajax_handler')) {
/**
* Alias for {@see WPDeskInitNoticeAjaxHandler()} function.
*
@@ -24,13 +24,13 @@ if (!function_exists('wpdesk_init_notice_ajax_handler')) {
*
* @return \WPDesk\Notice\AjaxHandler
*/
- function wpdesk_init_notice_ajax_handler($assetsUrl = null)
+ function wpdesk_init_wp_notice_ajax_handler($assetsUrl = null)
{
- return WPDeskInitNoticeAjaxHandler($assetsUrl);
+ return WPDeskInitWpNoticeAjaxHandler($assetsUrl);
}
}
-if (!function_exists('WPDeskNotice')) {
+if (!function_exists('WPDeskWpNotice')) {
/**
* Creates Notice.
*
@@ -41,13 +41,13 @@ if (!function_exists('WPDeskNotice')) {
*
* @return \WPDesk\Notice\Notice
*/
- function WPDeskNotice($noticeContent, $noticeType = 'info', $dismissible = false, $priority = 10)
+ function WPDeskWpNotice($noticeContent, $noticeType = 'info', $dismissible = false, $priority = 10)
{
return \WPDesk\Notice\Factory::notice($noticeContent, $noticeType, $dismissible, $priority);
}
}
-if (!function_exists('wpdesk_notice')) {
+if (!function_exists('wpdesk_wp_notice')) {
/**
* Creates Notice.
*
@@ -60,13 +60,13 @@ if (!function_exists('wpdesk_notice')) {
*
* @return \WPDesk\Notice\Notice
*/
- function wpdesk_notice($noticeContent, $noticeType = 'info', $dismissible = false, $priority = 10)
+ function wpdesk_wp_notice($noticeContent, $noticeType = 'info', $dismissible = false, $priority = 10)
{
- return WPDeskNotice($noticeContent, $noticeType, $dismissible, $priority);
+ return WPDeskWpNotice($noticeContent, $noticeType, $dismissible, $priority);
}
}
-if (!function_exists('WPDeskNoticeInfo')) {
+if (!function_exists('WPDeskWpNoticeInfo')) {
/**
* Creates Notice Info.
*
@@ -76,7 +76,7 @@ if (!function_exists('WPDeskNoticeInfo')) {
*
* @return \WPDesk\Notice\Notice
*/
- function WPDeskNoticeInfo($noticeContent, $dismissible = false, $priority = 10)
+ function WPDeskWpNoticeInfo($noticeContent, $dismissible = false, $priority = 10)
{
return \WPDesk\Notice\Factory::notice(
$noticeContent,
@@ -87,7 +87,7 @@ if (!function_exists('WPDeskNoticeInfo')) {
}
}
-if (!function_exists('wpdesk_notice_info')) {
+if (!function_exists('wpdesk_wp_notice_info')) {
/**
* Creates Notice Info.
*
@@ -99,13 +99,13 @@ if (!function_exists('wpdesk_notice_info')) {
*
* @return \WPDesk\Notice\Notice
*/
- function wpdesk_notice_info($noticeContent, $dismissible = false, $priority = 10)
+ function wpdesk_wp_notice_info($noticeContent, $dismissible = false, $priority = 10)
{
- return WPDeskNoticeInfo($noticeContent, $dismissible, $priority);
+ return WPDeskWpNoticeInfo($noticeContent, $dismissible, $priority);
}
}
-if (!function_exists('WPDeskNoticeError')) {
+if (!function_exists('WPDeskWpNoticeError')) {
/**
* Creates Notice Error.
*
@@ -115,7 +115,7 @@ if (!function_exists('WPDeskNoticeError')) {
*
* @return \WPDesk\Notice\Notice
*/
- function WPDeskNoticeError($noticeContent, $dismissible = false, $priority = 10)
+ function WPDeskWpNoticeError($noticeContent, $dismissible = false, $priority = 10)
{
return \WPDesk\Notice\Factory::notice(
$noticeContent,
@@ -126,7 +126,7 @@ if (!function_exists('WPDeskNoticeError')) {
}
}
-if (!function_exists('wpdesk_notice_error')) {
+if (!function_exists('wpdesk_wp_notice_error')) {
/**
* Creates Notice Error.
*
@@ -138,13 +138,13 @@ if (!function_exists('wpdesk_notice_error')) {
*
* @return \WPDesk\Notice\Notice
*/
- function wpdesk_notice_error($noticeContent, $dismissible = false, $priority = 10)
+ function wpdesk_wp_notice_error($noticeContent, $dismissible = false, $priority = 10)
{
- return WPDeskNoticeError($noticeContent, $dismissible, $priority);
+ return WPDeskWpNoticeError($noticeContent, $dismissible, $priority);
}
}
-if (!function_exists('WPDeskNoticeWarning')) {
+if (!function_exists('WPDeskWpNoticeWarning')) {
/**
* Creates Notice Warning.
*
@@ -154,7 +154,7 @@ if (!function_exists('WPDeskNoticeWarning')) {
*
* @return \WPDesk\Notice\Notice
*/
- function WPDeskNoticeWarning($noticeContent, $dismissible = false, $priority = 10)
+ function WPDeskWpNoticeWarning($noticeContent, $dismissible = false, $priority = 10)
{
return \WPDesk\Notice\Factory::notice(
$noticeContent,
@@ -165,7 +165,7 @@ if (!function_exists('WPDeskNoticeWarning')) {
}
}
-if (!function_exists('wpdesk_notice_warning')) {
+if (!function_exists('wpdesk_wp_notice_warning')) {
/**
* Creates Notice Warning.
*
@@ -177,13 +177,13 @@ if (!function_exists('wpdesk_notice_warning')) {
*
* @return \WPDesk\Notice\Notice
*/
- function wpdesk_notice_warning($noticeContent, $dismissible = false, $priority = 10)
+ function wpdesk_wp_notice_warning($noticeContent, $dismissible = false, $priority = 10)
{
- return WPDeskNoticeWarning($noticeContent, $dismissible, $priority);
+ return WPDeskWpNoticeWarning($noticeContent, $dismissible, $priority);
}
}
-if (!function_exists('WPDeskNoticeSuccess')) {
+if (!function_exists('WPDeskWpNoticeSuccess')) {
/**
* Creates Notice Success.
*
@@ -193,7 +193,7 @@ if (!function_exists('WPDeskNoticeSuccess')) {
*
* @return \WPDesk\Notice\Notice
*/
- function WPDeskNoticeSuccess($noticeContent, $dismissible = false, $priority = 10)
+ function WPDeskWpNoticeSuccess($noticeContent, $dismissible = false, $priority = 10)
{
return \WPDesk\Notice\Factory::notice(
$noticeContent,
@@ -204,7 +204,7 @@ if (!function_exists('WPDeskNoticeSuccess')) {
}
}
-if (!function_exists('wpdesk_notice_success')) {
+if (!function_exists('wpdesk_wp_notice_success')) {
/**
* Creates Notice Success.
*
@@ -216,13 +216,13 @@ if (!function_exists('wpdesk_notice_success')) {
*
* @return \WPDesk\Notice\Notice
*/
- function wpdesk_notice_success($noticeContent, $dismissible = false, $priority = 10)
+ function wpdesk_wp_notice_success($noticeContent, $dismissible = false, $priority = 10)
{
- return WPDeskNoticeSuccess($noticeContent, $dismissible, $priority);
+ return WPDeskWpNoticeSuccess($noticeContent, $dismissible, $priority);
}
}
-if (!function_exists('WPDeskPermanentDismissibleNotice')) {
+if (!function_exists('WPDeskPermanentDismissibleWpNotice')) {
/**
* Creates Permanent Dismissible Notice.
*
@@ -233,7 +233,7 @@ if (!function_exists('WPDeskPermanentDismissibleNotice')) {
*
* @return \WPDesk\Notice\Notice
*/
- function WPDeskPermanentDismissibleNotice($noticeContent, $noticeName, $noticeType = 'info', $priority = 10)
+ function WPDeskPermanentDismissibleWpNotice($noticeContent, $noticeName, $noticeType = 'info', $priority = 10)
{
return \WPDesk\Notice\Factory::permanentDismissibleNotice(
$noticeContent,
@@ -244,7 +244,7 @@ if (!function_exists('WPDeskPermanentDismissibleNotice')) {
}
}
-if (!function_exists('wpdesk_permanent_dismissible_notice')) {
+if (!function_exists('wpdesk_permanent_dismissible_wp_notice')) {
/**
* Creates Permanent Dismissible Notice.
*
@@ -257,8 +257,8 @@ if (!function_exists('wpdesk_permanent_dismissible_notice')) {
*
* @return \WPDesk\Notice\Notice
*/
- function wpdesk_permanent_dismissible_notice($noticeContent, $noticeName, $noticeType = 'info', $priority = 10)
+ function wpdesk_permanent_dismissible_wp_notice($noticeContent, $noticeName, $noticeType = 'info', $priority = 10)
{
- return WPDeskPermanentDismissibleNotice($noticeContent, $noticeName, $noticeType, $priority);
+ return WPDeskPermanentDismissibleWpNotice($noticeContent, $noticeName, $noticeType, $priority);
}
}
diff --git a/tests/integration/TestFunctions.php b/tests/integration/TestFunctions.php
index 04f9aec..be3177e 100644
--- a/tests/integration/TestFunctions.php
+++ b/tests/integration/TestFunctions.php
@@ -19,11 +19,11 @@ class TestFunctions extends WP_UnitTestCase
}
/**
- * Test WPDeskNotice function.
+ * Test WPDeskWpNotice function.
*/
- public function testWPDeskNotice()
+ public function testWPDeskWpNotice()
{
- $notice = wpdesk_notice('test function');
+ $notice = wpdesk_wp_notice('test function');
$this->assertInstanceOf(Notice::class, $notice);
@@ -33,11 +33,11 @@ class TestFunctions extends WP_UnitTestCase
}
/**
- * Test WPDeskNoticeInfo function.
+ * Test WPDeskWpNoticeInfo function.
*/
- public function testWPDeskNoticeInfo()
+ public function testWPDeskWpNoticeInfo()
{
- $notice = wpdesk_notice_info('test function');
+ $notice = wpdesk_wp_notice_info('test function');
$this->assertInstanceOf(Notice::class, $notice);
@@ -47,11 +47,11 @@ class TestFunctions extends WP_UnitTestCase
}
/**
- * Test WPDeskNoticeError function.
+ * Test WPDeskWpNoticeError function.
*/
- public function testWPDeskNoticeError()
+ public function testWPDeskWpNoticeError()
{
- $notice = wpdesk_notice_error('test function');
+ $notice = wpdesk_wp_notice_error('test function');
$this->assertInstanceOf(Notice::class, $notice);
@@ -61,11 +61,11 @@ class TestFunctions extends WP_UnitTestCase
}
/**
- * Test WPDeskNoticeWarning function.
+ * Test WPDeskWpNoticeWarning function.
*/
- public function testWPDeskNoticeWarning()
+ public function testWPDeskWpNoticeWarning()
{
- $notice = wpdesk_notice_warning('test function');
+ $notice = wpdesk_wp_notice_warning('test function');
$this->assertInstanceOf(Notice::class, $notice);
@@ -75,11 +75,11 @@ class TestFunctions extends WP_UnitTestCase
}
/**
- * Test WPDeskNoticeSuccess function.
+ * Test WPDeskWpNoticeSuccess function.
*/
- public function testWPDeskNoticeSuccess()
+ public function testWPDeskWpNoticeSuccess()
{
- $notice = wpdesk_notice_success('test function');
+ $notice = wpdesk_wp_notice_success('test function');
$this->assertInstanceOf(Notice::class, $notice);
@@ -89,11 +89,11 @@ class TestFunctions extends WP_UnitTestCase
}
/**
- * Test WPDeskPermanentDismissibleNotice function.
+ * Test WPDeskPermanentDismissibleWpNotice function.
*/
- public function testWPDeskPermanentDismissibleNotice()
+ public function testWPDeskPermanentDismissibleWpNotice()
{
- $notice = wpdesk_permanent_dismissible_notice(
+ $notice = wpdesk_permanent_dismissible_wp_notice(
'test function',
'test-notice',
Notice::NOTICE_TYPE_INFO
@@ -111,9 +111,9 @@ class TestFunctions extends WP_UnitTestCase
/**
* Test WPDeskInitNoticeAjaxHandler function.
*/
- public function testWPDeskInitNoticeAjaxHandler()
+ public function testWPDeskInitWpNoticeAjaxHandler()
{
- $ajax_handler = wpdesk_init_notice_ajax_handler();
+ $ajax_handler = wpdesk_init_wp_notice_ajax_handler();
$this->assertInstanceOf(\WPDesk\Notice\AjaxHandler::class, $ajax_handler);
}
--
GitLab