From 014f7a4dec2c0da0af443393b14ba8ffb0c62e91 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Thu, 11 Jul 2019 09:16:04 +0300 Subject: [PATCH 001/123] Add license info and meta data --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index 0d79969b8..3bd3c9a4b 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,9 @@ { "name": "xwp/stream", + "description": "Logging for WordPress", + "homepage": "https://wordpress.org/plugins/stream/", "type": "wordpress-plugin", + "license": "GPL-2.0-or-later", "require": { "composer/installers": "~1.0" }, From e4b4f6a2f0eeab03c995c58cb249e8516fccddc0 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Thu, 11 Jul 2019 09:16:23 +0300 Subject: [PATCH 002/123] Validate composer.json during linting --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6fd869059..c5ed99627 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,6 @@ "build": "grunt default && npm run readme", "readme": "./node_modules/wp-dev-lib/scripts/generate-markdown-readme", "deploy": "npm run build && grunt deploy", - "lint": "DIFF_BASE=master ./node_modules/wp-dev-lib/scripts/pre-commit" + "lint": "composer validate && DIFF_BASE=master ./node_modules/wp-dev-lib/scripts/pre-commit" } } From 7f42edd9ec38520dd941d4365892a6a2002c6321 Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Thu, 11 Jul 2019 09:46:53 +0300 Subject: [PATCH 003/123] Use standard naming to ensure phpcs can find it --- phpcs.ruleset.xml => phpcs.xml.dist | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) rename phpcs.ruleset.xml => phpcs.xml.dist (64%) diff --git a/phpcs.ruleset.xml b/phpcs.xml.dist similarity index 64% rename from phpcs.ruleset.xml rename to phpcs.xml.dist index dd1284c56..34b6889ed 100644 --- a/phpcs.ruleset.xml +++ b/phpcs.xml.dist @@ -2,10 +2,15 @@ - + + + + + *.ruleset */tests/* */includes/lib/* */ui/lib/* + */vendor/* From 1b831eec37a5dc486bc2c071b8700c342b0e588a Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Thu, 11 Jul 2019 09:50:45 +0300 Subject: [PATCH 004/123] Add helpers for running the linter --- composer.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/composer.json b/composer.json index 3bd3c9a4b..9c34e64af 100644 --- a/composer.json +++ b/composer.json @@ -9,5 +9,14 @@ }, "require-dev": { "wp-coding-standards/wpcs": "^2.1" + }, + "scripts": { + "lint-php": [ + "phpcs ." + ], + "lint": [ + "@composer validate", + "@lint-php" + ] } } From c8667cd9796623cbd3c565b887c4e8c6fcae90af Mon Sep 17 00:00:00 2001 From: Kaspars Dambis Date: Thu, 11 Jul 2019 09:53:56 +0300 Subject: [PATCH 005/123] Automatic WPCS fixes --- alerts/class-alert-trigger-context.php | 9 +- alerts/class-alert-type-email.php | 19 +- alerts/class-alert-type-highlight.php | 33 +++- alerts/class-alert-type-ifttt.php | 21 +- alerts/class-alert-type-menu-alert.php | 6 +- alerts/class-alert-type-slack.php | 34 ++-- classes/class-admin.php | 52 +++-- classes/class-alerts-list.php | 2 +- classes/class-alerts.php | 100 ++++++---- classes/class-connector.php | 12 +- classes/class-connectors.php | 1 + classes/class-db.php | 3 +- classes/class-form-generator.php | 6 +- classes/class-install.php | 9 +- classes/class-list-table.php | 32 ++- classes/class-live-update.php | 6 +- classes/class-log.php | 6 +- classes/class-network.php | 4 +- classes/class-record.php | 4 +- classes/class-settings.php | 49 +++-- classes/class-uninstall.php | 3 +- connectors/class-connector-acf.php | 28 +-- connectors/class-connector-bbpress.php | 8 +- connectors/class-connector-blogs.php | 2 +- connectors/class-connector-buddypress.php | 12 +- connectors/class-connector-comments.php | 6 +- connectors/class-connector-edd.php | 52 +++-- connectors/class-connector-gravityforms.php | 12 +- connectors/class-connector-installer.php | 5 +- connectors/class-connector-jetpack.php | 2 +- connectors/class-connector-media.php | 2 +- connectors/class-connector-menus.php | 9 +- connectors/class-connector-posts.php | 8 +- connectors/class-connector-settings.php | 19 +- connectors/class-connector-taxonomies.php | 10 +- connectors/class-connector-user-switching.php | 1 - connectors/class-connector-users.php | 14 +- connectors/class-connector-widgets.php | 7 +- connectors/class-connector-woocommerce.php | 23 ++- connectors/class-connector-wordpress-seo.php | 186 +++++++++--------- includes/db-updates.php | 12 +- includes/functions.php | 6 +- 42 files changed, 503 insertions(+), 332 deletions(-) diff --git a/alerts/class-alert-trigger-context.php b/alerts/class-alert-trigger-context.php index dab5d3c81..85d7493b4 100644 --- a/alerts/class-alert-trigger-context.php +++ b/alerts/class-alert-trigger-context.php @@ -76,7 +76,8 @@ public function add_fields( $form, $alert = array() ) { $context_values = array(); $form->add_field( - 'select2', array( + 'select2', + array( 'name' => 'wp_stream_trigger_connector_or_context', 'options' => $this->get_values(), 'classes' => 'wp_stream_ajax_forward connector_or_context', @@ -87,7 +88,8 @@ public function add_fields( $form, $alert = array() ) { ); $form->add_field( - 'hidden', array( + 'hidden', + array( 'name' => 'wp_stream_trigger_connector', 'value' => $connector, 'classes' => 'connector wp_stream_ajax_forward', @@ -95,7 +97,8 @@ public function add_fields( $form, $alert = array() ) { ); $form->add_field( - 'hidden', array( + 'hidden', + array( 'name' => 'wp_stream_trigger_context', 'value' => $context, 'classes' => 'context wp_stream_ajax_forward', diff --git a/alerts/class-alert-type-email.php b/alerts/class-alert-type-email.php index 22484faef..743117292 100644 --- a/alerts/class-alert-type-email.php +++ b/alerts/class-alert-type-email.php @@ -43,10 +43,13 @@ public function __construct( $plugin ) { return; } add_filter( - 'wp_stream_alerts_save_meta', array( + 'wp_stream_alerts_save_meta', + array( $this, 'add_alert_meta', - ), 10, 2 + ), + 10, + 2 ); } @@ -60,7 +63,8 @@ public function __construct( $plugin ) { */ public function alert( $record_id, $recordarr, $alert ) { $options = wp_parse_args( - $alert->alert_meta, array( + $alert->alert_meta, + array( 'email_recipient' => '', 'email_subject' => '', 'trigger_action' => '', @@ -131,7 +135,8 @@ public function display_fields( $alert ) { $alert_meta = $alert->alert_meta; } $options = wp_parse_args( - $alert_meta, array( + $alert_meta, + array( 'email_recipient' => '', 'email_subject' => '', ) @@ -142,7 +147,8 @@ public function display_fields( $alert ) { echo '