From 8579648b77a4f751f5e31f512e56a82feab5de30 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Fri, 29 Oct 2021 09:19:31 +0200 Subject: [PATCH 01/21] add escaping and nonce verification --- composer.json | 3 +- composer.lock | 52 ++++++++++++- phpstan-baseline.neon | 15 ---- readme.txt | 4 + resources/js/src/component/mergetag.js | 1 + resources/js/src/component/switch.js | 1 + resources/js/src/component/sync.js | 1 + resources/templates/carriers/widget-add.php | 11 ++- resources/templates/debug/error-log.php | 2 +- .../templates/debug/notification-log.php | 16 +++- resources/templates/debug/pagination.php | 14 ++-- .../extension/extension-box-premium.php | 2 +- .../templates/extension/extension-box.php | 2 +- resources/templates/form/field-hidden.php | 4 +- resources/templates/form/field.php | 8 +- .../templates/help/global-merge-tags.php | 2 +- resources/templates/settings/page.php | 4 +- resources/templates/upsell/carriers-list.php | 11 ++- .../templates/upsell/conditionals-metabox.php | 3 +- .../templates/upsell/custom-development.php | 6 +- .../upsell/scheduled-triggers-setting.php | 3 +- src/Abstracts/MergeTag.php | 2 +- src/Admin/Debugging.php | 21 +++-- src/Admin/Extensions.php | 76 +++++++++++-------- src/Admin/ImportExport.php | 34 ++++----- src/Admin/NotificationDuplicator.php | 18 +++-- src/Admin/PostTable.php | 29 +++---- src/Admin/PostType.php | 34 ++------- src/Admin/Screen.php | 31 +------- src/Admin/Scripts.php | 1 + src/Admin/Settings.php | 13 +--- src/Admin/Sync.php | 4 +- src/Admin/Wizard.php | 22 +----- src/Core/Cron.php | 7 +- src/Core/Debugging.php | 23 ++---- src/Core/Queue.php | 6 +- src/Core/Sync.php | 36 ++++++--- src/Core/Upgrade.php | 20 ++--- src/Defaults/Carrier/Email.php | 6 +- src/Defaults/Trigger/Post/PostTrigger.php | 10 +-- .../Trigger/User/UserPasswordResetRequest.php | 5 +- .../Trigger/WordPress/UpdatesAvailable.php | 27 +++---- src/Repository/GlobalMergeTagRepository.php | 6 +- src/Traits/Webhook.php | 2 +- src/Utils/Settings.php | 39 +++------- src/Utils/Settings/CoreFields/Button.php | 2 +- src/Utils/Settings/CoreFields/Message.php | 5 +- src/Utils/Settings/CoreFields/Select.php | 6 +- src/Utils/WpObjectHelper.php | 47 +++++++----- 49 files changed, 348 insertions(+), 349 deletions(-) diff --git a/composer.json b/composer.json index 3f40757f9..6a47a370a 100644 --- a/composer.json +++ b/composer.json @@ -4,8 +4,9 @@ "license": "GPL-3.0-or-later", "description": "Notification plugin for WordPress", "require": { - "composer-runtime-api": "^2.0", "php": "^7.0", + "composer-runtime-api": "^2.0", + "enshrined/svg-sanitize": "^0.14.1", "micropackage/ajax": "^1.0", "micropackage/dochooks": "1.0.2", "micropackage/filesystem": "^1.1", diff --git a/composer.lock b/composer.lock index b65f8c075..2c00c5bfb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,54 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "73caec09742a40d66eb761a8ac5d029a", + "content-hash": "73d95408e7ddb8485b92b953cf7868d2", "packages": [ + { + "name": "enshrined/svg-sanitize", + "version": "0.14.1", + "source": { + "type": "git", + "url": "https://github.com/darylldoyle/svg-sanitizer.git", + "reference": "307b42066fb0b76b5119f5e1f0826e18fefabe95" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/307b42066fb0b76b5119f5e1f0826e18fefabe95", + "reference": "307b42066fb0b76b5119f5e1f0826e18fefabe95", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "php": "^7.0 || ^8.0" + }, + "require-dev": { + "codeclimate/php-test-reporter": "^0.1.2", + "phpunit/phpunit": "^6.5 || ^8.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "enshrined\\svgSanitize\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Daryll Doyle", + "email": "daryll@enshrined.co.uk" + } + ], + "description": "An SVG sanitizer for PHP", + "support": { + "issues": "https://github.com/darylldoyle/svg-sanitizer/issues", + "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.14.1" + }, + "time": "2021-08-09T23:46:54+00:00" + }, { "name": "micropackage/ajax", "version": "1.0.1", @@ -2815,8 +2861,8 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "composer-runtime-api": "^2.0", - "php": "^7.0" + "php": "^7.0", + "composer-runtime-api": "^2.0" }, "platform-dev": [], "plugin-api-version": "2.0.0" diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index c2a43bf51..0f1e04bcf 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -590,11 +590,6 @@ parameters: count: 1 path: src/Admin/Extensions.php - - - message: "#^Parameter \\#2 \\$now of function strtotime expects int, int\\|string given\\.$#" - count: 1 - path: src/Admin/Extensions.php - - message: "#^Property BracketSpace\\\\Notification\\\\Admin\\\\Extensions\\:\\:\\$extensions type has no value type specified in iterable type array\\.$#" count: 1 @@ -615,11 +610,6 @@ parameters: count: 1 path: src/Admin/ImportExport.php - - - message: "#^Method BracketSpace\\\\Notification\\\\Admin\\\\ImportExport\\:\\:prepare_notifications_export_data\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: src/Admin/ImportExport.php - - message: "#^Method BracketSpace\\\\Notification\\\\Admin\\\\ImportExport\\:\\:process_notifications_import_request\\(\\) has parameter \\$data with no value type specified in iterable type array\\.$#" count: 1 @@ -990,11 +980,6 @@ parameters: count: 2 path: src/Core/Binder.php - - - message: "#^Binary operation \"\\+\" between int\\|string and 86400 results in an error\\.$#" - count: 1 - path: src/Core/Cron.php - - message: "#^Method BracketSpace\\\\Notification\\\\Core\\\\Cron\\:\\:register_intervals\\(\\) has parameter \\$intervals with no value type specified in iterable type array\\.$#" count: 1 diff --git a/readme.txt b/readme.txt index 50981d524..511d82abf 100644 --- a/readme.txt +++ b/readme.txt @@ -295,6 +295,10 @@ Yes, just activate the debug log in the DEBUGGING section of the plugin settings == Changelog == += [Next] = + +* [Added] HTML escaping and nonce verifications. + = 8.0.1 = * [Changed] Field and Merge Tag description field is now escaped and cannot contain any HTML tags. diff --git a/resources/js/src/component/mergetag.js b/resources/js/src/component/mergetag.js index 4b97b1599..dec9de9d4 100644 --- a/resources/js/src/component/mergetag.js +++ b/resources/js/src/component/mergetag.js @@ -41,6 +41,7 @@ import "jquery-collapse/src/jquery.collapse.js"; const data = { action: "get_merge_tags_for_trigger", + _ajax_nonce: notification.csrfToken, trigger_slug: triggerSlug }; diff --git a/resources/js/src/component/switch.js b/resources/js/src/component/switch.js index 0665ef4a9..5f25dfa97 100644 --- a/resources/js/src/component/switch.js +++ b/resources/js/src/component/switch.js @@ -25,6 +25,7 @@ const data = { action: "change_notification_status", + _ajax_nonce: notification.csrfToken, post_id: postId, status, nonce: $switch.data("nonce") diff --git a/resources/js/src/component/sync.js b/resources/js/src/component/sync.js index 0d630b1c7..59de0869f 100644 --- a/resources/js/src/component/sync.js +++ b/resources/js/src/component/sync.js @@ -61,6 +61,7 @@ const data = { action: "notification_sync", + _ajax_nonce: notification.csrfToken, hash, type: syncType, nonce diff --git a/resources/templates/carriers/widget-add.php b/resources/templates/carriers/widget-add.php index 1bcdc9809..2d615353d 100644 --- a/resources/templates/carriers/widget-add.php +++ b/resources/templates/carriers/widget-add.php @@ -9,6 +9,10 @@ * @var BracketSpace\Notification\Dependencies\Micropackage\Templates\Template $this Template instance. */ +use BracketSpace\Notification\Dependencies\enshrined\svgSanitize\Sanitizer; + +$svg_sanitizer = new Sanitizer(); + ?>
>
diff --git a/resources/templates/debug/notification-log.php b/resources/templates/debug/notification-log.php index c9455a6b5..3a62607a6 100644 --- a/resources/templates/debug/notification-log.php +++ b/resources/templates/debug/notification-log.php @@ -64,7 +64,13 @@ -
+ 

+												
+
@@ -84,7 +90,13 @@ -
+ 

+													
+
diff --git a/resources/templates/debug/pagination.php b/resources/templates/debug/pagination.php index 3c6f704c3..41ddbf540 100644 --- a/resources/templates/debug/pagination.php +++ b/resources/templates/debug/pagination.php @@ -9,14 +9,14 @@ * @var BracketSpace\Notification\Dependencies\Micropackage\Templates\Template $this Template instance. */ +$links = paginate_links( [ + 'base' => admin_url( 'edit.php?post_type=notification&page=settings§ion=debugging&' . $get( 'query_arg' ) . '=%#%' ), + 'current' => $get( 'current' ), + 'total' => $get( 'total' ), +] ); + ?>
- admin_url( 'edit.php?post_type=notification&page=settings§ion=debugging&' . $get( 'query_arg' ) . '=%#%' ), - 'current' => $get( 'current' ), - 'total' => $get( 'total' ), - ] ); - ?> +
diff --git a/resources/templates/extension/extension-box-premium.php b/resources/templates/extension/extension-box-premium.php index fd0b4f1fd..df18110ac 100644 --- a/resources/templates/extension/extension-box-premium.php +++ b/resources/templates/extension/extension-box-premium.php @@ -31,7 +31,7 @@ expires ) : ?> -

expires, current_time( 'timestamp' ) ) ) ) ); // phpcs:ignore ?>

+

expires, time() ) ) ) ); ?>

diff --git a/resources/templates/extension/extension-box.php b/resources/templates/extension/extension-box.php index 3d833bf4d..4beba9aee 100644 --- a/resources/templates/extension/extension-box.php +++ b/resources/templates/extension/extension-box.php @@ -86,7 +86,7 @@
'; return $html; - } /** @@ -211,7 +207,6 @@ public function get_core_updates_list() { * @return string */ public function get_plugin_updates_list() { - $updates = get_plugin_updates(); if ( empty( $updates ) ) { @@ -221,8 +216,13 @@ public function get_plugin_updates_list() { $html = ''; @@ -238,7 +238,6 @@ public function get_plugin_updates_list() { * @return string */ public function get_theme_updates_list() { - $updates = get_theme_updates(); if ( empty( $updates ) ) { @@ -248,14 +247,18 @@ public function get_theme_updates_list() { $html = ''; return $html; - } /** @@ -266,7 +269,6 @@ public function get_theme_updates_list() { * @return integer */ public function get_updates_count( $update_type = 'all' ) { - if ( 'all' !== $update_type ) { $updates = call_user_func( 'get_' . $update_type . '_updates' ); @@ -288,7 +290,6 @@ public function get_updates_count( $update_type = 'all' ) { } return $count; - } } diff --git a/src/Repository/GlobalMergeTagRepository.php b/src/Repository/GlobalMergeTagRepository.php index 87e254adf..6c9dfe200 100644 --- a/src/Repository/GlobalMergeTagRepository.php +++ b/src/Repository/GlobalMergeTagRepository.php @@ -126,21 +126,21 @@ public static function register() { 'slug' => 'date', 'name' => __( 'Trigger execution date', 'notification' ), 'hidden' => true, - 'timestamp' => current_time( 'timestamp' ), // phpcs:ignore + 'timestamp' => time(), ] ) ); Register::global_merge_tag( new MergeTag\DateTime\DateTime( [ 'slug' => 'date_time', 'name' => __( 'Trigger execution date and time', 'notification' ), 'hidden' => true, - 'timestamp' => current_time( 'timestamp' ), // phpcs:ignore + 'timestamp' => time(), ] ) ); Register::global_merge_tag( new MergeTag\DateTime\Time( [ 'slug' => 'time', 'name' => __( 'Trigger execution time', 'notification' ), 'hidden' => true, - 'timestamp' => current_time( 'timestamp' ), // phpcs:ignore + 'timestamp' => time(), ] ) ); } diff --git a/src/Traits/Webhook.php b/src/Traits/Webhook.php index ca65a3014..c6f633372 100644 --- a/src/Traits/Webhook.php +++ b/src/Traits/Webhook.php @@ -48,7 +48,7 @@ public function http_request( $url, $args = [], $headers = [], $method ) { $response = wp_remote_request( $url, $remote_args ); if ( is_wp_error( $response ) ) { - // phpcs:ignore + // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r notification_log( $this->get_name(), 'error', '
' . print_r( [
 				'url'    => $url,
 				'args'   => $remote_args,
diff --git a/src/Utils/Settings.php b/src/Utils/Settings.php
index 9f0016f5e..a11df5fa9 100644
--- a/src/Utils/Settings.php
+++ b/src/Utils/Settings.php
@@ -74,7 +74,6 @@ class Settings {
 	 * @param string|bool $textdomain textdomain.
 	 */
 	public function __construct( $handle, $textdomain = false ) {
-
 		if ( empty( $handle ) ) {
 			throw new \Exception( 'Handle cannot be empty' );
 		}
@@ -89,9 +88,7 @@ public function __construct( $handle, $textdomain = false ) {
 
 		// settings autoload on admin side.
 		add_action( 'admin_init', [ $this, 'setup_field_values' ], 10 );
-
 		add_action( 'admin_post_save_' . $this->handle . '_settings', [ $this, 'save_settings' ] );
-
 	}
 
 	/**
@@ -100,17 +97,18 @@ public function __construct( $handle, $textdomain = false ) {
 	 * @return void
 	 */
 	public function settings_page() {
-
+		// We're using the GET variable only to get the section name.
+		// phpcs:disable WordPress.Security.NonceVerification
 		$sections = $this->get_sections();
 
-		if ( isset( $_GET['section'] ) && ! empty( $_GET['section'] ) ) { // phpcs:ignore
-			$current_section = sanitize_text_field( wp_unslash( $_GET['section'] ) ); // phpcs:ignore
+		if ( isset( $_GET['section'] ) && ! empty( $_GET['section'] ) ) {
+			$current_section = sanitize_text_field( wp_unslash( $_GET['section'] ) );
 		} else {
 			$current_section = key( $this->get_sections() );
 		}
 
 		include $this->path . '/resources/templates/settings/page.php';
-
+		// phpcs:enable
 	}
 
 	/**
@@ -165,13 +163,15 @@ public function get_section( $slug = '' ) {
 	 * @return void
 	 */
 	public function save_settings() {
-
-		$data = $_POST; // phpcs:ignore
-
-		if ( wp_verify_nonce( $data['nonce'], 'save_' . $this->handle . '_settings' ) === false ) {
+		if ( false === wp_verify_nonce(
+			sanitize_text_field( wp_unslash( $_POST['nonce'] ?? '' ) ),
+			'save_' . $this->handle . '_settings'
+		) ) {
 			wp_die( 'Can\'t touch this' );
 		}
 
+		$data = $_POST;
+
 		$settings = $data[ $this->handle . '_settings' ];
 
 		$to_save = [];
@@ -197,7 +197,6 @@ public function save_settings() {
 		do_action( $this->handle . '/settings/saved', $to_save, $this );
 
 		wp_safe_redirect( add_query_arg( 'updated', 'true', $data['_wp_http_referer'] ) );
-
 	}
 
 	/**
@@ -206,7 +205,6 @@ public function save_settings() {
 	 * @return array settings
 	 */
 	public function get_settings() {
-
 		if ( empty( $this->settings ) ) {
 			foreach ( $this->get_sections() as $section_slug => $section ) {
 				$setting = get_option( $this->handle . '_' . $section_slug );
@@ -234,7 +232,6 @@ public function get_settings() {
 		}
 
 		return apply_filters( $this->handle . '/settings/saved_settings', $this->settings, $this );
-
 	}
 
 	/**
@@ -244,20 +241,14 @@ public function get_settings() {
 	 * @return void
 	 */
 	public function setup_field_values() {
-
 		foreach ( $this->get_sections() as $section_slug => $section ) {
-
 			foreach ( $section->get_groups() as $group_slug => $group ) {
-
 				foreach ( $group->get_fields() as $field_slug => $field ) {
-
 					$setting_name = implode( '/', [ $section_slug, $group_slug, $field_slug ] );
 					$field->value( $this->get_setting( $setting_name ) );
-
 				}
 			}
 		}
-
 	}
 
 
@@ -269,7 +260,6 @@ public function setup_field_values() {
 	 * @return mixed           field value or null if name not found
 	 */
 	public function get_setting( $setting ) {
-
 		$parts = explode( '/', $setting );
 
 		if ( count( $parts ) !== 3 ) {
@@ -285,7 +275,6 @@ public function get_setting( $setting ) {
 		$value = $settings[ $parts[0] ][ $parts[1] ][ $parts[2] ];
 
 		return apply_filters( $this->handle . '/settings/setting/' . $setting, $value, $this );
-
 	}
 
 	/**
@@ -357,7 +346,6 @@ public function update_setting( $setting, $value ) {
 	 * @return void
 	 */
 	public function set_variables() {
-
 		// path.
 		$this->path = dirname( dirname( dirname( __FILE__ ) ) );
 
@@ -366,16 +354,11 @@ public function set_variables() {
 		$theme_pos = strpos( $this->path, $theme_url['path'] );
 
 		if ( false !== $theme_pos ) { // loaded from theme.
-
 			$plugin_relative_dir = str_replace( $theme_url['path'], '', substr( $this->path, $theme_pos ) );
 			$this->uri           = $theme_url['scheme'] . '://' . $theme_url['host'] . $theme_url['path'] . $plugin_relative_dir;
-
 		} else { // loaded from plugin.
-
 			$this->uri = trailingslashit( plugins_url( '', dirname( __FILE__ ) ) );
-
 		}
-
 	}
 
 }
diff --git a/src/Utils/Settings/CoreFields/Button.php b/src/Utils/Settings/CoreFields/Button.php
index 3885882f4..9c5c063e3 100644
--- a/src/Utils/Settings/CoreFields/Button.php
+++ b/src/Utils/Settings/CoreFields/Button.php
@@ -22,7 +22,7 @@ class Button {
 	 */
 	public function input( $field ) {
 
-		echo '' . $field->addon( 'label' ) . ''; // phpcs:ignore
+		echo '' . esc_html( $field->addon( 'label' ) ) . '';
 
 	}
 
diff --git a/src/Utils/Settings/CoreFields/Message.php b/src/Utils/Settings/CoreFields/Message.php
index b698986e4..cc619db51 100644
--- a/src/Utils/Settings/CoreFields/Message.php
+++ b/src/Utils/Settings/CoreFields/Message.php
@@ -27,7 +27,10 @@ public function input( $field ) {
 
 		$message = $field->addon( 'message' );
 
-		echo is_callable( $message ) ? $message() : $message; // phpcs:ignore
+		// We cannot escape message contents as it may use complicated HTML to render
+		// advanced setting sections.
+		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+		echo is_callable( $message ) ? $message() : $message;
 
 		if ( $field->addon( 'code' ) ) {
 			echo '
'; diff --git a/src/Utils/Settings/CoreFields/Select.php b/src/Utils/Settings/CoreFields/Select.php index fdaa7c37b..437bc5463 100644 --- a/src/Utils/Settings/CoreFields/Select.php +++ b/src/Utils/Settings/CoreFields/Select.php @@ -27,13 +27,15 @@ public function input( $field ) { $name = $field->addon( 'multiple' ) ? $field->input_name() . '[]' : $field->input_name(); $pretty = $field->addon( 'pretty' ) ? 'pretty-select' : ''; - echo ''; $options = is_callable( $field->addon( 'options' ) ) ? $field->addon( 'options' )() : $field->addon( 'options' ); foreach ( $options as $option_value => $option_label ) { $selected = in_array( $option_value, (array) $field->value(), true ) ? 'selected="selected"' : ''; - echo ''; // phpcs:ignore + // We're printing safe variable here. + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped + echo ''; } echo ''; diff --git a/src/Utils/WpObjectHelper.php b/src/Utils/WpObjectHelper.php index c2b00b17e..fedf41f28 100644 --- a/src/Utils/WpObjectHelper.php +++ b/src/Utils/WpObjectHelper.php @@ -9,6 +9,8 @@ namespace BracketSpace\Notification\Utils; +use BracketSpace\Notification\Utils\Cache\ObjectCache; + /** * WpObjectHelper class */ @@ -123,25 +125,34 @@ public static function get_comment_type_name( $comment_type_slug ) { public static function get_comment_types() : array { global $wpdb; - $comment_types = [ - 'comment' => __( 'Comment', 'notification' ), - 'pingback' => __( 'Pingback', 'notification' ), - 'trackback' => __( 'Trackback', 'notification' ), - ]; - - $db_types = $wpdb->get_col( // phpcs:ignore - "SELECT DISTINCT comment_type - FROM $wpdb->comments - WHERE 1=1" - ); - - foreach ( $db_types as $type ) { - if ( ! isset( $comment_types[ $type ] ) ) { - // Dynamically generated and translated name. - $name = ucfirst( str_replace( [ '_', '-' ], ' ', $type ) ); - - $comment_types[ (string) $type ] = __( $name ); + $types_cache = new ObjectCache( 'comment_types', 'notification' ); + $comment_types = $types_cache->get(); + + if ( false === $comment_types ) { + $comment_types = [ + 'comment' => __( 'Comment', 'notification' ), + 'pingback' => __( 'Pingback', 'notification' ), + 'trackback' => __( 'Trackback', 'notification' ), + ]; + + // There's no other way to get comment types and we're using the cache lib. + // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching + $db_types = $wpdb->get_col( + "SELECT DISTINCT comment_type + FROM $wpdb->comments + WHERE 1=1" + ); + + foreach ( $db_types as $type ) { + if ( ! isset( $comment_types[ $type ] ) ) { + // Dynamically generated and translated name. + $name = ucfirst( str_replace( [ '_', '-' ], ' ', $type ) ); + + $comment_types[ (string) $type ] = __( $name ); + } } + + $types_cache->set( $comment_types ); } return $comment_types; From 0376ae8f67bd69b72fbaa343be41f268b41d85fe Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Fri, 29 Oct 2021 16:05:57 +0200 Subject: [PATCH 02/21] update filesystem micropackage --- composer.lock | 12 ++++++------ phpstan.neon.dist | 2 -- tests/phpstan/stubs/Filesystem.stub | 8 -------- 3 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 tests/phpstan/stubs/Filesystem.stub diff --git a/composer.lock b/composer.lock index 2c00c5bfb..f44a58adb 100644 --- a/composer.lock +++ b/composer.lock @@ -146,16 +146,16 @@ }, { "name": "micropackage/filesystem", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/micropackage/filesystem.git", - "reference": "a686c7c2d7c7443c4cf6dc55dbd2283a6e219b06" + "reference": "fb643749ff282bf9d057caf9903ab17c5deceb33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/micropackage/filesystem/zipball/a686c7c2d7c7443c4cf6dc55dbd2283a6e219b06", - "reference": "a686c7c2d7c7443c4cf6dc55dbd2283a6e219b06", + "url": "https://api.github.com/repos/micropackage/filesystem/zipball/fb643749ff282bf9d057caf9903ab17c5deceb33", + "reference": "fb643749ff282bf9d057caf9903ab17c5deceb33", "shasum": "" }, "require": { @@ -186,9 +186,9 @@ "description": "Wrapper for WordPress' Filesystem for easier file manipulations.", "support": { "issues": "https://github.com/micropackage/filesystem/issues", - "source": "https://github.com/micropackage/filesystem/tree/master" + "source": "https://github.com/micropackage/filesystem/tree/1.1.4" }, - "time": "2020-06-15T11:06:50+00:00" + "time": "2021-10-29T14:01:09+00:00" }, { "name": "micropackage/internationalization", diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 7e1d630bb..5086e6b40 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -6,8 +6,6 @@ parameters: inferPrivatePropertyTypeFromConstructor: true bootstrapFiles: - tests/phpstan/bootstrap.php - stubFiles: - - tests/phpstan/stubs/Filesystem.stub scanFiles: - vendor/php-stubs/wp-cli-stubs/wp-cli-stubs.php paths: diff --git a/tests/phpstan/stubs/Filesystem.stub b/tests/phpstan/stubs/Filesystem.stub deleted file mode 100644 index 807df645d..000000000 --- a/tests/phpstan/stubs/Filesystem.stub +++ /dev/null @@ -1,8 +0,0 @@ - Date: Fri, 29 Oct 2021 16:07:12 +0200 Subject: [PATCH 03/21] fix notification adding when there's such a notification already registered via code or json --- src/Admin/PostType.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Admin/PostType.php b/src/Admin/PostType.php index 34f90db61..677451602 100644 --- a/src/Admin/PostType.php +++ b/src/Admin/PostType.php @@ -389,7 +389,6 @@ public function setup_notifications() { foreach ( $notifications as $notification_json ) { if ( ! empty( $notification_json ) ) { - // Check if Notification has valid JSON. $json_check = json_decode( $notification_json, true ); if ( json_last_error() !== JSON_ERROR_NONE ) { @@ -401,8 +400,10 @@ public function setup_notifications() { // Set source back to WordPress. $adapter->set_source( 'WordPress' ); - notification_add( $adapter->get_notification() ); - + // Check if the notification hasn't been added already ie. via Sync. + if ( ! Store\Notification::has( $adapter->get_hash() ) ) { + notification_add( $adapter->get_notification() ); + } } } } From b905867511c59b556500e94b134d866bde650aa9 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Fri, 29 Oct 2021 16:07:30 +0200 Subject: [PATCH 04/21] change syncing processes to filesystem CU-1pc249m --- phpstan-baseline.neon | 5 -- readme.txt | 1 + resources/templates/sync/notifications.php | 4 +- src/Admin/Sync.php | 12 +--- src/Core/Sync.php | 73 +++++++++++----------- yarn.lock | 6 +- 6 files changed, 46 insertions(+), 55 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 0f1e04bcf..206d128e0 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1110,11 +1110,6 @@ parameters: count: 1 path: src/Core/Settings.php - - - message: "#^Method BracketSpace\\\\Notification\\\\Core\\\\Sync\\:\\:get_all_json\\(\\) return type has no value type specified in iterable type array\\.$#" - count: 1 - path: src/Core/Sync.php - - message: "#^Cannot access property \\$post_modified_gmt on WP_Post\\|null\\.$#" count: 1 diff --git a/readme.txt b/readme.txt index 511d82abf..76a473e43 100644 --- a/readme.txt +++ b/readme.txt @@ -298,6 +298,7 @@ Yes, just activate the debug log in the DEBUGGING section of the plugin settings = [Next] = * [Added] HTML escaping and nonce verifications. +* [Changed] Notification file syncing is now using Filesystem methods. = 8.0.1 = diff --git a/resources/templates/sync/notifications.php b/resources/templates/sync/notifications.php index fb7277843..09d628d6c 100644 --- a/resources/templates/sync/notifications.php +++ b/resources/templates/sync/notifications.php @@ -53,9 +53,9 @@ - + - + diff --git a/src/Admin/Sync.php b/src/Admin/Sync.php index fd8409565..1cdcf9866 100644 --- a/src/Admin/Sync.php +++ b/src/Admin/Sync.php @@ -37,7 +37,7 @@ public function settings( $settings ) { 'name' => __( 'Actions', 'notification' ), 'slug' => 'actions', 'addons' => [ - 'message' => $this->template_actions(), + 'message' => [ $this, 'template_actions' ], ], 'render' => [ new CoreFields\Message(), 'input' ], 'sanitize' => [ new CoreFields\Message(), 'sanitize' ], @@ -49,7 +49,7 @@ public function settings( $settings ) { 'name' => __( 'Notifications', 'notification' ), 'slug' => 'notifications', 'addons' => [ - 'message' => $this->template_notifications(), + 'message' => [ $this, 'template_notifications' ], ], 'render' => [ new CoreFields\Message(), 'input' ], 'sanitize' => [ new CoreFields\Message(), 'sanitize' ], @@ -79,7 +79,6 @@ public function template_actions() { * @return string */ public function template_notifications() { - // Get all Notifications. $wp_json_notifiactions = PostType::get_all_notifications(); $json_notifiactions = CoreSync::get_all_json(); @@ -87,7 +86,6 @@ public function template_notifications() { // Load the WP Notifications first. foreach ( $wp_json_notifiactions as $json ) { - try { $adapter = notification_adapt_from( 'JSON', $json ); $notification = $adapter->get_notification(); @@ -112,7 +110,6 @@ public function template_notifications() { 'post_id' => $notification_adapter->get_id(), 'notification' => $notification, ]; - } // Compare against JSON. @@ -133,14 +130,12 @@ public function template_notifications() { $collection[ $notification->get_hash() ]['up_to_date'] = true; } } else { - $collection[ $notification->get_hash() ] = [ 'source' => 'JSON', 'has_post' => false, 'up_to_date' => false, 'notification' => $notification, ]; - } } @@ -158,7 +153,6 @@ public function template_notifications() { return Templates::get( 'sync/notifications', [ 'collection' => array_reverse( $collection ), ] ); - } /** @@ -174,8 +168,6 @@ public function ajax_sync() { $ajax = new Response(); $data = $_POST; - $ajax->verify_nonce( 'notification_sync_' . $data['hash'] ); - if ( method_exists( $this, 'load_notification_to_' . $data['type'] ) ) { $response = call_user_func( [ $this, 'load_notification_to_' . $data['type'] ], $data['hash'] ); } else { diff --git a/src/Core/Sync.php b/src/Core/Sync.php index 1a0bdf82f..3d89bdebd 100644 --- a/src/Core/Sync.php +++ b/src/Core/Sync.php @@ -26,31 +26,27 @@ class Sync { * Gets all Notifications from JSON files * * @since 6.0.0 - * @return array + * @return array */ public static function get_all_json() { if ( ! self::is_syncing() ) { return []; } - $path = untrailingslashit( (string) self::get_sync_path() ); - $dir = opendir( $path ); - - if ( ! $dir ) { - return []; - } + $fs = static::get_sync_fs(); $notifications = []; - // phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition - while ( false !== ( $file = readdir( $dir ) ) ) { - if ( pathinfo( $file, PATHINFO_EXTENSION ) !== 'json' ) { + if ( ! $fs ) { + return $notifications; + } + + foreach ( (array) $fs->dirlist( '/' ) as $filename => $file ) { + if ( 1 !== preg_match( '/.*\.json/', $filename ) ) { continue; } - // We need to read the file contents. - // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents - $json = file_get_contents( $path . '/' . $file ); + $json = $fs->get_contents( $filename ); if ( empty( $json ) ) { continue; @@ -65,7 +61,7 @@ public static function get_all_json() { /** * Loads local JSON files * - * @action notification/init + * @action notification/init 100 * * @since 6.0.0 * @return void @@ -85,7 +81,10 @@ public function load_local_json() { * @var \BracketSpace\Notification\Defaults\Adapter\JSON */ $adapter = notification_adapt_from( 'JSON', $json ); - $adapter->register_notification(); + + if ( $adapter->is_enabled() ) { + $adapter->register_notification(); + } } catch ( \Exception $e ) { // Do nothing. return; @@ -107,17 +106,16 @@ public static function save_local_json( $wp_adapter ) { return; } - $path = trailingslashit( (string) self::get_sync_path() ); + $fs = static::get_sync_fs(); - if ( ! is_dir( $path ) ) { + if ( ! $fs ) { return; } $file = $wp_adapter->get_hash() . '.json'; $json = notification_swap_adapter( 'JSON', $wp_adapter )->save(); - // phpcs:ignore - file_put_contents( $path . '/' . $file, $json ); + $fs->put_contents( $file, $json ); } /** @@ -130,19 +128,22 @@ public static function save_local_json( $wp_adapter ) { * @return void */ public function delete_local_json( $post_id ) { - if ( ! self::is_syncing() || 'notification' !== get_post_type( $post_id ) ) { return; } + $fs = static::get_sync_fs(); + + if ( ! $fs ) { + return; + } + $adapter = notification_adapt_from( 'WordPress', $post_id ); - $path = trailingslashit( (string) self::get_sync_path() ); $file = $adapter->get_hash() . '.json'; - if ( file_exists( $path . '/' . $file ) ) { - unlink( $path . '/' . $file ); + if ( $fs->exists( $file ) ) { + $fs->delete( $file ); } - } /** @@ -159,24 +160,26 @@ public static function enable( string $path = null ) { $path = trailingslashit( get_stylesheet_directory() ) . 'notifications'; } - if ( ! file_exists( $path ) ) { - mkdir( $path ); + if ( self::is_syncing() ) { + throw new \Exception( sprintf( 'Synchronization has been already enabled and it\'s syncing to: %s', self::get_sync_path() ) ); } - if ( ! is_dir( $path ) ) { - throw new \Exception( 'Synchronization path must be a directory.' ); - } + static::$sync_path = $path; - if ( self::is_syncing() ) { - throw new \Exception( sprintf( 'Synchronization has been already enabled and it\'s syncing to: %s', self::get_sync_path() ) ); + $fs = static::get_sync_fs(); + + if ( ! $fs ) { + return; } - if ( ! file_exists( trailingslashit( $path ) . 'index.php' ) ) { - // phpcs:ignore - file_put_contents( trailingslashit( $path ) . 'index.php', 'exists( '' ) || ! $fs->is_dir( '' ) ) { + $fs->mkdir( '' ); } - static::$sync_path = $path; + if ( ! $fs->exists( 'index.php' ) ) { + $fs->touch( 'index.php' ); + $fs->put_contents( 'index.php', ' Date: Fri, 29 Oct 2021 19:56:23 +0200 Subject: [PATCH 05/21] change menu icon CU-c0um8b --- readme.txt | 1 + resources/images/menu-icon.svg | 3 +++ src/Admin/PostType.php | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 resources/images/menu-icon.svg diff --git a/readme.txt b/readme.txt index 76a473e43..95841ce21 100644 --- a/readme.txt +++ b/readme.txt @@ -299,6 +299,7 @@ Yes, just activate the debug log in the DEBUGGING section of the plugin settings * [Added] HTML escaping and nonce verifications. * [Changed] Notification file syncing is now using Filesystem methods. +* [Changed] Menu icon. = 8.0.1 = diff --git a/resources/images/menu-icon.svg b/resources/images/menu-icon.svg new file mode 100644 index 000000000..f03980b71 --- /dev/null +++ b/resources/images/menu-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Admin/PostType.php b/src/Admin/PostType.php index 677451602..c33f68818 100644 --- a/src/Admin/PostType.php +++ b/src/Admin/PostType.php @@ -63,7 +63,7 @@ public function register() { 'show_ui' => true, 'show_in_menu' => apply_filters( 'notification/whitelabel/cpt/parent', true ), 'show_in_admin_bar' => true, - 'menu_icon' => 'dashicons-megaphone', + 'menu_icon' => \Notification::fs()->image_to_base64( 'resources/images/menu-icon.svg' ), 'menu_position' => 103, 'show_in_nav_menus' => false, 'publicly_queryable' => false, From e9f63bcaca9e48d87a1e2125453470da1fec32f1 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Sat, 30 Oct 2021 08:05:49 +0200 Subject: [PATCH 06/21] Revert "remove bolds from setting labels" This reverts commit 0951df4239dbc7278e1e5a64cf9f9df2af97fbb8. --- src/Admin/Settings.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Admin/Settings.php b/src/Admin/Settings.php index 3bce575da..3dbe1d3d5 100644 --- a/src/Admin/Settings.php +++ b/src/Admin/Settings.php @@ -419,7 +419,7 @@ public function emails_settings( $settings ) { 'slug' => 'new_user_to_user', 'default' => false, 'addons' => [ - 'label' => __( 'Disable account details email to user', 'notification' ), + 'label' => __( 'Disable account details email to user', 'notification' ), ], 'description' => __( 'Email is sent after registration and contains password setup link.', 'notification' ), 'render' => [ new CoreFields\Checkbox(), 'input' ], @@ -430,7 +430,7 @@ public function emails_settings( $settings ) { 'slug' => 'post_author', 'default' => false, 'addons' => [ - 'label' => __( 'Disable email to post author about a new comment', 'notification' ), + 'label' => __( 'Disable email to post author about a new comment', 'notification' ), ], 'description' => __( 'Email is sent after comment is published.', 'notification' ), 'render' => [ new CoreFields\Checkbox(), 'input' ], @@ -441,7 +441,7 @@ public function emails_settings( $settings ) { 'slug' => 'comment_moderator', 'default' => false, 'addons' => [ - 'label' => __( 'Disable email to moderator (admin) when new comment awaits moderation', 'notification' ), + 'label' => __( 'Disable email to moderator (admin) when new comment awaits moderation', 'notification' ), ], 'description' => __( 'Email is sent when new comment is awaiting approval.', 'notification' ), 'render' => [ new CoreFields\Checkbox(), 'input' ], @@ -452,7 +452,7 @@ public function emails_settings( $settings ) { 'slug' => 'password_forgotten_to_user', 'default' => false, 'addons' => [ - 'label' => __( 'Disable email to user with password reset link', 'notification' ), + 'label' => __( 'Disable email to user with password reset link', 'notification' ), ], 'description' => __( 'Email is sent when user fills out the password reset request.', 'notification' ), 'render' => [ new CoreFields\Checkbox(), 'input' ], @@ -463,7 +463,7 @@ public function emails_settings( $settings ) { 'slug' => 'password_change_to_admin', 'default' => false, 'addons' => [ - 'label' => __( 'Disable email to admin when user changed their password', 'notification' ), + 'label' => __( 'Disable email to admin when user changed their password', 'notification' ), ], 'description' => __( 'Email is sent when user changes his password.', 'notification' ), 'render' => [ new CoreFields\Checkbox(), 'input' ], @@ -474,7 +474,7 @@ public function emails_settings( $settings ) { 'slug' => 'password_change_to_user', 'default' => false, 'addons' => [ - 'label' => __( 'Disable email to user when their password has been changed', 'notification' ), + 'label' => __( 'Disable email to user when their password has been changed', 'notification' ), ], 'description' => __( 'Email is sent when user changes his password.', 'notification' ), 'render' => [ new CoreFields\Checkbox(), 'input' ], @@ -485,7 +485,7 @@ public function emails_settings( $settings ) { 'slug' => 'email_change_to_user', 'default' => false, 'addons' => [ - 'label' => __( 'Disable email to user about profile email address change', 'notification' ), + 'label' => __( 'Disable email to user about profile email address change', 'notification' ), ], 'description' => __( 'Email is sent when user saves a new email address in his profile.', 'notification' ), 'render' => [ new CoreFields\Checkbox(), 'input' ], @@ -496,7 +496,7 @@ public function emails_settings( $settings ) { 'slug' => 'send_confirmation_on_profile_email', 'default' => false, 'addons' => [ - 'label' => __( 'Disable email to user about email address change request', 'notification' ), + 'label' => __( 'Disable email to user about email address change request', 'notification' ), ], 'description' => __( 'Email is sent when user requests email address change.', 'notification' ), 'render' => [ new CoreFields\Checkbox(), 'input' ], @@ -507,7 +507,7 @@ public function emails_settings( $settings ) { 'slug' => 'send_confirmation_on_admin_email', 'default' => false, 'addons' => [ - 'label' => __( 'Disable email to admin about site email address change request', 'notification' ), + 'label' => __( 'Disable email to admin about site email address change request', 'notification' ), ], 'description' => __( 'Email is sent when site email address change is requested.', 'notification' ), 'render' => [ new CoreFields\Checkbox(), 'input' ], @@ -518,7 +518,7 @@ public function emails_settings( $settings ) { 'slug' => 'automatic_wp_core_update', 'default' => false, 'addons' => [ - 'label' => __( 'Disable email to admin about successful background update', 'notification' ), + 'label' => __( 'Disable email to admin about successful background update', 'notification' ), ], 'description' => __( 'Email is sent when background updates finishes successfully. "Failed update" email will always be sent to admin.', 'notification' ), 'render' => [ new CoreFields\Checkbox(), 'input' ], From 75de7cc0448c3271d50af9857ad67c8645aa3514 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Sat, 30 Oct 2021 08:06:54 +0200 Subject: [PATCH 07/21] adjust escaping --- src/Utils/Settings/CoreFields/Checkbox.php | 2 +- src/Utils/Settings/CoreFields/Message.php | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Utils/Settings/CoreFields/Checkbox.php b/src/Utils/Settings/CoreFields/Checkbox.php index cc382f3c1..3aebc7248 100644 --- a/src/Utils/Settings/CoreFields/Checkbox.php +++ b/src/Utils/Settings/CoreFields/Checkbox.php @@ -29,7 +29,7 @@ public function input( $field ) { esc_attr( $field->input_id() ), esc_attr( $field->input_name() ), checked( $checked, true, false ), - esc_html( $field->addon( 'label' ) ) + wp_kses_data( $field->addon( 'label' ) ) ); } diff --git a/src/Utils/Settings/CoreFields/Message.php b/src/Utils/Settings/CoreFields/Message.php index cc619db51..85268783e 100644 --- a/src/Utils/Settings/CoreFields/Message.php +++ b/src/Utils/Settings/CoreFields/Message.php @@ -27,10 +27,7 @@ public function input( $field ) { $message = $field->addon( 'message' ); - // We cannot escape message contents as it may use complicated HTML to render - // advanced setting sections. - // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped - echo is_callable( $message ) ? $message() : $message; + echo wp_kses_post( is_callable( $message ) ? $message() : $message ); if ( $field->addon( 'code' ) ) { echo ''; From ab0ea8d209be8d169f32b911ba4d7ad2c0f541da Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Sat, 30 Oct 2021 08:09:44 +0200 Subject: [PATCH 08/21] adjust escaping --- resources/templates/sync/disabled.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/resources/templates/sync/disabled.php b/resources/templates/sync/disabled.php index 1cdd27e8a..5c39efb19 100644 --- a/resources/templates/sync/disabled.php +++ b/resources/templates/sync/disabled.php @@ -9,5 +9,10 @@ * @var BracketSpace\Notification\Dependencies\Micropackage\Templates\Template $this Template instance. */ -// Translators: Function name. -_e( sprintf( 'Synchronization is disabled. You can enable it with %s function', 'notification_sync()' ) ); //phpcs:ignore +echo wp_kses_data( + // Translators: Function name. + __( sprintf( + 'Synchronization is disabled. You can enable it with %s function', + 'notification_sync()' + ), 'notification' ) +); From 8ad3c0bd4e2d7c49880a0a6404f4eae2c1b67223 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Sat, 30 Oct 2021 19:41:18 +0200 Subject: [PATCH 09/21] add stub finder file --- compat/stub-finder.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 compat/stub-finder.php diff --git a/compat/stub-finder.php b/compat/stub-finder.php new file mode 100644 index 000000000..4fb8dcdca --- /dev/null +++ b/compat/stub-finder.php @@ -0,0 +1,16 @@ +in( realpath( __DIR__ . '/..' ) ) + ->notPath( 'resources/' ) + ->notPath( 'node_modules/' ) + ->notPath( 'vendor/' ) + ->notPath( 'tests/' ) + ->sortByName(); From 15b48c315cebb213ce829738207acac0bd5ef223 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Sat, 30 Oct 2021 19:48:21 +0200 Subject: [PATCH 10/21] add cache micropackage --- composer.json | 1 + composer.lock | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6a47a370a..b8e2b3509 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "composer-runtime-api": "^2.0", "enshrined/svg-sanitize": "^0.14.1", "micropackage/ajax": "^1.0", + "micropackage/cache": "^1.0", "micropackage/dochooks": "1.0.2", "micropackage/filesystem": "^1.1", "micropackage/requirements": "^1.0", diff --git a/composer.lock b/composer.lock index f44a58adb..7b506ba85 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "73d95408e7ddb8485b92b953cf7868d2", + "content-hash": "30e1e073ac4fa4f0689b9d33eecf768b", "packages": [ { "name": "enshrined/svg-sanitize", @@ -99,6 +99,52 @@ }, "time": "2020-02-11T09:58:59+00:00" }, + { + "name": "micropackage/cache", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/micropackage/cache.git", + "reference": "4132b1de3036d72befc526ba4e78f50b5f23764c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/micropackage/cache/zipball/4132b1de3036d72befc526ba4e78f50b5f23764c", + "reference": "4132b1de3036d72befc526ba4e78f50b5f23764c", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0", + "phpcompatibility/php-compatibility": "^9.1", + "phpunit/phpunit": "^6.5.5", + "wp-coding-standards/wpcs": "^2.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Micropackage\\Cache\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-3.0-or-later" + ], + "authors": [ + { + "name": "Jakub Mikita", + "email": "jakub@bracketspace.com" + } + ], + "description": "WordPress Cache wrapper with Object and Transient drivers", + "support": { + "issues": "https://github.com/micropackage/cache/issues", + "source": "https://github.com/micropackage/cache/tree/1.0.3" + }, + "time": "2021-10-30T17:44:14+00:00" + }, { "name": "micropackage/dochooks", "version": "1.0.2", From 45451cba611d87a0c9ebe0baf28ab35a733a1760 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Sat, 30 Oct 2021 19:55:33 +0200 Subject: [PATCH 11/21] deprecate utils cache --- {src => compat/src-deprecated}/Utils/Cache/Cache.php | 2 +- {src => compat/src-deprecated}/Utils/Cache/ObjectCache.php | 1 + {src => compat/src-deprecated}/Utils/Cache/Transient.php | 2 +- {src => compat/src-deprecated}/Utils/Interfaces/Cacheable.php | 0 readme.txt | 2 ++ 5 files changed, 5 insertions(+), 2 deletions(-) rename {src => compat/src-deprecated}/Utils/Cache/Cache.php (77%) rename {src => compat/src-deprecated}/Utils/Cache/ObjectCache.php (91%) rename {src => compat/src-deprecated}/Utils/Cache/Transient.php (91%) rename {src => compat/src-deprecated}/Utils/Interfaces/Cacheable.php (100%) diff --git a/src/Utils/Cache/Cache.php b/compat/src-deprecated/Utils/Cache/Cache.php similarity index 77% rename from src/Utils/Cache/Cache.php rename to compat/src-deprecated/Utils/Cache/Cache.php index 602b59009..1f13eeae6 100644 --- a/src/Utils/Cache/Cache.php +++ b/compat/src-deprecated/Utils/Cache/Cache.php @@ -25,13 +25,13 @@ class Cache { * @param string $key cache unique key. */ public function __construct( $key ) { + notification_deprecated_class( __CLASS__, '[Next]', 'BracketSpace\\Notification\\Dependencies\\Micropackage\\Cache\\Cache' ); if ( empty( $key ) ) { trigger_error( 'Cache key cannot be empty' ); } $this->key = $key; - } } diff --git a/src/Utils/Cache/ObjectCache.php b/compat/src-deprecated/Utils/Cache/ObjectCache.php similarity index 91% rename from src/Utils/Cache/ObjectCache.php rename to compat/src-deprecated/Utils/Cache/ObjectCache.php index df4c8ef12..c79670d39 100644 --- a/src/Utils/Cache/ObjectCache.php +++ b/compat/src-deprecated/Utils/Cache/ObjectCache.php @@ -31,6 +31,7 @@ class ObjectCache extends Cache implements Cacheable { * @param string $group cache group, optional. */ public function __construct( $key, $group = '' ) { + notification_deprecated_class( __CLASS__, '[Next]', 'BracketSpace\\Notification\\Dependencies\\Micropackage\\Cache\\Driver\\ObjectCache' ); parent::__construct( $key ); diff --git a/src/Utils/Cache/Transient.php b/compat/src-deprecated/Utils/Cache/Transient.php similarity index 91% rename from src/Utils/Cache/Transient.php rename to compat/src-deprecated/Utils/Cache/Transient.php index 14a4c599c..2c6a3b90c 100644 --- a/src/Utils/Cache/Transient.php +++ b/compat/src-deprecated/Utils/Cache/Transient.php @@ -31,11 +31,11 @@ class Transient extends Cache implements Cacheable { * @param integer $expiration expiration in seconds. */ public function __construct( $key, $expiration = 0 ) { + notification_deprecated_class( __CLASS__, '[Next]', 'BracketSpace\\Notification\\Dependencies\\Micropackage\\Cache\\Driver\\Transient' ); parent::__construct( $key ); $this->expiration = $expiration; - } /** diff --git a/src/Utils/Interfaces/Cacheable.php b/compat/src-deprecated/Utils/Interfaces/Cacheable.php similarity index 100% rename from src/Utils/Interfaces/Cacheable.php rename to compat/src-deprecated/Utils/Interfaces/Cacheable.php diff --git a/readme.txt b/readme.txt index 76a473e43..a8980e128 100644 --- a/readme.txt +++ b/readme.txt @@ -299,6 +299,8 @@ Yes, just activate the debug log in the DEBUGGING section of the plugin settings * [Added] HTML escaping and nonce verifications. * [Changed] Notification file syncing is now using Filesystem methods. +* [Changed] Internal cache classes with `micropackage/cache`. +* [Removed] Internal cache classes `Bracketspace\Notification\Utils\Cache` and `Bracketspace\Notification\Utils\Interfaces` namespaces. = 8.0.1 = From db313ba91076a62a192331e5c7be4550e018b67e Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Sun, 31 Oct 2021 12:26:30 +0100 Subject: [PATCH 12/21] refactor cache usage with micropackage/cache --- src/Admin/Extensions.php | 20 +++++-------- src/Admin/PostType.php | 22 +++++++------- src/Core/License.php | 57 ++++++++++++------------------------ src/Queries/UserQueries.php | 47 +++++++++++++++-------------- src/Utils/WpObjectHelper.php | 17 +++++------ 5 files changed, 68 insertions(+), 95 deletions(-) diff --git a/src/Admin/Extensions.php b/src/Admin/Extensions.php index e781cfc28..c99e20a8a 100644 --- a/src/Admin/Extensions.php +++ b/src/Admin/Extensions.php @@ -12,7 +12,8 @@ use BracketSpace\Notification\Core\Whitelabel; use BracketSpace\Notification\ErrorHandler; use BracketSpace\Notification\Utils\EDDUpdater; -use BracketSpace\Notification\Utils\Cache\Transient as TransientCache; +use BracketSpace\Notification\Dependencies\Micropackage\Cache\Cache; +use BracketSpace\Notification\Dependencies\Micropackage\Cache\Driver as CacheDriver; /** * Extensions class @@ -134,26 +135,19 @@ public function load_extensions() { * @return array */ public function get_raw_extensions() { - $extensions_cache = new TransientCache( 'notification_extensions', DAY_IN_SECONDS ); - - if ( ErrorHandler::debug_enabled() ) { - $extensions = false; - } else { - $extensions = $extensions_cache->get(); - } - - if ( false === $extensions ) { + $driver = new CacheDriver\Transient( ErrorHandler::debug_enabled() ? DAY_IN_SECONDS : 1 ); + $cache = new Cache( $driver, 'notification_extensions' ); + return $cache->collect( function() { $response = wp_remote_get( $this->api_url ); $extensions = []; if ( ! is_wp_error( $response ) && 200 === wp_remote_retrieve_response_code( $response ) ) { $extensions = json_decode( wp_remote_retrieve_body( $response ), true ); - $extensions_cache->set( $extensions ); } - } - return $extensions; + return $extensions; + } ); } /** diff --git a/src/Admin/PostType.php b/src/Admin/PostType.php index 677451602..06d85f607 100644 --- a/src/Admin/PostType.php +++ b/src/Admin/PostType.php @@ -8,9 +8,10 @@ namespace BracketSpace\Notification\Admin; use BracketSpace\Notification\Core\Notification; -use BracketSpace\Notification\Utils\Cache\ObjectCache; use BracketSpace\Notification\Store; use BracketSpace\Notification\Dependencies\Micropackage\Ajax\Response; +use BracketSpace\Notification\Dependencies\Micropackage\Cache\Cache; +use BracketSpace\Notification\Dependencies\Micropackage\Cache\Driver as CacheDriver; /** * PostType class @@ -300,7 +301,8 @@ public function save( $post_id, $post, $update ) { $notification_post->save(); - $cache = new ObjectCache( 'notifications', 'notification' ); + $cache = new CacheDriver\ObjectCache( 'notification' ); + $cache->set_key( 'notifications' ); $cache->delete(); do_action( 'notification/data/save/after', $notification_post ); @@ -354,12 +356,12 @@ public function ajax_change_notification_status() { * @return array */ public static function get_all_notifications() { - global $wpdb; + $driver = new CacheDriver\ObjectCache( 'notification' ); + $cache = new Cache( $driver, 'notifications' ); - $cache = new ObjectCache( 'notifications', 'notification' ); - $notifications = $cache->get(); + return $cache->collect( function() { + global $wpdb; - if ( empty( $notifications ) ) { $sql = "SELECT p.post_content FROM {$wpdb->posts} p WHERE p.post_type = 'notification' AND p.post_status = 'publish' @@ -367,12 +369,8 @@ public static function get_all_notifications() { // We're using direct db call for performance purposes - we only need the post_content field. // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared - $notifications = $wpdb->get_col( $sql ); - - $cache->set( $notifications ); - } - - return $notifications; + return $wpdb->get_col( $sql ); + } ); } /** diff --git a/src/Core/License.php b/src/Core/License.php index 1aa98da61..2547a6048 100644 --- a/src/Core/License.php +++ b/src/Core/License.php @@ -10,8 +10,8 @@ namespace BracketSpace\Notification\Core; use BracketSpace\Notification\ErrorHandler; -use BracketSpace\Notification\Utils\Cache\ObjectCache; -use BracketSpace\Notification\Utils\Cache\Transient as TransientCache; +use BracketSpace\Notification\Dependencies\Micropackage\Cache\Cache; +use BracketSpace\Notification\Dependencies\Micropackage\Cache\Driver as CacheDriver; /** * License class @@ -59,28 +59,19 @@ public function get_licenses() { * @return mixed license data or false */ public function get() { + $driver = new CacheDriver\ObjectCache( 'notification_license', ErrorHandler::debug_enabled() ? 0 : 1 ); + $cache = new Cache( $driver, $this->extension['slug'] ); - $license_cache = new ObjectCache( $this->extension['slug'], 'notification_license' ); - - if ( ErrorHandler::debug_enabled() ) { - $license = false; - } else { - $license = $license_cache->get(); - } - - if ( empty( $license ) ) { - + return $cache->collect( function() { $licenses = $this->get_licenses(); $license = false; if ( isset( $licenses[ $this->extension['slug'] ] ) ) { $license = $licenses[ $this->extension['slug'] ]; - $license_cache->set( $license ); } - } - - return $license; + return $license; + } ); } /** @@ -90,23 +81,16 @@ public function get() { * @return boolean */ public function is_valid() { - $license_data = $this->get(); if ( empty( $license_data ) ) { return false; } - $license_transient = new TransientCache( 'notification_checked_license' . $this->extension['slug'], DAY_IN_SECONDS ); - - if ( ErrorHandler::debug_enabled() ) { - $license = false; - } else { - $license = $license_transient->get(); - } - - if ( empty( $license ) ) { + $driver = new CacheDriver\Transient( ErrorHandler::debug_enabled() ? DAY_IN_SECONDS : 1 ); + $cache = new Cache( $driver, sprintf( 'notification_license_check_%s', $this->extension['slug'] ) ); + return $cache->collect( function() use ( $license_data ) { $license_check = $this->check( $license_data->license_key ); if ( is_wp_error( $license_check ) ) { @@ -116,12 +100,9 @@ public function is_valid() { $license_check->license_key = $license_data->license_key; $license_data = $license_check; $this->save( $license_data ); - $license_transient->set( $license_data ); - - } - - return 'valid' === $license_data->license; + return 'valid' === $license_data->license; + } ); } /** @@ -143,15 +124,14 @@ public function get_key() { * @return void */ public function save( $license_data ) { - - $license_cache = new ObjectCache( $this->extension['slug'], 'notification_license' ); - $license_cache->set( $license_data ); + $driver = new CacheDriver\ObjectCache( 'notification_license' ); + $cache = new Cache( $driver, $this->extension['slug'] ); + $cache->set( $license_data ); $licenses = $this->get_licenses(); $licenses[ $this->extension['slug'] ] = $license_data; update_option( $this->license_storage, $licenses ); - } /** @@ -161,9 +141,9 @@ public function save( $license_data ) { * @return void */ public function remove() { - - $license_cache = new ObjectCache( $this->extension['slug'], 'notification_license' ); - $license_cache->delete(); + $driver = new CacheDriver\ObjectCache( 'notification_license' ); + $cache = new Cache( $driver, $this->extension['slug'] ); + $cache->delete(); $licenses = $this->get_licenses(); if ( isset( $licenses[ $this->extension['slug'] ] ) ) { @@ -171,7 +151,6 @@ public function remove() { } update_option( $this->license_storage, $licenses ); - } /** diff --git a/src/Queries/UserQueries.php b/src/Queries/UserQueries.php index 4bb721add..3ac92df48 100644 --- a/src/Queries/UserQueries.php +++ b/src/Queries/UserQueries.php @@ -7,7 +7,8 @@ namespace BracketSpace\Notification\Queries; -use BracketSpace\Notification\Utils\Cache\ObjectCache; +use BracketSpace\Notification\Dependencies\Micropackage\Cache\Cache; +use BracketSpace\Notification\Dependencies\Micropackage\Cache\Driver as CacheDriver; /** * Users Queries class @@ -20,18 +21,16 @@ class UserQueries { * @return array */ public static function all() { - global $wpdb; + $driver = new CacheDriver\ObjectCache( 'notification' ); + $cache = new Cache( $driver, 'users' ); - $cache = new ObjectCache( 'users', 'notification' ); + return $cache->collect( function() { + global $wpdb; - $users = $cache->get(); - - if ( empty( $users ) ) { - $users = $wpdb->get_results( "SELECT ID, user_email, display_name FROM $wpdb->users", 'ARRAY_A' ); //phpcs:ignore - $cache->set( $users ); - } - - return $users; + // We're using direct db call for performance purposes - we only need the post_content field. + // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.PreparedSQL.NotPrepared + return $wpdb->get_results( "SELECT ID, user_email, display_name FROM $wpdb->users", 'ARRAY_A' ); + } ); } /** @@ -41,21 +40,25 @@ public static function all() { * @return array */ public static function with_role( string $role ) { - global $wpdb; + $driver = new CacheDriver\ObjectCache( 'notification' ); + $cache = new Cache( $driver, sprintf( '%s_users', $role ) ); - $cache = new ObjectCache( $role . '_users', 'notification' ); + return $cache->collect( function() { + global $wpdb; - $users = $cache->get(); - - if ( empty( $users ) ) { - $users = $wpdb->get_results( //phpcs:ignore - $wpdb->prepare( "SELECT u.ID, u.user_email, u.display_name FROM $wpdb->users AS u INNER JOIN $wpdb->usermeta AS m ON u.ID = m.user_id WHERE m.meta_key = '{$wpdb->get_blog_prefix()}capabilities' AND m.meta_value LIKE %s", '%\"' . $wpdb->esc_like( $role ) . '\"%' ), + // We're using direct db call for performance purposes - we only need the post_content field. + // phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching + return $wpdb->get_results( + $wpdb->prepare( + "SELECT u.ID, u.user_email, u.display_name + FROM $wpdb->users AS u + INNER JOIN $wpdb->usermeta AS m ON u.ID = m.user_id + WHERE m.meta_key = '{$wpdb->get_blog_prefix()}capabilities' + AND m.meta_value LIKE %s", '%\"' . $wpdb->esc_like( $role ) . '\"%' + ), 'ARRAY_A' ); - $cache->set( $users ); - } - - return $users; + } ); } } diff --git a/src/Utils/WpObjectHelper.php b/src/Utils/WpObjectHelper.php index fedf41f28..dff25db85 100644 --- a/src/Utils/WpObjectHelper.php +++ b/src/Utils/WpObjectHelper.php @@ -9,7 +9,8 @@ namespace BracketSpace\Notification\Utils; -use BracketSpace\Notification\Utils\Cache\ObjectCache; +use BracketSpace\Notification\Dependencies\Micropackage\Cache\Cache; +use BracketSpace\Notification\Dependencies\Micropackage\Cache\Driver as CacheDriver; /** * WpObjectHelper class @@ -123,12 +124,12 @@ public static function get_comment_type_name( $comment_type_slug ) { * @return array */ public static function get_comment_types() : array { - global $wpdb; + $driver = new CacheDriver\ObjectCache( 'notification' ); + $cache = new Cache( $driver, 'comment_types' ); - $types_cache = new ObjectCache( 'comment_types', 'notification' ); - $comment_types = $types_cache->get(); + return $cache->collect( function() { + global $wpdb; - if ( false === $comment_types ) { $comment_types = [ 'comment' => __( 'Comment', 'notification' ), 'pingback' => __( 'Pingback', 'notification' ), @@ -152,10 +153,8 @@ public static function get_comment_types() : array { } } - $types_cache->set( $comment_types ); - } - - return $comment_types; + return $comment_types; + } ); } } From d0f8c6957c84a1770ab4a8ad4f1318ca817319e7 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Sun, 31 Oct 2021 12:33:57 +0100 Subject: [PATCH 13/21] fix phpstan --- phpstan-baseline.neon | 40 +++++++++++++++++++++++-------------- src/Queries/UserQueries.php | 2 +- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 206d128e0..91c8590da 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -405,6 +405,21 @@ parameters: count: 1 path: compat/register-hooks.php + - + message: "#^Method BracketSpace\\\\Notification\\\\Utils\\\\Interfaces\\\\Cacheable\\:\\:add\\(\\) has no return typehint specified\\.$#" + count: 1 + path: compat/src-deprecated/Utils/Interfaces/Cacheable.php + + - + message: "#^Method BracketSpace\\\\Notification\\\\Utils\\\\Interfaces\\\\Cacheable\\:\\:delete\\(\\) has no return typehint specified\\.$#" + count: 1 + path: compat/src-deprecated/Utils/Interfaces/Cacheable.php + + - + message: "#^Method BracketSpace\\\\Notification\\\\Utils\\\\Interfaces\\\\Cacheable\\:\\:set\\(\\) has no return typehint specified\\.$#" + count: 1 + path: compat/src-deprecated/Utils/Interfaces/Cacheable.php + - message: "#^Function notification_get_notification_recipients\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -435,6 +450,11 @@ parameters: count: 1 path: compat/src-deprecated/functions.php + - + message: "#^Call to static method create\\(\\) on an unknown class StubsGenerator\\\\Finder\\.$#" + count: 1 + path: compat/stub-finder.php + - message: "#^Method Notification\\:\\:components\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 @@ -1020,6 +1040,11 @@ parameters: count: 1 path: src/Core/Debugging.php + - + message: "#^Access to an undefined property object\\:\\:\\$license\\.$#" + count: 1 + path: src/Core/License.php + - message: "#^Access to an undefined property object\\:\\:\\$license_key\\.$#" count: 1 @@ -2600,21 +2625,6 @@ parameters: count: 1 path: src/Runtime.php - - - message: "#^Method BracketSpace\\\\Notification\\\\Utils\\\\Interfaces\\\\Cacheable\\:\\:add\\(\\) has no return typehint specified\\.$#" - count: 1 - path: src/Utils/Interfaces/Cacheable.php - - - - message: "#^Method BracketSpace\\\\Notification\\\\Utils\\\\Interfaces\\\\Cacheable\\:\\:delete\\(\\) has no return typehint specified\\.$#" - count: 1 - path: src/Utils/Interfaces/Cacheable.php - - - - message: "#^Method BracketSpace\\\\Notification\\\\Utils\\\\Interfaces\\\\Cacheable\\:\\:set\\(\\) has no return typehint specified\\.$#" - count: 1 - path: src/Utils/Interfaces/Cacheable.php - - message: "#^Method BracketSpace\\\\Notification\\\\Utils\\\\Settings\\:\\:get_sections\\(\\) return type has no value type specified in iterable type array\\.$#" count: 1 diff --git a/src/Queries/UserQueries.php b/src/Queries/UserQueries.php index 3ac92df48..4cd918299 100644 --- a/src/Queries/UserQueries.php +++ b/src/Queries/UserQueries.php @@ -43,7 +43,7 @@ public static function with_role( string $role ) { $driver = new CacheDriver\ObjectCache( 'notification' ); $cache = new Cache( $driver, sprintf( '%s_users', $role ) ); - return $cache->collect( function() { + return $cache->collect( function() use ( $role ) { global $wpdb; // We're using direct db call for performance purposes - we only need the post_content field. From 24c95cb2a8cccdccb922662f49a9aaa9d1823f5d Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Tue, 2 Nov 2021 15:47:35 +0100 Subject: [PATCH 14/21] remove internal caching of the settings --- readme.txt | 1 + src/Utils/Settings.php | 30 ++++++++++++++---------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/readme.txt b/readme.txt index 650f682f9..790fa2a64 100644 --- a/readme.txt +++ b/readme.txt @@ -302,6 +302,7 @@ Yes, just activate the debug log in the DEBUGGING section of the plugin settings * [Changed] Internal cache classes with `micropackage/cache`. * [Changed] Menu icon. * [Removed] Internal cache classes `Bracketspace\Notification\Utils\Cache` and `Bracketspace\Notification\Utils\Interfaces` namespaces. +* [Removed] Settings internal caching that couldn't wait for all the fields to be registered. Now we're relying on the get_option() core function caching. = 8.0.1 = diff --git a/src/Utils/Settings.php b/src/Utils/Settings.php index a11df5fa9..c87dcaf78 100644 --- a/src/Utils/Settings.php +++ b/src/Utils/Settings.php @@ -205,28 +205,26 @@ public function save_settings() { * @return array settings */ public function get_settings() { - if ( empty( $this->settings ) ) { - foreach ( $this->get_sections() as $section_slug => $section ) { - $setting = get_option( $this->handle . '_' . $section_slug ); - - $this->settings[ $section_slug ] = []; + foreach ( $this->get_sections() as $section_slug => $section ) { + $setting = get_option( $this->handle . '_' . $section_slug ); - $groups = $section->get_groups(); + $this->settings[ $section_slug ] = []; - foreach ( $groups as $group_slug => $group ) { - $this->settings[ $section_slug ][ $group_slug ] = []; + $groups = $section->get_groups(); - $fields = $group->get_fields(); + foreach ( $groups as $group_slug => $group ) { + $this->settings[ $section_slug ][ $group_slug ] = []; - foreach ( $fields as $field_slug => $field ) { - if ( isset( $setting[ $group_slug ][ $field_slug ] ) ) { - $value = $setting[ $group_slug ][ $field_slug ]; - } else { - $value = $field->default_value(); - } + $fields = $group->get_fields(); - $this->settings[ $section_slug ][ $group_slug ][ $field_slug ] = $value; + foreach ( $fields as $field_slug => $field ) { + if ( isset( $setting[ $group_slug ][ $field_slug ] ) ) { + $value = $setting[ $group_slug ][ $field_slug ]; + } else { + $value = $field->default_value(); } + + $this->settings[ $section_slug ][ $group_slug ][ $field_slug ] = $value; } } } From 9a584bd736ce769ff45b24da3267e173ecbbeb9a Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Tue, 2 Nov 2021 15:48:50 +0100 Subject: [PATCH 15/21] remove internal settings prop --- src/Utils/Settings.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/Utils/Settings.php b/src/Utils/Settings.php index c87dcaf78..9d5a6827d 100644 --- a/src/Utils/Settings.php +++ b/src/Utils/Settings.php @@ -21,13 +21,6 @@ class Settings { */ private $sections = []; - /** - * All saved Settings - * - * @var array - */ - private $settings = []; - /** * Settings handle, used as a prefix for options * @@ -208,12 +201,12 @@ public function get_settings() { foreach ( $this->get_sections() as $section_slug => $section ) { $setting = get_option( $this->handle . '_' . $section_slug ); - $this->settings[ $section_slug ] = []; + $settings[ $section_slug ] = []; $groups = $section->get_groups(); foreach ( $groups as $group_slug => $group ) { - $this->settings[ $section_slug ][ $group_slug ] = []; + $settings[ $section_slug ][ $group_slug ] = []; $fields = $group->get_fields(); @@ -224,12 +217,12 @@ public function get_settings() { $value = $field->default_value(); } - $this->settings[ $section_slug ][ $group_slug ][ $field_slug ] = $value; + $settings[ $section_slug ][ $group_slug ][ $field_slug ] = $value; } } } - return apply_filters( $this->handle . '/settings/saved_settings', $this->settings, $this ); + return apply_filters( $this->handle . '/settings/saved_settings', $settings, $this ); } /** From 990d400051f521ade20eb23f5b625eedc73753ef Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Tue, 2 Nov 2021 15:55:10 +0100 Subject: [PATCH 16/21] fix phpstan --- phpstan-baseline.neon | 5 ----- src/Utils/Settings.php | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 91c8590da..0b827463d 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2640,11 +2640,6 @@ parameters: count: 1 path: src/Utils/Settings.php - - - message: "#^Property BracketSpace\\\\Notification\\\\Utils\\\\Settings\\:\\:\\$settings type has no value type specified in iterable type array\\.$#" - count: 1 - path: src/Utils/Settings.php - - message: "#^Parameter \\#1 \\$url of function esc_url expects string, string\\|false given\\.$#" count: 1 diff --git a/src/Utils/Settings.php b/src/Utils/Settings.php index 9d5a6827d..fb0d3214f 100644 --- a/src/Utils/Settings.php +++ b/src/Utils/Settings.php @@ -198,6 +198,8 @@ public function save_settings() { * @return array settings */ public function get_settings() { + $settings = []; + foreach ( $this->get_sections() as $section_slug => $section ) { $setting = get_option( $this->handle . '_' . $section_slug ); From 557ba283d5947e22adeb101fa2a972d5602a7800 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Thu, 4 Nov 2021 12:13:40 +0100 Subject: [PATCH 17/21] bundle vue within the deps --- package.json | 3 ++- readme.txt | 1 + resources/js/src/fields/repeater/components/inputs/select.js | 3 ++- .../fields/repeater/components/repeater/nestedSubField.js | 2 +- .../src/fields/repeater/components/repeater/recipientRow.js | 2 +- .../src/fields/repeater/components/repeater/repeaterRow.js | 2 +- .../fields/repeater/components/repeater/repeaterSubRow.js | 2 +- resources/js/src/fields/repeater/nestedRepeater.js | 2 +- .../js/src/fields/section-repeater/components/checkbox.js | 3 +-- resources/js/src/fields/section-repeater/components/input.js | 3 +-- .../js/src/fields/section-repeater/components/select.js | 3 ++- .../js/src/fields/section-repeater/components/textarea.js | 3 +-- .../js/src/fields/section-repeater/mixins/sectionsHandler.js | 4 +++- resources/js/src/fields/section-repeater/sectionRepeater.js | 2 +- .../src/fields/section-repeater/sections/nestedSubSection.js | 2 +- .../js/src/fields/section-repeater/sections/sectionSubRow.js | 2 +- .../js/src/fields/section-repeater/sections/sectionsRow.js | 2 +- src/Admin/Scripts.php | 4 +--- yarn.lock | 5 +++++ 19 files changed, 28 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index eaa9c35e1..160e0de40 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,8 @@ "dependencies": { "clipboard": "^2.0.4", "jquery-collapse": "^1.1.2", - "selectize": "^0.12.4" + "selectize": "^0.12.4", + "vue": "2.6.11" }, "mpScriptsConfig": { "paths": { diff --git a/readme.txt b/readme.txt index 790fa2a64..997af4bd6 100644 --- a/readme.txt +++ b/readme.txt @@ -301,6 +301,7 @@ Yes, just activate the debug log in the DEBUGGING section of the plugin settings * [Changed] Notification file syncing is now using Filesystem methods. * [Changed] Internal cache classes with `micropackage/cache`. * [Changed] Menu icon. +* [Changed] Vue is now loaded from within the plugin instead of CDN. * [Removed] Internal cache classes `Bracketspace\Notification\Utils\Cache` and `Bracketspace\Notification\Utils\Interfaces` namespaces. * [Removed] Settings internal caching that couldn't wait for all the fields to be registered. Now we're relying on the get_option() core function caching. diff --git a/resources/js/src/fields/repeater/components/inputs/select.js b/resources/js/src/fields/repeater/components/inputs/select.js index 2f29d825e..5a1b5d15d 100644 --- a/resources/js/src/fields/repeater/components/inputs/select.js +++ b/resources/js/src/fields/repeater/components/inputs/select.js @@ -1,4 +1,5 @@ -/* global Vue, jQuery, notification */ +/* global jQuery, notification */ +import Vue from "vue/dist/vue.js"; import { inputsHandler } from "../../mixins/inputsHandler"; import { fieldHandler } from "../../mixins/fieldHandler"; diff --git a/resources/js/src/fields/repeater/components/repeater/nestedSubField.js b/resources/js/src/fields/repeater/components/repeater/nestedSubField.js index 2b34ec635..dc75f523a 100644 --- a/resources/js/src/fields/repeater/components/repeater/nestedSubField.js +++ b/resources/js/src/fields/repeater/components/repeater/nestedSubField.js @@ -1,4 +1,4 @@ -/* global Vue */ +import Vue from "vue/dist/vue.js"; import { fieldHandler } from "../../mixins/fieldHandler"; import { repeaterHandler } from "../../mixins/repeaterHandler"; diff --git a/resources/js/src/fields/repeater/components/repeater/recipientRow.js b/resources/js/src/fields/repeater/components/repeater/recipientRow.js index 2cde8dbd8..fd0a01dab 100644 --- a/resources/js/src/fields/repeater/components/repeater/recipientRow.js +++ b/resources/js/src/fields/repeater/components/repeater/recipientRow.js @@ -1,4 +1,4 @@ -/* global Vue */ +import Vue from "vue/dist/vue.js"; import { fieldHandler } from "../../mixins/fieldHandler"; import { inputsHandler } from "../../mixins/inputsHandler"; diff --git a/resources/js/src/fields/repeater/components/repeater/repeaterRow.js b/resources/js/src/fields/repeater/components/repeater/repeaterRow.js index f2d084a70..f9bbc96c9 100644 --- a/resources/js/src/fields/repeater/components/repeater/repeaterRow.js +++ b/resources/js/src/fields/repeater/components/repeater/repeaterRow.js @@ -1,4 +1,4 @@ -/* global Vue */ +import Vue from "vue/dist/vue.js"; import { fieldHandler } from "../../mixins/fieldHandler"; import { inputsHandler } from "../../mixins/inputsHandler"; diff --git a/resources/js/src/fields/repeater/components/repeater/repeaterSubRow.js b/resources/js/src/fields/repeater/components/repeater/repeaterSubRow.js index 15177ff17..b26547415 100644 --- a/resources/js/src/fields/repeater/components/repeater/repeaterSubRow.js +++ b/resources/js/src/fields/repeater/components/repeater/repeaterSubRow.js @@ -1,4 +1,4 @@ -/* global Vue */ +import Vue from "vue/dist/vue.js"; import { fieldHandler } from "../../mixins/fieldHandler"; import { inputsHandler } from "../../mixins/inputsHandler"; import sortableHandle from "../../mixins/sortableHandle"; diff --git a/resources/js/src/fields/repeater/nestedRepeater.js b/resources/js/src/fields/repeater/nestedRepeater.js index 1e2be6ba1..bcb922b3d 100644 --- a/resources/js/src/fields/repeater/nestedRepeater.js +++ b/resources/js/src/fields/repeater/nestedRepeater.js @@ -1,4 +1,4 @@ -/* global Vue */ +import Vue from "vue/dist/vue.js"; import { init } from "./mixins/init"; import { fieldHandler } from "./mixins/fieldHandler"; import { inputsHandler } from "./mixins/inputsHandler"; diff --git a/resources/js/src/fields/section-repeater/components/checkbox.js b/resources/js/src/fields/section-repeater/components/checkbox.js index 2007e3850..cbe501a7a 100644 --- a/resources/js/src/fields/section-repeater/components/checkbox.js +++ b/resources/js/src/fields/section-repeater/components/checkbox.js @@ -1,5 +1,4 @@ -/* global Vue */ - +import Vue from "vue/dist/vue.js"; import { inputsHandler } from "../../repeater/mixins/inputsHandler"; import { fieldHandler } from "../../repeater/mixins/fieldHandler"; import { inputNameHandler } from "../mixins/inputNameHandler"; diff --git a/resources/js/src/fields/section-repeater/components/input.js b/resources/js/src/fields/section-repeater/components/input.js index 98d102263..b5dd03f3c 100644 --- a/resources/js/src/fields/section-repeater/components/input.js +++ b/resources/js/src/fields/section-repeater/components/input.js @@ -1,5 +1,4 @@ -/* global Vue */ - +import Vue from "vue/dist/vue.js"; import { inputsHandler } from "../../repeater/mixins/inputsHandler"; import { fieldHandler } from "../../repeater/mixins/fieldHandler"; import { inputNameHandler } from "../mixins/inputNameHandler"; diff --git a/resources/js/src/fields/section-repeater/components/select.js b/resources/js/src/fields/section-repeater/components/select.js index 024892934..763669ca1 100644 --- a/resources/js/src/fields/section-repeater/components/select.js +++ b/resources/js/src/fields/section-repeater/components/select.js @@ -1,4 +1,5 @@ -/* global Vue, jQuery, notification */ +/* global jQuery, notification */ +import Vue from "vue/dist/vue.js"; import { inputsHandler } from "../../repeater/mixins/inputsHandler"; import { fieldHandler } from "../../repeater/mixins/fieldHandler"; import { inputNameHandler } from "../mixins/inputNameHandler"; diff --git a/resources/js/src/fields/section-repeater/components/textarea.js b/resources/js/src/fields/section-repeater/components/textarea.js index a0a8db5e5..84ee10efd 100644 --- a/resources/js/src/fields/section-repeater/components/textarea.js +++ b/resources/js/src/fields/section-repeater/components/textarea.js @@ -1,5 +1,4 @@ -/* global Vue */ - +import Vue from "vue/dist/vue.js"; import { inputsHandler } from "../../repeater/mixins/inputsHandler"; import { fieldHandler } from "../../repeater/mixins/fieldHandler"; import { inputNameHandler } from "../mixins/inputNameHandler"; diff --git a/resources/js/src/fields/section-repeater/mixins/sectionsHandler.js b/resources/js/src/fields/section-repeater/mixins/sectionsHandler.js index 8d8e494e2..c210e5da0 100644 --- a/resources/js/src/fields/section-repeater/mixins/sectionsHandler.js +++ b/resources/js/src/fields/section-repeater/mixins/sectionsHandler.js @@ -1,4 +1,6 @@ -/* global notification, Vue */ +/* global notification */ + +import Vue from "vue/dist/vue.js"; export const sectionsHandler = { data() { diff --git a/resources/js/src/fields/section-repeater/sectionRepeater.js b/resources/js/src/fields/section-repeater/sectionRepeater.js index ea1d28fd3..68eefa53a 100644 --- a/resources/js/src/fields/section-repeater/sectionRepeater.js +++ b/resources/js/src/fields/section-repeater/sectionRepeater.js @@ -1,4 +1,4 @@ -/* global Vue */ +import Vue from "vue/dist/vue.js"; import { init } from "./mixins/init"; import { sectionsModal } from "./mixins/sectionsModal"; import { sectionsHandler } from "./mixins/sectionsHandler"; diff --git a/resources/js/src/fields/section-repeater/sections/nestedSubSection.js b/resources/js/src/fields/section-repeater/sections/nestedSubSection.js index 2d301ab79..c127ff147 100644 --- a/resources/js/src/fields/section-repeater/sections/nestedSubSection.js +++ b/resources/js/src/fields/section-repeater/sections/nestedSubSection.js @@ -1,4 +1,4 @@ -/* global Vue */ +import Vue from "vue/dist/vue.js"; import { sectionsModal } from "../mixins/sectionsModal"; import { sectionsHandler } from "../mixins/sectionsHandler"; diff --git a/resources/js/src/fields/section-repeater/sections/sectionSubRow.js b/resources/js/src/fields/section-repeater/sections/sectionSubRow.js index 89006f5ad..91cb4caeb 100644 --- a/resources/js/src/fields/section-repeater/sections/sectionSubRow.js +++ b/resources/js/src/fields/section-repeater/sections/sectionSubRow.js @@ -1,4 +1,4 @@ -/* global Vue */ +import Vue from "vue/dist/vue.js"; import { fieldHandler } from "../../repeater/mixins/fieldHandler"; import { inputsHandler } from "../../repeater/mixins/inputsHandler"; diff --git a/resources/js/src/fields/section-repeater/sections/sectionsRow.js b/resources/js/src/fields/section-repeater/sections/sectionsRow.js index 44aa6dc75..2513ab8b0 100644 --- a/resources/js/src/fields/section-repeater/sections/sectionsRow.js +++ b/resources/js/src/fields/section-repeater/sections/sectionsRow.js @@ -1,4 +1,4 @@ -/* global Vue */ +import Vue from "vue/dist/vue.js"; import { fieldHandler } from "../../repeater/mixins/fieldHandler"; import { sectionsHandler } from "../mixins/sectionsHandler"; diff --git a/src/Admin/Scripts.php b/src/Admin/Scripts.php index 9023da0f1..87a495f59 100644 --- a/src/Admin/Scripts.php +++ b/src/Admin/Scripts.php @@ -66,9 +66,7 @@ public function enqueue_scripts( $page_hook ) { wp_enqueue_media(); - wp_enqueue_script( 'notification-vue', '//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js', [], '2.6.11', true ); - - wp_enqueue_script( 'notification', $this->filesystem->url( 'resources/js/dist/scripts.js' ), [ 'jquery', 'wp-color-picker', 'wp-i18n', 'wp-hooks', 'jquery-ui-sortable', 'wp-polyfill', 'notification-vue', 'wp-tinymce', 'wplink' ], $this->filesystem->mtime( 'resources/js/dist/scripts.js' ), true ); + wp_enqueue_script( 'notification', $this->filesystem->url( 'resources/js/dist/scripts.js' ), [ 'jquery', 'wp-color-picker', 'wp-i18n', 'wp-hooks', 'jquery-ui-sortable', 'wp-polyfill', 'wp-tinymce', 'wplink' ], $this->filesystem->mtime( 'resources/js/dist/scripts.js' ), true ); wp_enqueue_style( 'notification', $this->filesystem->url( 'resources/css/dist/style.css' ), [], $this->filesystem->mtime( 'resources/css/dist/style.css' ) ); diff --git a/yarn.lock b/yarn.lock index 1a62007b9..e07cf4a63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8627,6 +8627,11 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== +vue@2.6.11: + version "2.6.11" + resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" + integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ== + watchpack-chokidar2@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" From 9659e4d00099d07661e2916c70834b6ab7748eb1 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Thu, 4 Nov 2021 12:16:01 +0100 Subject: [PATCH 18/21] change closure definition syntax CU-ntfh9q --- src/Abstracts/Trigger.php | 16 +++++++-------- src/Admin/Extensions.php | 2 +- src/Admin/PostType.php | 2 +- src/Core/License.php | 4 ++-- src/Core/Notification.php | 2 +- src/Core/Resolver.php | 2 +- src/Core/Runner.php | 2 +- src/Core/Whitelabel.php | 4 ++-- .../MergeTag/Comment/CommentActionApprove.php | 2 +- .../MergeTag/Comment/CommentActionDelete.php | 2 +- .../MergeTag/Comment/CommentActionSpam.php | 2 +- .../MergeTag/Comment/CommentActionTrash.php | 2 +- .../MergeTag/Comment/CommentAuthorIP.php | 2 +- .../MergeTag/Comment/CommentAuthorUrl.php | 2 +- .../Comment/CommentAuthorUserAgent.php | 2 +- .../MergeTag/Comment/CommentContent.php | 2 +- .../MergeTag/Comment/CommentContentHtml.php | 2 +- src/Defaults/MergeTag/Comment/CommentID.php | 2 +- .../MergeTag/Comment/CommentIsReply.php | 2 +- .../MergeTag/Comment/CommentStatus.php | 2 +- src/Defaults/MergeTag/Comment/CommentType.php | 2 +- src/Defaults/MergeTag/DateTime/Date.php | 2 +- src/Defaults/MergeTag/DateTime/DateTime.php | 2 +- src/Defaults/MergeTag/DateTime/Time.php | 2 +- .../MergeTag/Media/AttachmentDirectUrl.php | 2 +- src/Defaults/MergeTag/Media/AttachmentID.php | 2 +- .../MergeTag/Media/AttachmentMimeType.php | 2 +- .../MergeTag/Media/AttachmentPage.php | 2 +- .../MergeTag/Media/AttachmentTitle.php | 2 +- .../MergeTag/Post/FeaturedImageId.php | 2 +- .../MergeTag/Post/FeaturedImageUrl.php | 2 +- src/Defaults/MergeTag/Post/PostContent.php | 2 +- .../MergeTag/Post/PostContentHtml.php | 2 +- src/Defaults/MergeTag/Post/PostExcerpt.php | 2 +- src/Defaults/MergeTag/Post/PostID.php | 2 +- src/Defaults/MergeTag/Post/PostPermalink.php | 2 +- src/Defaults/MergeTag/Post/PostSlug.php | 2 +- src/Defaults/MergeTag/Post/PostStatus.php | 2 +- src/Defaults/MergeTag/Post/PostTerms.php | 2 +- src/Defaults/MergeTag/Post/PostTitle.php | 2 +- src/Defaults/MergeTag/Post/PostType.php | 2 +- src/Defaults/MergeTag/Post/RevisionLink.php | 2 +- src/Defaults/MergeTag/Post/ThumbnailUrl.php | 2 +- .../MergeTag/Taxonomy/TaxonomyName.php | 2 +- .../MergeTag/Taxonomy/TaxonomySlug.php | 2 +- .../MergeTag/Taxonomy/TermDescription.php | 2 +- src/Defaults/MergeTag/Taxonomy/TermID.php | 2 +- src/Defaults/MergeTag/Taxonomy/TermName.php | 2 +- .../MergeTag/Taxonomy/TermPermalink.php | 2 +- src/Defaults/MergeTag/Taxonomy/TermSlug.php | 2 +- src/Defaults/MergeTag/User/Avatar.php | 2 +- src/Defaults/MergeTag/User/AvatarUrl.php | 2 +- src/Defaults/MergeTag/User/UserBio.php | 2 +- .../MergeTag/User/UserDisplayName.php | 2 +- src/Defaults/MergeTag/User/UserEmail.php | 2 +- src/Defaults/MergeTag/User/UserFirstName.php | 2 +- src/Defaults/MergeTag/User/UserID.php | 2 +- src/Defaults/MergeTag/User/UserLastName.php | 2 +- src/Defaults/MergeTag/User/UserLogin.php | 2 +- src/Defaults/MergeTag/User/UserNicename.php | 2 +- .../MergeTag/User/UserPasswordResetLink.php | 2 +- src/Defaults/MergeTag/User/UserRole.php | 2 +- src/Defaults/Trigger/Plugin/PluginTrigger.php | 8 ++++---- src/Defaults/Trigger/Plugin/Updated.php | 2 +- src/Defaults/Trigger/Post/PostTrigger.php | 2 +- src/Defaults/Trigger/Privacy/DataExported.php | 8 ++++---- src/Defaults/Trigger/Theme/Switched.php | 12 +++++------ src/Defaults/Trigger/Theme/ThemeTrigger.php | 14 ++++++------- src/Defaults/Trigger/Theme/Updated.php | 2 +- .../Trigger/User/UserEmailChangeRequest.php | 4 ++-- src/Defaults/Trigger/User/UserLogin.php | 2 +- src/Defaults/Trigger/User/UserRegistered.php | 2 +- src/Defaults/Trigger/User/UserRoleChanged.php | 4 ++-- .../Trigger/WordPress/EmailChangeRequest.php | 8 ++++---- .../Trigger/WordPress/UpdatesAvailable.php | 10 +++++----- src/Integration/WordPressEmails.php | 2 +- src/Queries/UserQueries.php | 4 ++-- src/Register.php | 2 +- src/Repository/GlobalMergeTagRepository.php | 20 +++++++++---------- src/Store/Notification.php | 2 +- src/Store/Resolver.php | 2 +- src/Utils/WpObjectHelper.php | 2 +- 82 files changed, 127 insertions(+), 127 deletions(-) diff --git a/src/Abstracts/Trigger.php b/src/Abstracts/Trigger.php index b6d69fec2..b697f8b7f 100644 --- a/src/Abstracts/Trigger.php +++ b/src/Abstracts/Trigger.php @@ -183,7 +183,7 @@ public function add_quick_merge_tag( $property_name, $label, $group = null ) { 'slug' => $property_name, 'name' => $label, 'group' => $group, - 'resolver' => function( $trigger ) use ( $property_name ) { + 'resolver' => function ( $trigger ) use ( $property_name ) { return $trigger->{ $property_name }; }, ] ) ); @@ -286,7 +286,7 @@ public function is_stopped() : bool { * @return void */ public function postpone_action( $tag, $priority = 10, $accepted_args = 1 ) { - _deprecated_function( __METHOD__, '8.0.0' ); + _deprecated_function ( __METHOD__, '8.0.0' ); } /** @@ -297,7 +297,7 @@ public function postpone_action( $tag, $priority = 10, $accepted_args = 1 ) { * @return boolean */ public function is_postponed() { - _deprecated_function( __METHOD__, '8.0.0' ); + _deprecated_function ( __METHOD__, '8.0.0' ); return true; } @@ -309,7 +309,7 @@ public function is_postponed() { * @return bool */ public function has_background_processing_enabled() { - _deprecated_function( __METHOD__, '8.0.0' ); + _deprecated_function ( __METHOD__, '8.0.0' ); return apply_filters( 'notification/trigger/process_in_background', @@ -326,7 +326,7 @@ public function has_background_processing_enabled() { * @return array */ public function get_action_args() { - _deprecated_function( __METHOD__, '8.0.0' ); + _deprecated_function ( __METHOD__, '8.0.0' ); return []; } @@ -339,7 +339,7 @@ public function get_action_args() { * @return array */ public function get_cache() { - _deprecated_function( __METHOD__, '8.0.0' ); + _deprecated_function ( __METHOD__, '8.0.0' ); return []; } @@ -353,7 +353,7 @@ public function get_cache() { * @return $this */ public function set_cache( $cache ) { - _deprecated_function( __METHOD__, '8.0.0' ); + _deprecated_function ( __METHOD__, '8.0.0' ); return $this; } @@ -368,7 +368,7 @@ public function set_cache( $cache ) { * @return mixed */ public function cache( $key, $default = '' ) { - _deprecated_function( __METHOD__, '8.0.0' ); + _deprecated_function ( __METHOD__, '8.0.0' ); return $default; } diff --git a/src/Admin/Extensions.php b/src/Admin/Extensions.php index c99e20a8a..479256cb3 100644 --- a/src/Admin/Extensions.php +++ b/src/Admin/Extensions.php @@ -138,7 +138,7 @@ public function get_raw_extensions() { $driver = new CacheDriver\Transient( ErrorHandler::debug_enabled() ? DAY_IN_SECONDS : 1 ); $cache = new Cache( $driver, 'notification_extensions' ); - return $cache->collect( function() { + return $cache->collect( function () { $response = wp_remote_get( $this->api_url ); $extensions = []; diff --git a/src/Admin/PostType.php b/src/Admin/PostType.php index 1b6d21123..024bb7853 100644 --- a/src/Admin/PostType.php +++ b/src/Admin/PostType.php @@ -359,7 +359,7 @@ public static function get_all_notifications() { $driver = new CacheDriver\ObjectCache( 'notification' ); $cache = new Cache( $driver, 'notifications' ); - return $cache->collect( function() { + return $cache->collect( function () { global $wpdb; $sql = "SELECT p.post_content diff --git a/src/Core/License.php b/src/Core/License.php index 2547a6048..06a6765aa 100644 --- a/src/Core/License.php +++ b/src/Core/License.php @@ -62,7 +62,7 @@ public function get() { $driver = new CacheDriver\ObjectCache( 'notification_license', ErrorHandler::debug_enabled() ? 0 : 1 ); $cache = new Cache( $driver, $this->extension['slug'] ); - return $cache->collect( function() { + return $cache->collect( function () { $licenses = $this->get_licenses(); $license = false; @@ -90,7 +90,7 @@ public function is_valid() { $driver = new CacheDriver\Transient( ErrorHandler::debug_enabled() ? DAY_IN_SECONDS : 1 ); $cache = new Cache( $driver, sprintf( 'notification_license_check_%s', $this->extension['slug'] ) ); - return $cache->collect( function() use ( $license_data ) { + return $cache->collect( function () use ( $license_data ) { $license_check = $this->check( $license_data->license_key ); if ( is_wp_error( $license_check ) ) { diff --git a/src/Core/Notification.php b/src/Core/Notification.php index 8704be061..fe498cc16 100644 --- a/src/Core/Notification.php +++ b/src/Core/Notification.php @@ -302,7 +302,7 @@ public function get_carrier( $carrier_slug ) { * @return array */ public function get_enabled_carriers() { - return array_filter( $this->get_carriers(), function( $carrier ) { + return array_filter( $this->get_carriers(), function ( $carrier ) { return $carrier->is_enabled(); } ); } diff --git a/src/Core/Resolver.php b/src/Core/Resolver.php index f5b2d37a4..c5f7da7d0 100644 --- a/src/Core/Resolver.php +++ b/src/Core/Resolver.php @@ -35,7 +35,7 @@ public static function resolve( $value, Triggerable $trigger ) { // Loop over all resolvers. foreach ( $resolvers as $resolver ) { - $value = preg_replace_callback( $resolver->get_pattern(), function( $match ) use ( $resolver, $trigger ) { + $value = preg_replace_callback( $resolver->get_pattern(), function ( $match ) use ( $resolver, $trigger ) { return call_user_func( [ $resolver, 'resolve_merge_tag' ], $match, $trigger ); }, $value ); } diff --git a/src/Core/Runner.php b/src/Core/Runner.php index ce17fe886..00e7ff564 100644 --- a/src/Core/Runner.php +++ b/src/Core/Runner.php @@ -72,7 +72,7 @@ public function run( ...$context ) { $result = call_user_func_array( [ $this->trigger, 'action' ], $context ); $class = get_class( $this->trigger ); - _deprecated_function( + _deprecated_function ( sprintf( '%s::action()', esc_html( $class ) ), '8.0.0', sprintf( '%s::context()', esc_html( $class ) ) diff --git a/src/Core/Whitelabel.php b/src/Core/Whitelabel.php index 693f4d928..91d026981 100644 --- a/src/Core/Whitelabel.php +++ b/src/Core/Whitelabel.php @@ -51,7 +51,7 @@ public static function enable( array $args = [] ) { // Change Notification CPT page. if ( isset( $args['page_hook'] ) && ! empty( $args['page_hook'] ) ) { - add_filter( 'notification/whitelabel/cpt/parent', function( $hook ) use ( $args ) { + add_filter( 'notification/whitelabel/cpt/parent', function ( $hook ) use ( $args ) { return $args['page_hook']; } ); } @@ -68,7 +68,7 @@ public static function enable( array $args = [] ) { // Settings access. if ( isset( $args['settings_access'] ) ) { - add_filter( 'notification/whitelabel/settings/access', function( $access ) use ( $args ) { + add_filter( 'notification/whitelabel/settings/access', function ( $access ) use ( $args ) { return (array) $args['settings_access']; } ); } diff --git a/src/Defaults/MergeTag/Comment/CommentActionApprove.php b/src/Defaults/MergeTag/Comment/CommentActionApprove.php index 36c862c08..7a8acf055 100644 --- a/src/Defaults/MergeTag/Comment/CommentActionApprove.php +++ b/src/Defaults/MergeTag/Comment/CommentActionApprove.php @@ -57,7 +57,7 @@ public function __construct( $params = [] ) { 'name' => sprintf( __( '%s approve URL', 'notification' ), $comment_type_name ), // Translators: comment type actions text. 'group' => sprintf( __( '%s actions', 'notification' ), $comment_type_name ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return admin_url( "comment.php?action=approve&c={$trigger->{ $this->property_name }->comment_ID}#wpbody-content" ); }, ] diff --git a/src/Defaults/MergeTag/Comment/CommentActionDelete.php b/src/Defaults/MergeTag/Comment/CommentActionDelete.php index 0258030e2..bb386702c 100644 --- a/src/Defaults/MergeTag/Comment/CommentActionDelete.php +++ b/src/Defaults/MergeTag/Comment/CommentActionDelete.php @@ -57,7 +57,7 @@ public function __construct( $params = [] ) { 'name' => sprintf( __( '%s delete URL', 'notification' ), $comment_type_name ), // Translators: comment type actions text. 'group' => sprintf( __( '%s actions', 'notification' ), $comment_type_name ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return admin_url( "comment.php?action=delete&c={$trigger->{ $this->property_name }->comment_ID}#wpbody-content" ); }, ] diff --git a/src/Defaults/MergeTag/Comment/CommentActionSpam.php b/src/Defaults/MergeTag/Comment/CommentActionSpam.php index c1c71125a..768143832 100644 --- a/src/Defaults/MergeTag/Comment/CommentActionSpam.php +++ b/src/Defaults/MergeTag/Comment/CommentActionSpam.php @@ -57,7 +57,7 @@ public function __construct( $params = [] ) { 'name' => sprintf( __( '%s mark as spam URL', 'notification' ), $comment_type_name ), // Translators: comment type actions text. 'group' => sprintf( __( '%s actions', 'notification' ), $comment_type_name ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return admin_url( "comment.php?action=spam&c={$trigger->{ $this->property_name }->comment_ID}#wpbody-content" ); }, ] diff --git a/src/Defaults/MergeTag/Comment/CommentActionTrash.php b/src/Defaults/MergeTag/Comment/CommentActionTrash.php index 2574b8bdc..7b54bd2e5 100644 --- a/src/Defaults/MergeTag/Comment/CommentActionTrash.php +++ b/src/Defaults/MergeTag/Comment/CommentActionTrash.php @@ -57,7 +57,7 @@ public function __construct( $params = [] ) { 'name' => sprintf( __( '%s trash URL', 'notification' ), $comment_type_name ), // Translators: comment type actions text. 'group' => sprintf( __( '%s actions', 'notification' ), $comment_type_name ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return admin_url( "comment.php?action=trash&c={$trigger->{ $this->property_name }->comment_ID}#wpbody-content" ); }, ] diff --git a/src/Defaults/MergeTag/Comment/CommentAuthorIP.php b/src/Defaults/MergeTag/Comment/CommentAuthorIP.php index 31ced89e3..74203a5c2 100644 --- a/src/Defaults/MergeTag/Comment/CommentAuthorIP.php +++ b/src/Defaults/MergeTag/Comment/CommentAuthorIP.php @@ -59,7 +59,7 @@ public function __construct( $params = [] ) { 'example' => true, // Translators: comment type author. 'group' => sprintf( __( '%s author', 'notification' ), $comment_type_name ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->comment_author_IP; }, ] diff --git a/src/Defaults/MergeTag/Comment/CommentAuthorUrl.php b/src/Defaults/MergeTag/Comment/CommentAuthorUrl.php index 4ebb89fdc..127efc734 100644 --- a/src/Defaults/MergeTag/Comment/CommentAuthorUrl.php +++ b/src/Defaults/MergeTag/Comment/CommentAuthorUrl.php @@ -59,7 +59,7 @@ public function __construct( $params = [] ) { 'example' => true, // Translators: comment type author. 'group' => sprintf( __( '%s author', 'notification' ), $comment_type_name ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->comment_author_url; }, ] diff --git a/src/Defaults/MergeTag/Comment/CommentAuthorUserAgent.php b/src/Defaults/MergeTag/Comment/CommentAuthorUserAgent.php index 72108b50d..2266f679e 100644 --- a/src/Defaults/MergeTag/Comment/CommentAuthorUserAgent.php +++ b/src/Defaults/MergeTag/Comment/CommentAuthorUserAgent.php @@ -59,7 +59,7 @@ public function __construct( $params = [] ) { 'example' => true, // Translators: comment type author. 'group' => sprintf( __( '%s author', 'notification' ), $comment_type_name ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->comment_agent; }, ] diff --git a/src/Defaults/MergeTag/Comment/CommentContent.php b/src/Defaults/MergeTag/Comment/CommentContent.php index 747e6bc2b..3eac50c27 100644 --- a/src/Defaults/MergeTag/Comment/CommentContent.php +++ b/src/Defaults/MergeTag/Comment/CommentContent.php @@ -58,7 +58,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Great post!', 'notification' ), 'example' => true, 'group' => $comment_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->comment_content; }, ] diff --git a/src/Defaults/MergeTag/Comment/CommentContentHtml.php b/src/Defaults/MergeTag/Comment/CommentContentHtml.php index 4b3b16a2d..f0df41fc1 100644 --- a/src/Defaults/MergeTag/Comment/CommentContentHtml.php +++ b/src/Defaults/MergeTag/Comment/CommentContentHtml.php @@ -58,7 +58,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Great post!', 'notification' ), 'example' => true, 'group' => $comment_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->comment_content; }, ] diff --git a/src/Defaults/MergeTag/Comment/CommentID.php b/src/Defaults/MergeTag/Comment/CommentID.php index cc7a313fc..332aec5a1 100644 --- a/src/Defaults/MergeTag/Comment/CommentID.php +++ b/src/Defaults/MergeTag/Comment/CommentID.php @@ -58,7 +58,7 @@ public function __construct( $params = [] ) { 'description' => '35', 'example' => true, 'group' => $comment_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->comment_ID; }, ] diff --git a/src/Defaults/MergeTag/Comment/CommentIsReply.php b/src/Defaults/MergeTag/Comment/CommentIsReply.php index 316432bbf..dfe2ac323 100644 --- a/src/Defaults/MergeTag/Comment/CommentIsReply.php +++ b/src/Defaults/MergeTag/Comment/CommentIsReply.php @@ -58,7 +58,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Yes or No', 'notification' ), 'example' => true, 'group' => $comment_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { $has_parent = $trigger->{ $this->property_name }->comment_parent; return $has_parent ? __( 'Yes', 'notification' ) : __( 'No', 'notification' ); }, diff --git a/src/Defaults/MergeTag/Comment/CommentStatus.php b/src/Defaults/MergeTag/Comment/CommentStatus.php index 9f4042b5b..b93f35c42 100644 --- a/src/Defaults/MergeTag/Comment/CommentStatus.php +++ b/src/Defaults/MergeTag/Comment/CommentStatus.php @@ -58,7 +58,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Approved', 'notification' ), 'example' => true, 'group' => $comment_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { if ( '1' === $trigger->{ $this->property_name }->comment_approved ) { return __( 'Approved', 'notification' ); } elseif ( '0' === $trigger->{ $this->property_name }->comment_approved ) { diff --git a/src/Defaults/MergeTag/Comment/CommentType.php b/src/Defaults/MergeTag/Comment/CommentType.php index bf1dac8d0..bfec54ca0 100644 --- a/src/Defaults/MergeTag/Comment/CommentType.php +++ b/src/Defaults/MergeTag/Comment/CommentType.php @@ -54,7 +54,7 @@ public function __construct( $params = [] ) { 'name' => __( 'Comment type', 'notification' ), 'description' => __( 'Comment or Pingback or Trackback or Custom', 'notification' ), 'group' => WpObjectHelper::get_comment_type_name( $this->comment_type ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return get_comment_type( $trigger->{ $this->property_name } ); }, ] diff --git a/src/Defaults/MergeTag/DateTime/Date.php b/src/Defaults/MergeTag/DateTime/Date.php index cf260b2d2..6b7622678 100644 --- a/src/Defaults/MergeTag/DateTime/Date.php +++ b/src/Defaults/MergeTag/DateTime/Date.php @@ -46,7 +46,7 @@ public function __construct( $params = [] ) { } if ( ! isset( $args['resolver'] ) ) { - $args['resolver'] = function( $trigger ) use ( $args ) { + $args['resolver'] = function ( $trigger ) use ( $args ) { if ( isset( $args['timestamp'] ) ) { $timestamp = $args['timestamp']; diff --git a/src/Defaults/MergeTag/DateTime/DateTime.php b/src/Defaults/MergeTag/DateTime/DateTime.php index ff19ac506..044406039 100644 --- a/src/Defaults/MergeTag/DateTime/DateTime.php +++ b/src/Defaults/MergeTag/DateTime/DateTime.php @@ -47,7 +47,7 @@ public function __construct( $params = [] ) { } if ( ! isset( $args['resolver'] ) ) { - $args['resolver'] = function( $trigger ) use ( $args ) { + $args['resolver'] = function ( $trigger ) use ( $args ) { if ( isset( $args['timestamp'] ) ) { $timestamp = $args['timestamp']; diff --git a/src/Defaults/MergeTag/DateTime/Time.php b/src/Defaults/MergeTag/DateTime/Time.php index 4f5f7c9dd..f458f00c2 100644 --- a/src/Defaults/MergeTag/DateTime/Time.php +++ b/src/Defaults/MergeTag/DateTime/Time.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { } if ( ! isset( $args['resolver'] ) ) { - $args['resolver'] = function( $trigger ) use ( $args ) { + $args['resolver'] = function ( $trigger ) use ( $args ) { if ( isset( $args['timestamp'] ) ) { $timestamp = $args['timestamp']; diff --git a/src/Defaults/MergeTag/Media/AttachmentDirectUrl.php b/src/Defaults/MergeTag/Media/AttachmentDirectUrl.php index 5f5e43622..7cdba6424 100644 --- a/src/Defaults/MergeTag/Media/AttachmentDirectUrl.php +++ b/src/Defaults/MergeTag/Media/AttachmentDirectUrl.php @@ -42,7 +42,7 @@ public function __construct( $params = [] ) { 'description' => __( 'http://example.com/wp-content/uploads/2018/02/forest-landscape.jpg', 'notification' ), 'example' => true, 'group' => __( 'Attachment', 'notification' ), - 'resolver' => function() { + 'resolver' => function () { return wp_get_attachment_url( $this->trigger->{ $this->property_name }->ID ); }, ] diff --git a/src/Defaults/MergeTag/Media/AttachmentID.php b/src/Defaults/MergeTag/Media/AttachmentID.php index 814d108d0..3438ebfa3 100644 --- a/src/Defaults/MergeTag/Media/AttachmentID.php +++ b/src/Defaults/MergeTag/Media/AttachmentID.php @@ -42,7 +42,7 @@ public function __construct( $params = [] ) { 'description' => '35', 'example' => true, 'group' => __( 'Attachment', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->ID; }, ] diff --git a/src/Defaults/MergeTag/Media/AttachmentMimeType.php b/src/Defaults/MergeTag/Media/AttachmentMimeType.php index dcf2afefd..bbd9881c1 100644 --- a/src/Defaults/MergeTag/Media/AttachmentMimeType.php +++ b/src/Defaults/MergeTag/Media/AttachmentMimeType.php @@ -41,7 +41,7 @@ public function __construct( $params = [] ) { 'name' => __( 'Attachment MIME type', 'notification' ), 'description' => 'image/jpeg', 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->post_mime_type; }, 'group' => __( 'Attachment', 'notification' ), diff --git a/src/Defaults/MergeTag/Media/AttachmentPage.php b/src/Defaults/MergeTag/Media/AttachmentPage.php index bd6d3c2b9..3b686d891 100644 --- a/src/Defaults/MergeTag/Media/AttachmentPage.php +++ b/src/Defaults/MergeTag/Media/AttachmentPage.php @@ -42,7 +42,7 @@ public function __construct( $params = [] ) { 'description' => __( 'http://example.com/forest-landscape/', 'notification' ), 'example' => true, 'group' => __( 'Attachment', 'notification' ), - 'resolver' => function() { + 'resolver' => function () { return get_permalink( $this->{ $this->property_name }->attachment->ID ); }, ] diff --git a/src/Defaults/MergeTag/Media/AttachmentTitle.php b/src/Defaults/MergeTag/Media/AttachmentTitle.php index b36e63772..97ed2b9d0 100644 --- a/src/Defaults/MergeTag/Media/AttachmentTitle.php +++ b/src/Defaults/MergeTag/Media/AttachmentTitle.php @@ -42,7 +42,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Forest landscape', 'notification' ), 'example' => true, 'group' => __( 'Attachment', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->post_title; }, ] diff --git a/src/Defaults/MergeTag/Post/FeaturedImageId.php b/src/Defaults/MergeTag/Post/FeaturedImageId.php index 297931a6f..ab14b0ed0 100644 --- a/src/Defaults/MergeTag/Post/FeaturedImageId.php +++ b/src/Defaults/MergeTag/Post/FeaturedImageId.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => __( '123', 'notification' ), 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { $post_id = $trigger->{ $this->post_type }->ID; return (int) get_post_thumbnail_id( $post_id ); diff --git a/src/Defaults/MergeTag/Post/FeaturedImageUrl.php b/src/Defaults/MergeTag/Post/FeaturedImageUrl.php index f04db3d13..cd5319eb1 100644 --- a/src/Defaults/MergeTag/Post/FeaturedImageUrl.php +++ b/src/Defaults/MergeTag/Post/FeaturedImageUrl.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => __( 'https://example.com/wp-content/2019/01/image.jpg', 'notification' ), 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return wp_get_attachment_image_url( get_post_thumbnail_id( $trigger->{ $this->post_type }->ID ), 'full' ); }, ] diff --git a/src/Defaults/MergeTag/Post/PostContent.php b/src/Defaults/MergeTag/Post/PostContent.php index 0da317248..ede961c4f 100644 --- a/src/Defaults/MergeTag/Post/PostContent.php +++ b/src/Defaults/MergeTag/Post/PostContent.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!', 'notification' ), 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return apply_filters( 'the_content', $trigger->{ $this->post_type }->post_content ); }, ] diff --git a/src/Defaults/MergeTag/Post/PostContentHtml.php b/src/Defaults/MergeTag/Post/PostContentHtml.php index 8dd528eb9..8695bcc4b 100644 --- a/src/Defaults/MergeTag/Post/PostContentHtml.php +++ b/src/Defaults/MergeTag/Post/PostContentHtml.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Welcome to WordPress. This is your first post. Edit or delete it, then start writing!', 'notification' ), 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return apply_filters( 'the_content', $trigger->{ $this->post_type }->post_content ); }, ] diff --git a/src/Defaults/MergeTag/Post/PostExcerpt.php b/src/Defaults/MergeTag/Post/PostExcerpt.php index a96877ded..a9eb0422b 100644 --- a/src/Defaults/MergeTag/Post/PostExcerpt.php +++ b/src/Defaults/MergeTag/Post/PostExcerpt.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Welcome to WordPress...', 'notification' ), 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return get_the_excerpt( $trigger->{ $this->post_type } ); }, ] diff --git a/src/Defaults/MergeTag/Post/PostID.php b/src/Defaults/MergeTag/Post/PostID.php index c37a5326b..d8f2c6170 100644 --- a/src/Defaults/MergeTag/Post/PostID.php +++ b/src/Defaults/MergeTag/Post/PostID.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => '35', 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->post_type }->ID; }, ] diff --git a/src/Defaults/MergeTag/Post/PostPermalink.php b/src/Defaults/MergeTag/Post/PostPermalink.php index f8f754641..6b110450e 100644 --- a/src/Defaults/MergeTag/Post/PostPermalink.php +++ b/src/Defaults/MergeTag/Post/PostPermalink.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => __( 'https://example.com/hello-world/', 'notification' ), 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return get_permalink( $trigger->{ $this->post_type }->ID ); }, ] diff --git a/src/Defaults/MergeTag/Post/PostSlug.php b/src/Defaults/MergeTag/Post/PostSlug.php index 314bba8b8..75543a582 100644 --- a/src/Defaults/MergeTag/Post/PostSlug.php +++ b/src/Defaults/MergeTag/Post/PostSlug.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => __( 'hello-world', 'notification' ), 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->post_type }->post_name; }, ] diff --git a/src/Defaults/MergeTag/Post/PostStatus.php b/src/Defaults/MergeTag/Post/PostStatus.php index 579a40fa2..adab3824b 100644 --- a/src/Defaults/MergeTag/Post/PostStatus.php +++ b/src/Defaults/MergeTag/Post/PostStatus.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => 'publish', 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return get_post_status( $trigger->{ $this->post_type }->ID ); }, ] diff --git a/src/Defaults/MergeTag/Post/PostTerms.php b/src/Defaults/MergeTag/Post/PostTerms.php index c6dcd01f4..de66752bb 100644 --- a/src/Defaults/MergeTag/Post/PostTerms.php +++ b/src/Defaults/MergeTag/Post/PostTerms.php @@ -61,7 +61,7 @@ public function __construct( $params = [] ) { 'description' => __( 'General, Tech, Lifestyle', 'notification' ), 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { $post_terms = get_the_terms( $trigger->{ $this->post_type }, $this->taxonomy->name ); if ( empty( $post_terms ) || is_wp_error( $post_terms ) ) { return ''; diff --git a/src/Defaults/MergeTag/Post/PostTitle.php b/src/Defaults/MergeTag/Post/PostTitle.php index 8932b361e..403849860 100644 --- a/src/Defaults/MergeTag/Post/PostTitle.php +++ b/src/Defaults/MergeTag/Post/PostTitle.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Hello World', 'notification' ), 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return html_entity_decode( get_the_title( $trigger->{ $this->post_type } ) ); }, ] diff --git a/src/Defaults/MergeTag/Post/PostType.php b/src/Defaults/MergeTag/Post/PostType.php index 55e70ac03..45421392a 100644 --- a/src/Defaults/MergeTag/Post/PostType.php +++ b/src/Defaults/MergeTag/Post/PostType.php @@ -47,7 +47,7 @@ public function __construct( $params = [] ) { 'description' => 'post', 'example' => true, 'group' => WpObjectHelper::get_post_type_name( $this->post_type ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->post_type; }, ] diff --git a/src/Defaults/MergeTag/Post/RevisionLink.php b/src/Defaults/MergeTag/Post/RevisionLink.php index 366625c1b..909b8e1ab 100644 --- a/src/Defaults/MergeTag/Post/RevisionLink.php +++ b/src/Defaults/MergeTag/Post/RevisionLink.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => __( 'https://example.com/wp-admin/revision.php?revision=id', 'notification' ), 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { $revisions_id = wp_get_post_revisions( $trigger->{ $this->post_type }->ID, [ diff --git a/src/Defaults/MergeTag/Post/ThumbnailUrl.php b/src/Defaults/MergeTag/Post/ThumbnailUrl.php index fa0a69c7f..cc3b52085 100644 --- a/src/Defaults/MergeTag/Post/ThumbnailUrl.php +++ b/src/Defaults/MergeTag/Post/ThumbnailUrl.php @@ -50,7 +50,7 @@ public function __construct( $params = [] ) { 'description' => __( 'https://example.com/wp-content/2019/01/image.jpg', 'notification' ), 'example' => true, 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return wp_get_attachment_image_url( get_post_thumbnail_id( $trigger->{ $this->post_type }->ID ) ); }, ] diff --git a/src/Defaults/MergeTag/Taxonomy/TaxonomyName.php b/src/Defaults/MergeTag/Taxonomy/TaxonomyName.php index 894c44326..5a97afd43 100644 --- a/src/Defaults/MergeTag/Taxonomy/TaxonomyName.php +++ b/src/Defaults/MergeTag/Taxonomy/TaxonomyName.php @@ -46,7 +46,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Hello World', 'notification' ), 'example' => true, 'group' => __( 'Taxonomy', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->taxonomy->labels->singular_name ?? ''; }, ] diff --git a/src/Defaults/MergeTag/Taxonomy/TaxonomySlug.php b/src/Defaults/MergeTag/Taxonomy/TaxonomySlug.php index 6f41e7d82..e2290740d 100644 --- a/src/Defaults/MergeTag/Taxonomy/TaxonomySlug.php +++ b/src/Defaults/MergeTag/Taxonomy/TaxonomySlug.php @@ -46,7 +46,7 @@ public function __construct( $params = [] ) { 'description' => __( 'hello-world', 'notification' ), 'example' => true, 'group' => __( 'Taxonomy', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->taxonomy; }, ] diff --git a/src/Defaults/MergeTag/Taxonomy/TermDescription.php b/src/Defaults/MergeTag/Taxonomy/TermDescription.php index ae493769b..5d05f2dd8 100644 --- a/src/Defaults/MergeTag/Taxonomy/TermDescription.php +++ b/src/Defaults/MergeTag/Taxonomy/TermDescription.php @@ -31,7 +31,7 @@ public function __construct() { 'description' => 'Lorem ipsum sit dolor amet', 'example' => true, 'group' => __( 'Term', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->term->description; }, ] diff --git a/src/Defaults/MergeTag/Taxonomy/TermID.php b/src/Defaults/MergeTag/Taxonomy/TermID.php index b4f76fe06..bd08eb03c 100644 --- a/src/Defaults/MergeTag/Taxonomy/TermID.php +++ b/src/Defaults/MergeTag/Taxonomy/TermID.php @@ -31,7 +31,7 @@ public function __construct() { 'description' => '35', 'example' => true, 'group' => __( 'Term', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->term->term_id; }, ] diff --git a/src/Defaults/MergeTag/Taxonomy/TermName.php b/src/Defaults/MergeTag/Taxonomy/TermName.php index 10de1fd19..684c76d34 100644 --- a/src/Defaults/MergeTag/Taxonomy/TermName.php +++ b/src/Defaults/MergeTag/Taxonomy/TermName.php @@ -31,7 +31,7 @@ public function __construct() { 'description' => 'Nature', 'example' => true, 'group' => __( 'Term', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->term->name; }, ] diff --git a/src/Defaults/MergeTag/Taxonomy/TermPermalink.php b/src/Defaults/MergeTag/Taxonomy/TermPermalink.php index b215da8ef..e15828e4e 100644 --- a/src/Defaults/MergeTag/Taxonomy/TermPermalink.php +++ b/src/Defaults/MergeTag/Taxonomy/TermPermalink.php @@ -31,7 +31,7 @@ public function __construct() { 'description' => 'http://example.com/category/nature', 'example' => true, 'group' => __( 'Term', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->term_permalink; }, ] diff --git a/src/Defaults/MergeTag/Taxonomy/TermSlug.php b/src/Defaults/MergeTag/Taxonomy/TermSlug.php index 441290013..7993f00cd 100644 --- a/src/Defaults/MergeTag/Taxonomy/TermSlug.php +++ b/src/Defaults/MergeTag/Taxonomy/TermSlug.php @@ -31,7 +31,7 @@ public function __construct() { 'description' => 'nature', 'example' => true, 'group' => __( 'Term', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->term->slug; }, ] diff --git a/src/Defaults/MergeTag/User/Avatar.php b/src/Defaults/MergeTag/User/Avatar.php index c4ef3c265..4f3bc8c13 100644 --- a/src/Defaults/MergeTag/User/Avatar.php +++ b/src/Defaults/MergeTag/User/Avatar.php @@ -46,7 +46,7 @@ public function __construct( $params = [] ) { 'description' => __( 'HTML img tag with avatar', 'notification' ), 'example' => true, 'group' => __( 'User', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { if ( isset( $trigger->{ $this->property_name }->user_email ) ) { return get_avatar( $trigger->{ $this->property_name }->user_email ); } diff --git a/src/Defaults/MergeTag/User/AvatarUrl.php b/src/Defaults/MergeTag/User/AvatarUrl.php index e881b3568..318ee3fe7 100644 --- a/src/Defaults/MergeTag/User/AvatarUrl.php +++ b/src/Defaults/MergeTag/User/AvatarUrl.php @@ -43,7 +43,7 @@ public function __construct( array $params = [] ) { 'description' => __( 'http://0.gravatar.com/avatar/320eab812ab24ef3dbaa2e6dc6e024e0?s=96&d=mm&r=g', 'notification' ), 'example' => true, 'group' => __( 'User', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { if ( isset( $trigger->{ $this->property_name }->user_email ) ) { return get_avatar_url( $trigger->{ $this->property_name }->user_email ); } diff --git a/src/Defaults/MergeTag/User/UserBio.php b/src/Defaults/MergeTag/User/UserBio.php index 88d31771a..71e1d4704 100644 --- a/src/Defaults/MergeTag/User/UserBio.php +++ b/src/Defaults/MergeTag/User/UserBio.php @@ -45,7 +45,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Developer based in Ontario, Canada', 'notification' ), 'example' => true, 'group' => __( 'User', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->description; }, ] diff --git a/src/Defaults/MergeTag/User/UserDisplayName.php b/src/Defaults/MergeTag/User/UserDisplayName.php index 9c219f3e0..064084820 100644 --- a/src/Defaults/MergeTag/User/UserDisplayName.php +++ b/src/Defaults/MergeTag/User/UserDisplayName.php @@ -45,7 +45,7 @@ public function __construct( $params = [] ) { 'description' => __( 'John - fast finegrs - Doe', 'notification' ), 'example' => true, 'group' => __( 'User', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->display_name; }, ] diff --git a/src/Defaults/MergeTag/User/UserEmail.php b/src/Defaults/MergeTag/User/UserEmail.php index 489f522bc..c4223ca90 100644 --- a/src/Defaults/MergeTag/User/UserEmail.php +++ b/src/Defaults/MergeTag/User/UserEmail.php @@ -45,7 +45,7 @@ public function __construct( $params = [] ) { 'description' => __( 'john.doe@example.com', 'notification' ), 'example' => true, 'group' => __( 'User', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->user_email; }, ] diff --git a/src/Defaults/MergeTag/User/UserFirstName.php b/src/Defaults/MergeTag/User/UserFirstName.php index f9520a083..3539231b9 100644 --- a/src/Defaults/MergeTag/User/UserFirstName.php +++ b/src/Defaults/MergeTag/User/UserFirstName.php @@ -45,7 +45,7 @@ public function __construct( $params = [] ) { 'description' => __( 'John', 'notification' ), 'example' => true, 'group' => __( 'User', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->first_name; }, ] diff --git a/src/Defaults/MergeTag/User/UserID.php b/src/Defaults/MergeTag/User/UserID.php index e8314c4a5..de7900644 100644 --- a/src/Defaults/MergeTag/User/UserID.php +++ b/src/Defaults/MergeTag/User/UserID.php @@ -45,7 +45,7 @@ public function __construct( $params = [] ) { 'description' => '25', 'example' => true, 'group' => __( 'User', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->ID; }, ] diff --git a/src/Defaults/MergeTag/User/UserLastName.php b/src/Defaults/MergeTag/User/UserLastName.php index 2beaf7066..79e198162 100644 --- a/src/Defaults/MergeTag/User/UserLastName.php +++ b/src/Defaults/MergeTag/User/UserLastName.php @@ -45,7 +45,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Doe', 'notification' ), 'example' => true, 'group' => __( 'User', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->last_name; }, ] diff --git a/src/Defaults/MergeTag/User/UserLogin.php b/src/Defaults/MergeTag/User/UserLogin.php index d7e248e04..5a9958d29 100644 --- a/src/Defaults/MergeTag/User/UserLogin.php +++ b/src/Defaults/MergeTag/User/UserLogin.php @@ -45,7 +45,7 @@ public function __construct( $params = [] ) { 'description' => __( 'johndoe', 'notification' ), 'example' => true, 'group' => __( 'User', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->user_login; }, ] diff --git a/src/Defaults/MergeTag/User/UserNicename.php b/src/Defaults/MergeTag/User/UserNicename.php index 05a361ce3..b089e920b 100644 --- a/src/Defaults/MergeTag/User/UserNicename.php +++ b/src/Defaults/MergeTag/User/UserNicename.php @@ -45,7 +45,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Johhnie', 'notification' ), 'example' => true, 'group' => __( 'User', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->{ $this->property_name }->user_nicename; }, ] diff --git a/src/Defaults/MergeTag/User/UserPasswordResetLink.php b/src/Defaults/MergeTag/User/UserPasswordResetLink.php index 65dc2c6b3..185cb43f8 100644 --- a/src/Defaults/MergeTag/User/UserPasswordResetLink.php +++ b/src/Defaults/MergeTag/User/UserPasswordResetLink.php @@ -55,7 +55,7 @@ public function __construct( $params = [] ) { 'description' => __( 'http://example.com/wp-login.php?action=rp&key=mm2sAR8jmIyjSiMsCJRm&login=admin', 'notification' ), 'example' => true, 'group' => __( 'User action', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return network_site_url( sprintf( 'wp-login.php?action=rp&key=%s&login=%s', diff --git a/src/Defaults/MergeTag/User/UserRole.php b/src/Defaults/MergeTag/User/UserRole.php index 8a2c66da4..116910aa6 100644 --- a/src/Defaults/MergeTag/User/UserRole.php +++ b/src/Defaults/MergeTag/User/UserRole.php @@ -45,7 +45,7 @@ public function __construct( $params = [] ) { 'description' => __( 'Subscriber', 'notification' ), 'example' => true, 'group' => __( 'User', 'notification' ), - 'resolver' => function() { + 'resolver' => function () { $roles = array_map( function ( $role ) { $role_object = get_role( $role ); diff --git a/src/Defaults/Trigger/Plugin/PluginTrigger.php b/src/Defaults/Trigger/Plugin/PluginTrigger.php index 23f206d3c..479bd0c53 100644 --- a/src/Defaults/Trigger/Plugin/PluginTrigger.php +++ b/src/Defaults/Trigger/Plugin/PluginTrigger.php @@ -34,7 +34,7 @@ public function merge_tags() { 'name' => __( 'Plugin name', 'notification' ), 'description' => __( 'Akismet', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->plugin['Name']; }, 'group' => __( 'Plugin', 'notification' ), @@ -45,7 +45,7 @@ public function merge_tags() { 'name' => __( 'Plugin author name', 'notification' ), 'description' => __( 'Automattic', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->plugin['AuthorName']; }, 'group' => __( 'Plugin', 'notification' ), @@ -56,7 +56,7 @@ public function merge_tags() { 'name' => __( 'Plugin version', 'notification' ), 'description' => __( '1.0.0', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->plugin['Version']; }, 'group' => __( 'Plugin', 'notification' ), @@ -67,7 +67,7 @@ public function merge_tags() { 'name' => __( 'Plugin website address', 'notification' ), 'description' => __( 'https://wordpress.org/plugins/example', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->plugin['PluginURI']; }, 'group' => __( 'Plugin', 'notification' ), diff --git a/src/Defaults/Trigger/Plugin/Updated.php b/src/Defaults/Trigger/Plugin/Updated.php index 9b66303bb..522c347bd 100644 --- a/src/Defaults/Trigger/Plugin/Updated.php +++ b/src/Defaults/Trigger/Plugin/Updated.php @@ -84,7 +84,7 @@ public function merge_tags() { 'name' => __( 'Plugin previous version', 'notification' ), 'description' => __( '1.0.0', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->previous_version; }, 'group' => __( 'Plugin', 'notification' ), diff --git a/src/Defaults/Trigger/Post/PostTrigger.php b/src/Defaults/Trigger/Post/PostTrigger.php index 8925fa572..57bdc0082 100644 --- a/src/Defaults/Trigger/Post/PostTrigger.php +++ b/src/Defaults/Trigger/Post/PostTrigger.php @@ -129,7 +129,7 @@ public function merge_tags() { // translators: singular post name. 'name' => sprintf( __( '%s sticky status', 'notification' ), $post_type_name ), 'group' => $post_type_name, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return is_sticky( $trigger->{ $this->post_type }->ID ) ? __( 'Sticky', 'notification' ) : __( 'Not sticky', 'notification' ); }, ] ) ); diff --git a/src/Defaults/Trigger/Privacy/DataExported.php b/src/Defaults/Trigger/Privacy/DataExported.php index 29f4aa0ec..f1510a172 100644 --- a/src/Defaults/Trigger/Privacy/DataExported.php +++ b/src/Defaults/Trigger/Privacy/DataExported.php @@ -91,7 +91,7 @@ public function merge_tags() { 'description' => __( 'https://example.com/wp-content/uploads/wp-personal-data-exports/wp-personal-data-file-f3563fe4.zip', 'notification' ), 'example' => true, 'group' => __( 'Archive', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->archive_url; }, ] ) ); @@ -102,7 +102,7 @@ public function merge_tags() { 'description' => __( '/var/www/html/wp-content/uploads/wp-personal-data-exports/wp-personal-data-file-test.zip', 'notification' ), 'example' => true, 'group' => __( 'Archive', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->archive_path; }, ] ) ); @@ -113,7 +113,7 @@ public function merge_tags() { 'description' => __( '/var/www/html/wp-content/uploads/wp-personal-data-exports/wp-personal-data-file-test.html', 'notification' ), 'example' => true, 'group' => __( 'Archive', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->html_report_path; }, ] ) ); @@ -124,7 +124,7 @@ public function merge_tags() { 'description' => __( '/var/www/html/wp-content/uploads/wp-personal-data-exports/wp-personal-data-file-test.JSON', 'notification' ), 'example' => true, 'group' => __( 'Archive', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->json_report_pathname; }, ] ) ); diff --git a/src/Defaults/Trigger/Theme/Switched.php b/src/Defaults/Trigger/Theme/Switched.php index c109e323e..e9047e81d 100644 --- a/src/Defaults/Trigger/Theme/Switched.php +++ b/src/Defaults/Trigger/Theme/Switched.php @@ -71,7 +71,7 @@ public function merge_tags() { 'name' => __( 'Old theme name', 'notification' ), 'description' => __( 'Twenty Seventeen', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->old_theme->get( 'Name' ); }, 'group' => __( 'Old theme', 'notification' ), @@ -82,7 +82,7 @@ public function merge_tags() { 'name' => __( 'Old theme description', 'notification' ), 'description' => __( 'Twenty Seventeen brings your site to life with header video and immersive featured images', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->old_theme->get( 'Description' ); }, 'group' => __( 'Old theme', 'notification' ), @@ -93,7 +93,7 @@ public function merge_tags() { 'name' => __( 'Old theme version', 'notification' ), 'description' => __( '1.0.0', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->old_theme->get( 'Version' ); }, 'group' => __( 'Old theme', 'notification' ), @@ -104,7 +104,7 @@ public function merge_tags() { 'name' => __( 'Old theme URI', 'notification' ), 'description' => __( 'https://wordpress.org/themes/twentyseventeen/', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->old_theme->get( 'ThemeURI' ); }, 'group' => __( 'Old theme', 'notification' ), @@ -115,7 +115,7 @@ public function merge_tags() { 'name' => __( 'Old theme author', 'notification' ), 'description' => __( 'The WordPress team', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->old_theme->get( 'Author' ); }, 'group' => __( 'Old theme', 'notification' ), @@ -126,7 +126,7 @@ public function merge_tags() { 'name' => __( 'Old theme author URI', 'notification' ), 'description' => __( 'https://wordpress.org/', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->old_theme->get( 'AuthorURI' ); }, 'group' => __( 'Old theme', 'notification' ), diff --git a/src/Defaults/Trigger/Theme/ThemeTrigger.php b/src/Defaults/Trigger/Theme/ThemeTrigger.php index aed9631dc..27010ba67 100644 --- a/src/Defaults/Trigger/Theme/ThemeTrigger.php +++ b/src/Defaults/Trigger/Theme/ThemeTrigger.php @@ -34,7 +34,7 @@ public function merge_tags() { 'name' => __( 'Theme name', 'notification' ), 'description' => __( 'Twenty Seventeen', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->theme->get( 'Name' ); }, 'group' => __( 'Theme', 'notification' ), @@ -45,7 +45,7 @@ public function merge_tags() { 'name' => __( 'Theme description', 'notification' ), 'description' => __( 'Twenty Seventeen brings your site to life with header video and immersive featured images', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->theme->get( 'Description' ); }, 'group' => __( 'Theme', 'notification' ), @@ -56,7 +56,7 @@ public function merge_tags() { 'name' => __( 'Theme version', 'notification' ), 'description' => __( '1.0.0', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->theme->get( 'Version' ); }, 'group' => __( 'Theme', 'notification' ), @@ -67,7 +67,7 @@ public function merge_tags() { 'name' => __( 'Theme URI', 'notification' ), 'description' => __( 'https://wordpress.org/themes/twentyseventeen/', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->theme->get( 'ThemeURI' ); }, 'group' => __( 'Theme', 'notification' ), @@ -78,7 +78,7 @@ public function merge_tags() { 'name' => __( 'Theme author', 'notification' ), 'description' => __( 'The WordPress team', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->theme->get( 'Author' ); }, 'group' => __( 'Theme', 'notification' ), @@ -89,7 +89,7 @@ public function merge_tags() { 'name' => __( 'Theme author URI', 'notification' ), 'description' => __( 'https://wordpress.org/', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->theme->get( 'AuthorURI' ); }, 'group' => __( 'Theme', 'notification' ), @@ -100,7 +100,7 @@ public function merge_tags() { 'name' => __( 'Theme textdomain', 'notification' ), 'description' => __( 'twentyseventeen', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->theme->get( 'TextDomain' ); }, 'group' => __( 'Theme', 'notification' ), diff --git a/src/Defaults/Trigger/Theme/Updated.php b/src/Defaults/Trigger/Theme/Updated.php index ffb6e2207..8f20b5600 100644 --- a/src/Defaults/Trigger/Theme/Updated.php +++ b/src/Defaults/Trigger/Theme/Updated.php @@ -83,7 +83,7 @@ public function merge_tags() { 'name' => __( 'Theme previous version', 'notification' ), 'description' => __( '1.0.0', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->theme_previous_version; }, 'group' => __( 'Theme', 'notification' ), diff --git a/src/Defaults/Trigger/User/UserEmailChangeRequest.php b/src/Defaults/Trigger/User/UserEmailChangeRequest.php index 0438dd50f..e04f21da8 100644 --- a/src/Defaults/Trigger/User/UserEmailChangeRequest.php +++ b/src/Defaults/Trigger/User/UserEmailChangeRequest.php @@ -98,7 +98,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\EmailTag( [ 'slug' => 'new_email', 'name' => __( 'New email address', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->new_user_email; }, 'group' => __( 'User', 'notification' ), @@ -107,7 +107,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\UrlTag( [ 'slug' => 'confirmation_url', 'name' => __( 'Email change confirmation url', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->confirmation_url; }, 'group' => __( 'Site', 'notification' ), diff --git a/src/Defaults/Trigger/User/UserLogin.php b/src/Defaults/Trigger/User/UserLogin.php index b34c9fb9b..c8f3a0282 100644 --- a/src/Defaults/Trigger/User/UserLogin.php +++ b/src/Defaults/Trigger/User/UserLogin.php @@ -85,7 +85,7 @@ public function merge_tags() { 'name' => __( 'User IP', 'notification' ), 'description' => '127.0.0.1', 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) ) { return sanitize_text_field( wp_unslash( $_SERVER['HTTP_CLIENT_IP'] ) ); } elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) { diff --git a/src/Defaults/Trigger/User/UserRegistered.php b/src/Defaults/Trigger/User/UserRegistered.php index e6d46f8e3..a1a81b9c4 100644 --- a/src/Defaults/Trigger/User/UserRegistered.php +++ b/src/Defaults/Trigger/User/UserRegistered.php @@ -65,7 +65,7 @@ public function merge_tags() { 'description' => network_site_url( 'wp-login.php?action=rp&key=37f62f1363b04df4370753037853fe88&login=userlogin', 'login' ) . "\n" . __( 'After using this Merge Tag, no other password setup links will work.', 'notification' ), 'example' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return network_site_url( 'wp-login.php?action=rp&key=' . $trigger->get_password_reset_key() . '&login=' . rawurlencode( $trigger->user_object->user_login ), 'login' ); }, 'group' => __( 'User', 'notification' ), diff --git a/src/Defaults/Trigger/User/UserRoleChanged.php b/src/Defaults/Trigger/User/UserRoleChanged.php index 93af981af..444dfc9b3 100644 --- a/src/Defaults/Trigger/User/UserRoleChanged.php +++ b/src/Defaults/Trigger/User/UserRoleChanged.php @@ -98,7 +98,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\StringTag( [ 'slug' => 'new_role', 'name' => __( 'New role', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->new_role; }, 'group' => __( 'Roles', 'notification' ), @@ -107,7 +107,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\StringTag( [ 'slug' => 'old_role', 'name' => __( 'Old role', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->old_role; }, 'group' => __( 'Roles', 'notification' ), diff --git a/src/Defaults/Trigger/WordPress/EmailChangeRequest.php b/src/Defaults/Trigger/WordPress/EmailChangeRequest.php index e979ec1ac..e6eb6814c 100644 --- a/src/Defaults/Trigger/WordPress/EmailChangeRequest.php +++ b/src/Defaults/Trigger/WordPress/EmailChangeRequest.php @@ -101,7 +101,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\StringTag([ 'slug' => 'admin_login', 'name' => __( 'Admin login', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->user_login; }, 'group' => __( 'Site', 'notification' ), @@ -110,7 +110,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\EmailTag( [ 'slug' => 'new_email', 'name' => __( 'New email address', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->new_admin_email; }, 'group' => __( 'Site', 'notification' ), @@ -119,7 +119,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\UrlTag( [ 'slug' => 'confirmation_url', 'name' => __( 'Email change confirmation url', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->confirmation_url; }, 'group' => __( 'Site', 'notification' ), @@ -128,7 +128,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\UrlTag( [ 'slug' => 'site_url', 'name' => __( 'Site url', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->site_url; }, 'group' => __( 'Site', 'notification' ), diff --git a/src/Defaults/Trigger/WordPress/UpdatesAvailable.php b/src/Defaults/Trigger/WordPress/UpdatesAvailable.php index 7402c1e2c..f69797855 100644 --- a/src/Defaults/Trigger/WordPress/UpdatesAvailable.php +++ b/src/Defaults/Trigger/WordPress/UpdatesAvailable.php @@ -72,7 +72,7 @@ public function merge_tags() { 'slug' => 'updates_list', 'name' => __( 'Updates list', 'notification' ), 'description' => __( 'The lists for core, plugins and themes updates.', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { $lists = []; foreach ( $trigger->update_types as $update_type ) { @@ -95,7 +95,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\IntegerTag( [ 'slug' => 'all_updates_count', 'name' => __( 'Number of all updates', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->get_updates_count( 'all' ); }, ] ) ); @@ -103,7 +103,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\IntegerTag( [ 'slug' => 'core_updates_count', 'name' => __( 'Number of core updates', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->get_updates_count( 'core' ); }, ] ) ); @@ -111,7 +111,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\IntegerTag( [ 'slug' => 'plugin_updates_count', 'name' => __( 'Number of plugin updates', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->get_updates_count( 'plugin' ); }, ] ) ); @@ -119,7 +119,7 @@ public function merge_tags() { $this->add_merge_tag( new MergeTag\IntegerTag( [ 'slug' => 'theme_updates_count', 'name' => __( 'Number of theme updates', 'notification' ), - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->get_updates_count( 'theme' ); }, ] ) ); diff --git a/src/Integration/WordPressEmails.php b/src/Integration/WordPressEmails.php index e45c71f7a..fc1a9d151 100644 --- a/src/Integration/WordPressEmails.php +++ b/src/Integration/WordPressEmails.php @@ -120,7 +120,7 @@ public function disable_send_confirmation_on_profile_email() { if ( 'true' === notification_get_setting( 'integration/emails/send_confirmation_on_profile_email' ) ) { - add_filter( 'new_user_email_content', function( $email_text = false, $new_user_email = false ) { + add_filter( 'new_user_email_content', function ( $email_text = false, $new_user_email = false ) { $_POST['email'] = false; return false; }); diff --git a/src/Queries/UserQueries.php b/src/Queries/UserQueries.php index 4cd918299..371fc392b 100644 --- a/src/Queries/UserQueries.php +++ b/src/Queries/UserQueries.php @@ -24,7 +24,7 @@ public static function all() { $driver = new CacheDriver\ObjectCache( 'notification' ); $cache = new Cache( $driver, 'users' ); - return $cache->collect( function() { + return $cache->collect( function () { global $wpdb; // We're using direct db call for performance purposes - we only need the post_content field. @@ -43,7 +43,7 @@ public static function with_role( string $role ) { $driver = new CacheDriver\ObjectCache( 'notification' ); $cache = new Cache( $driver, sprintf( '%s_users', $role ) ); - return $cache->collect( function() use ( $role ) { + return $cache->collect( function () use ( $role ) { global $wpdb; // We're using direct db call for performance purposes - we only need the post_content field. diff --git a/src/Register.php b/src/Register.php index d9d80a0fe..3239e61b0 100644 --- a/src/Register.php +++ b/src/Register.php @@ -82,7 +82,7 @@ public static function global_merge_tag( Interfaces\Taggable $merge_tag ) { do_action( 'notification/global_merge_tag/registered', $merge_tag ); // Register the Merge Tag. - add_action( 'notification/trigger/merge_tags', function( $trigger ) use ( $merge_tag ) { + add_action( 'notification/trigger/merge_tags', function ( $trigger ) use ( $merge_tag ) { $trigger->add_merge_tag( clone $merge_tag ); } ); diff --git a/src/Repository/GlobalMergeTagRepository.php b/src/Repository/GlobalMergeTagRepository.php index 6c9dfe200..8fb5c0cb9 100644 --- a/src/Repository/GlobalMergeTagRepository.php +++ b/src/Repository/GlobalMergeTagRepository.php @@ -25,7 +25,7 @@ public static function register() { 'name' => __( 'Site homepage URL', 'notification' ), 'description' => home_url(), 'hidden' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return home_url(); }, ] ) ); @@ -35,7 +35,7 @@ public static function register() { 'name' => __( 'Site title', 'notification' ), 'description' => get_bloginfo( 'name' ), 'hidden' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return get_bloginfo( 'name' ); }, ] ) ); @@ -45,7 +45,7 @@ public static function register() { 'name' => __( 'Site tagline', 'notification' ), 'description' => get_bloginfo( 'description' ), 'hidden' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return get_bloginfo( 'description' ); }, ] ) ); @@ -55,7 +55,7 @@ public static function register() { 'name' => __( 'Site theme name', 'notification' ), 'description' => wp_get_theme()->name, 'hidden' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return wp_get_theme()->name; }, ] ) ); @@ -65,7 +65,7 @@ public static function register() { 'name' => __( 'Site theme version', 'notification' ), 'description' => wp_get_theme()->version, 'hidden' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return wp_get_theme()->version; }, ] ) ); @@ -75,7 +75,7 @@ public static function register() { 'name' => __( 'Current WordPress version', 'notification' ), 'description' => get_bloginfo( 'version' ), 'hidden' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return get_bloginfo( 'version' ); }, ] ) ); @@ -85,7 +85,7 @@ public static function register() { 'name' => __( 'Admin email', 'notification' ), 'description' => get_option( 'admin_email' ), 'hidden' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return get_option( 'admin_email' ); }, ] ) ); @@ -95,7 +95,7 @@ public static function register() { 'name' => __( 'Admin avatar', 'notification' ), 'description' => __( 'HTML img tag with avatar', 'notification' ), 'hidden' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return get_avatar( get_option( 'admin_email' ) ); }, ] ) ); @@ -106,7 +106,7 @@ public static function register() { 'description' => __( 'User login', 'notification' ), 'example' => true, 'hidden' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->get_name(); }, ] ) ); @@ -117,7 +117,7 @@ public static function register() { 'description' => 'wordpress/user_login', 'example' => true, 'hidden' => true, - 'resolver' => function( $trigger ) { + 'resolver' => function ( $trigger ) { return $trigger->get_slug(); }, ] ) ); diff --git a/src/Store/Notification.php b/src/Store/Notification.php index 996d069db..a397480cd 100644 --- a/src/Store/Notification.php +++ b/src/Store/Notification.php @@ -26,7 +26,7 @@ class Notification implements Storable { * @return array */ public static function with_trigger( $trigger_slug ) { - return array_filter( static::all(), function( $notification ) use ( $trigger_slug ) { + return array_filter( static::all(), function ( $notification ) use ( $trigger_slug ) { return ! empty( $notification->get_trigger() ) && $notification->get_trigger()->get_slug() === $trigger_slug; } ); } diff --git a/src/Store/Resolver.php b/src/Store/Resolver.php index 1c61aa059..77eedebb7 100644 --- a/src/Store/Resolver.php +++ b/src/Store/Resolver.php @@ -25,7 +25,7 @@ class Resolver implements Interfaces\Storable { public static function sorted() : array { $resolvers = static::all(); - usort( $resolvers, function( $a, $b ) { + usort( $resolvers, function ( $a, $b ) { if ( $a->get_priority() === $b->get_priority() ) { return 0; } diff --git a/src/Utils/WpObjectHelper.php b/src/Utils/WpObjectHelper.php index dff25db85..99bd554c3 100644 --- a/src/Utils/WpObjectHelper.php +++ b/src/Utils/WpObjectHelper.php @@ -127,7 +127,7 @@ public static function get_comment_types() : array { $driver = new CacheDriver\ObjectCache( 'notification' ); $cache = new Cache( $driver, 'comment_types' ); - return $cache->collect( function() { + return $cache->collect( function () { global $wpdb; $comment_types = [ From edba3b3989ca2afccf997f6a890b7bc97168a442 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Thu, 4 Nov 2021 12:35:38 +0100 Subject: [PATCH 19/21] fix phpcs --- src/Abstracts/Trigger.php | 14 +++++++------- src/Core/Runner.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Abstracts/Trigger.php b/src/Abstracts/Trigger.php index b697f8b7f..dafeb82f1 100644 --- a/src/Abstracts/Trigger.php +++ b/src/Abstracts/Trigger.php @@ -286,7 +286,7 @@ public function is_stopped() : bool { * @return void */ public function postpone_action( $tag, $priority = 10, $accepted_args = 1 ) { - _deprecated_function ( __METHOD__, '8.0.0' ); + _deprecated_function( __METHOD__, '8.0.0' ); } /** @@ -297,7 +297,7 @@ public function postpone_action( $tag, $priority = 10, $accepted_args = 1 ) { * @return boolean */ public function is_postponed() { - _deprecated_function ( __METHOD__, '8.0.0' ); + _deprecated_function( __METHOD__, '8.0.0' ); return true; } @@ -309,7 +309,7 @@ public function is_postponed() { * @return bool */ public function has_background_processing_enabled() { - _deprecated_function ( __METHOD__, '8.0.0' ); + _deprecated_function( __METHOD__, '8.0.0' ); return apply_filters( 'notification/trigger/process_in_background', @@ -326,7 +326,7 @@ public function has_background_processing_enabled() { * @return array */ public function get_action_args() { - _deprecated_function ( __METHOD__, '8.0.0' ); + _deprecated_function( __METHOD__, '8.0.0' ); return []; } @@ -339,7 +339,7 @@ public function get_action_args() { * @return array */ public function get_cache() { - _deprecated_function ( __METHOD__, '8.0.0' ); + _deprecated_function( __METHOD__, '8.0.0' ); return []; } @@ -353,7 +353,7 @@ public function get_cache() { * @return $this */ public function set_cache( $cache ) { - _deprecated_function ( __METHOD__, '8.0.0' ); + _deprecated_function( __METHOD__, '8.0.0' ); return $this; } @@ -368,7 +368,7 @@ public function set_cache( $cache ) { * @return mixed */ public function cache( $key, $default = '' ) { - _deprecated_function ( __METHOD__, '8.0.0' ); + _deprecated_function( __METHOD__, '8.0.0' ); return $default; } diff --git a/src/Core/Runner.php b/src/Core/Runner.php index 00e7ff564..ce17fe886 100644 --- a/src/Core/Runner.php +++ b/src/Core/Runner.php @@ -72,7 +72,7 @@ public function run( ...$context ) { $result = call_user_func_array( [ $this->trigger, 'action' ], $context ); $class = get_class( $this->trigger ); - _deprecated_function ( + _deprecated_function( sprintf( '%s::action()', esc_html( $class ) ), '8.0.0', sprintf( '%s::context()', esc_html( $class ) ) From 4f0e91894249bbfe99a4eddba2f9f8aced560548 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Thu, 4 Nov 2021 12:36:31 +0100 Subject: [PATCH 20/21] dump hooks --- compat/register-hooks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/register-hooks.php b/compat/register-hooks.php index 7584cc332..28638b9e4 100644 --- a/compat/register-hooks.php +++ b/compat/register-hooks.php @@ -19,7 +19,7 @@ add_action( 'notification/init', [ $this->component( 'core_settings' ), 'register_settings' ], 5, 0 ); add_action( 'admin_init', [ $this->component( 'core_upgrade' ), 'check_upgrade' ], 10, 0 ); add_action( 'notification/init', [ $this->component( 'core_upgrade' ), 'upgrade_db' ], 10, 0 ); -add_action( 'notification/init', [ $this->component( 'core_sync' ), 'load_local_json' ], 10, 0 ); +add_action( 'notification/init', [ $this->component( 'core_sync' ), 'load_local_json' ], 100, 0 ); add_action( 'notification/data/save/after', [ $this->component( 'core_sync' ), 'save_local_json' ], 10, 1 ); add_action( 'delete_post', [ $this->component( 'core_sync' ), 'delete_local_json' ], 10, 1 ); add_action( 'notification/trigger/registered', [ $this->component( 'core_binder' ), 'bind' ], 100, 1 ); From 004ec1f76bcfc9df366c1c9bcf1113e85fd65ccc Mon Sep 17 00:00:00 2001 From: BracketSpaceWorker Date: Thu, 4 Nov 2021 11:40:10 +0000 Subject: [PATCH 21/21] Version bump --- compat/src-deprecated/Utils/Cache/Cache.php | 2 +- compat/src-deprecated/Utils/Cache/ObjectCache.php | 2 +- compat/src-deprecated/Utils/Cache/Transient.php | 2 +- notification.php | 2 +- readme.txt | 4 ++-- src/Admin/ImportExport.php | 2 +- src/Core/Sync.php | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compat/src-deprecated/Utils/Cache/Cache.php b/compat/src-deprecated/Utils/Cache/Cache.php index 1f13eeae6..3b41aeed1 100644 --- a/compat/src-deprecated/Utils/Cache/Cache.php +++ b/compat/src-deprecated/Utils/Cache/Cache.php @@ -25,7 +25,7 @@ class Cache { * @param string $key cache unique key. */ public function __construct( $key ) { - notification_deprecated_class( __CLASS__, '[Next]', 'BracketSpace\\Notification\\Dependencies\\Micropackage\\Cache\\Cache' ); + notification_deprecated_class( __CLASS__, '8.0.2', 'BracketSpace\\Notification\\Dependencies\\Micropackage\\Cache\\Cache' ); if ( empty( $key ) ) { trigger_error( 'Cache key cannot be empty' ); diff --git a/compat/src-deprecated/Utils/Cache/ObjectCache.php b/compat/src-deprecated/Utils/Cache/ObjectCache.php index c79670d39..4e418d831 100644 --- a/compat/src-deprecated/Utils/Cache/ObjectCache.php +++ b/compat/src-deprecated/Utils/Cache/ObjectCache.php @@ -31,7 +31,7 @@ class ObjectCache extends Cache implements Cacheable { * @param string $group cache group, optional. */ public function __construct( $key, $group = '' ) { - notification_deprecated_class( __CLASS__, '[Next]', 'BracketSpace\\Notification\\Dependencies\\Micropackage\\Cache\\Driver\\ObjectCache' ); + notification_deprecated_class( __CLASS__, '8.0.2', 'BracketSpace\\Notification\\Dependencies\\Micropackage\\Cache\\Driver\\ObjectCache' ); parent::__construct( $key ); diff --git a/compat/src-deprecated/Utils/Cache/Transient.php b/compat/src-deprecated/Utils/Cache/Transient.php index 2c6a3b90c..2cb1e0e09 100644 --- a/compat/src-deprecated/Utils/Cache/Transient.php +++ b/compat/src-deprecated/Utils/Cache/Transient.php @@ -31,7 +31,7 @@ class Transient extends Cache implements Cacheable { * @param integer $expiration expiration in seconds. */ public function __construct( $key, $expiration = 0 ) { - notification_deprecated_class( __CLASS__, '[Next]', 'BracketSpace\\Notification\\Dependencies\\Micropackage\\Cache\\Driver\\Transient' ); + notification_deprecated_class( __CLASS__, '8.0.2', 'BracketSpace\\Notification\\Dependencies\\Micropackage\\Cache\\Driver\\Transient' ); parent::__construct( $key ); diff --git a/notification.php b/notification.php index 36899b5a2..c479f6926 100644 --- a/notification.php +++ b/notification.php @@ -4,7 +4,7 @@ * Description: Customisable email and webhook notifications with powerful developer friendly API for custom triggers and notifications. Send alerts easily. * Author: BracketSpace * Author URI: https://bracketspace.com - * Version: 8.0.1 + * Version: 8.0.2 * License: GPL3 * Text Domain: notification * Domain Path: /languages diff --git a/readme.txt b/readme.txt index 997af4bd6..ebc12e1ce 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: notification, bracketspace, Kubitomakita, tomaszadamowicz, insejn, Tags: notification, notify, alert, email, mail, webhook, API, developer, framework Requires at least: 4.9 Tested up to: 5.8 -Stable tag: 8.0.1 +Stable tag: 8.0.2 Requires PHP: 7.0 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -295,7 +295,7 @@ Yes, just activate the debug log in the DEBUGGING section of the plugin settings == Changelog == -= [Next] = += 8.0.2 = * [Added] HTML escaping and nonce verifications. * [Changed] Notification file syncing is now using Filesystem methods. diff --git a/src/Admin/ImportExport.php b/src/Admin/ImportExport.php index 36fc29d35..d44c790d7 100644 --- a/src/Admin/ImportExport.php +++ b/src/Admin/ImportExport.php @@ -120,7 +120,7 @@ public function export_request() { * * @throws \Exception When no items selected for export. * @since 6.0.0 - * @since [Next] Accepts the items argument, instead reading it from GET. + * @since 8.0.2 Accepts the items argument, instead reading it from GET. * @param array $items Items to export. * @return array */ diff --git a/src/Core/Sync.php b/src/Core/Sync.php index 3d89bdebd..87cd4fe4c 100644 --- a/src/Core/Sync.php +++ b/src/Core/Sync.php @@ -205,7 +205,7 @@ public static function get_sync_path() { /** * Gets the sync dir filesystem. * - * @since [Next] + * @since 8.0.2 * @return Filesystem|null */ public static function get_sync_fs() {