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

- Adds custom shortcode processing logic

Browse Source 
- Updates shortcode categories code
- Completely rewrites shortcodes unit tess
This commit is contained in:
Vlad
2016-05-01 13:47:31 -04:00
parent 70fa77d333
commit cca76d0d97
4 changed files with 262 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Newsletter/Shortcodes/Shortcodes.php
View File

@ -34,24 +34,36 @@ class Shortcodes {
function match($shortcode) {
preg_match(
'/\[(?P<type>\w+):(?P<action>\w+)(?:.*?default:(?P<default>.*?))?\]/',
'/\[(?P<category>\w+):(?P<action>\w+)(?:.*?\|.*?default:(?P<default>\w+))?\]/ism',
$shortcode,
$match
);
return $match;
}
function process($shortcodes, $content) {
function process($shortcodes, $content = false) {
$processed_shortcodes = array_map(
function($shortcode) use($content) {
$shortcode_details = $this->match($shortcode);
$shortcode_type = ucfirst($shortcode_details['type']);
$shortcode_category = ucfirst($shortcode_details['category']);
$shortcode_action = $shortcode_details['action'];
$shortcode_class =
__NAMESPACE__ . '\\Categories\\' . $shortcode_type;
__NAMESPACE__ . '\\Categories\\' . $shortcode_category;
$shortcode_default_value = isset($shortcode_details['default'])
? $shortcode_details['default'] : false;
if(!class_exists($shortcode_class)) return false;
if(!class_exists($shortcode_class)) {
$custom_shortcode = apply_filters(
'mailpoet_newsletter_shortcode',
$shortcode,
$this->newsletter,
$this->subscriber,
$this->queue,
$content
);
return ($custom_shortcode === $shortcode) ?
false :
$custom_shortcode;
}
return $shortcode_class::process(
$shortcode_action,
$shortcode_default_value,