From 22946c1c6010f8f611d7155fee87dcf7349f853a Mon Sep 17 00:00:00 2001
From: Vlass Contreras <17748144+vlasscontreras@users.noreply.github.com>
Date: Fri, 21 May 2021 14:57:07 -0600
Subject: [PATCH 1/7] =?UTF-8?q?deps:=20=E2=AC=86=EF=B8=8F=20update=20packa?=
=?UTF-8?q?ges?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
composer.lock | 162 +++++++++++++++++++-------------------------------
1 file changed, 61 insertions(+), 101 deletions(-)
diff --git a/composer.lock b/composer.lock
index 7346975..d6f1891 100644
--- a/composer.lock
+++ b/composer.lock
@@ -324,21 +324,21 @@
},
{
"name": "php-parallel-lint/php-parallel-lint",
- "version": "v1.2.0",
+ "version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git",
- "reference": "474f18bc6cc6aca61ca40bfab55139de614e51ca"
+ "reference": "772a954e5f119f6f5871d015b23eabed8cbdadfb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/474f18bc6cc6aca61ca40bfab55139de614e51ca",
- "reference": "474f18bc6cc6aca61ca40bfab55139de614e51ca",
+ "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/772a954e5f119f6f5871d015b23eabed8cbdadfb",
+ "reference": "772a954e5f119f6f5871d015b23eabed8cbdadfb",
"shasum": ""
},
"require": {
"ext-json": "*",
- "php": ">=5.4.0"
+ "php": ">=5.3.0"
},
"replace": {
"grogy/php-parallel-lint": "*",
@@ -347,7 +347,7 @@
"require-dev": {
"nette/tester": "^1.3 || ^2.0",
"php-parallel-lint/php-console-highlighter": "~0.3",
- "squizlabs/php_codesniffer": "~3.0"
+ "squizlabs/php_codesniffer": "^3.5"
},
"suggest": {
"php-parallel-lint/php-console-highlighter": "Highlight syntax in code snippet"
@@ -375,9 +375,9 @@
"homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint",
"support": {
"issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues",
- "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/master"
+ "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.0"
},
- "time": "2020-04-04T12:18:32+00:00"
+ "time": "2021-04-07T14:42:48+00:00"
},
{
"name": "phpcompatibility/php-compatibility",
@@ -551,75 +551,32 @@
},
"time": "2021-02-15T12:58:46+00:00"
},
- {
- "name": "ramsey/array_column",
- "version": "1.1.3",
- "source": {
- "type": "git",
- "url": "https://github.com/ramsey/array_column.git",
- "reference": "f8e52eb28e67eb50e613b451dd916abcf783c1db"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/ramsey/array_column/zipball/f8e52eb28e67eb50e613b451dd916abcf783c1db",
- "reference": "f8e52eb28e67eb50e613b451dd916abcf783c1db",
- "shasum": ""
- },
- "require-dev": {
- "jakub-onderka/php-parallel-lint": "0.8.*",
- "phpunit/phpunit": "~4.5",
- "satooshi/php-coveralls": "0.6.*",
- "squizlabs/php_codesniffer": "~2.2"
- },
- "type": "library",
- "autoload": {
- "files": [
- "src/array_column.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Ben Ramsey",
- "homepage": "http://benramsey.com"
- }
- ],
- "description": "Provides functionality for array_column() to projects using PHP earlier than version 5.5.",
- "homepage": "https://github.com/ramsey/array_column",
- "keywords": [
- "array",
- "array_column",
- "column"
- ],
- "support": {
- "issues": "https://github.com/ramsey/array_column/issues",
- "source": "https://github.com/ramsey/array_column"
- },
- "abandoned": "it-for-free/array_column",
- "time": "2015-03-20T22:07:39+00:00"
- },
{
"name": "rmccue/requests",
- "version": "v1.7.0",
+ "version": "v1.8.0",
"source": {
"type": "git",
- "url": "https://github.com/rmccue/Requests.git",
- "reference": "87932f52ffad70504d93f04f15690cf16a089546"
+ "url": "https://github.com/WordPress/Requests.git",
+ "reference": "afbe4790e4def03581c4a0963a1e8aa01f6030f1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/rmccue/Requests/zipball/87932f52ffad70504d93f04f15690cf16a089546",
- "reference": "87932f52ffad70504d93f04f15690cf16a089546",
+ "url": "https://api.github.com/repos/WordPress/Requests/zipball/afbe4790e4def03581c4a0963a1e8aa01f6030f1",
+ "reference": "afbe4790e4def03581c4a0963a1e8aa01f6030f1",
"shasum": ""
},
"require": {
"php": ">=5.2"
},
"require-dev": {
- "requests/test-server": "dev-master"
+ "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
+ "php-parallel-lint/php-console-highlighter": "^0.5.0",
+ "php-parallel-lint/php-parallel-lint": "^1.3",
+ "phpcompatibility/php-compatibility": "^9.0",
+ "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.5",
+ "requests/test-server": "dev-master",
+ "squizlabs/php_codesniffer": "^3.5",
+ "wp-coding-standards/wpcs": "^2.0"
},
"type": "library",
"autoload": {
@@ -638,7 +595,7 @@
}
],
"description": "A HTTP library written in PHP, for human beings.",
- "homepage": "http://github.com/rmccue/Requests",
+ "homepage": "http://github.com/WordPress/Requests",
"keywords": [
"curl",
"fsockopen",
@@ -649,23 +606,23 @@
"sockets"
],
"support": {
- "issues": "https://github.com/rmccue/Requests/issues",
- "source": "https://github.com/rmccue/Requests/tree/master"
+ "issues": "https://github.com/WordPress/Requests/issues",
+ "source": "https://github.com/WordPress/Requests/tree/v1.8.0"
},
- "time": "2016-10-13T00:11:37+00:00"
+ "time": "2021-04-27T11:05:25+00:00"
},
{
"name": "squizlabs/php_codesniffer",
- "version": "3.5.8",
+ "version": "3.6.0",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
- "reference": "9d583721a7157ee997f235f327de038e7ea6dac4"
+ "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4",
- "reference": "9d583721a7157ee997f235f327de038e7ea6dac4",
+ "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
+ "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
"shasum": ""
},
"require": {
@@ -708,20 +665,20 @@
"source": "https://github.com/squizlabs/PHP_CodeSniffer",
"wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
},
- "time": "2020-10-23T02:01:07+00:00"
+ "time": "2021-04-09T00:54:41+00:00"
},
{
"name": "symfony/finder",
- "version": "v5.2.4",
+ "version": "v5.2.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "0d639a0943822626290d169965804f79400e6a04"
+ "reference": "ccccb9d48ca42757dd12f2ca4bf857a4e217d90d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04",
- "reference": "0d639a0943822626290d169965804f79400e6a04",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/ccccb9d48ca42757dd12f2ca4bf857a4e217d90d",
+ "reference": "ccccb9d48ca42757dd12f2ca4bf857a4e217d90d",
"shasum": ""
},
"require": {
@@ -753,7 +710,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v5.2.4"
+ "source": "https://github.com/symfony/finder/tree/v5.2.9"
},
"funding": [
{
@@ -769,30 +726,30 @@
"type": "tidelift"
}
],
- "time": "2021-02-15T18:55:04+00:00"
+ "time": "2021-05-16T13:07:46+00:00"
},
{
"name": "wp-cli/i18n-command",
- "version": "v2.2.6",
+ "version": "v2.2.8",
"source": {
"type": "git",
"url": "https://github.com/wp-cli/i18n-command.git",
- "reference": "a66da3f09f6a728832381012848c3074bf1635c8"
+ "reference": "8bc234617edc533590ac0f41080164a8d85ec9ce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/a66da3f09f6a728832381012848c3074bf1635c8",
- "reference": "a66da3f09f6a728832381012848c3074bf1635c8",
+ "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/8bc234617edc533590ac0f41080164a8d85ec9ce",
+ "reference": "8bc234617edc533590ac0f41080164a8d85ec9ce",
"shasum": ""
},
"require": {
"gettext/gettext": "^4.8",
"mck89/peast": "^1.8",
- "wp-cli/wp-cli": "^2"
+ "wp-cli/wp-cli": "^2.5"
},
"require-dev": {
"wp-cli/scaffold-command": "^1.2 || ^2",
- "wp-cli/wp-cli-tests": "^2.1.3"
+ "wp-cli/wp-cli-tests": "^3.0.11"
},
"type": "wp-cli-package",
"extra": {
@@ -828,9 +785,9 @@
"homepage": "https://github.com/wp-cli/i18n-command",
"support": {
"issues": "https://github.com/wp-cli/i18n-command/issues",
- "source": "https://github.com/wp-cli/i18n-command/tree/v2.2.6"
+ "source": "https://github.com/wp-cli/i18n-command/tree/v2.2.8"
},
- "time": "2020-12-07T19:28:27+00:00"
+ "time": "2021-05-10T10:24:16+00:00"
},
{
"name": "wp-cli/mustangostang-spyc",
@@ -939,25 +896,23 @@
},
{
"name": "wp-cli/wp-cli",
- "version": "v2.1.0",
+ "version": "v2.5.0",
"source": {
"type": "git",
"url": "https://github.com/wp-cli/wp-cli.git",
- "reference": "6dde820a8f6f183f4b6d751e5be1cd343974f333"
+ "reference": "0bcf0c54f4d35685211d435e25219cc7acbe6d48"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/6dde820a8f6f183f4b6d751e5be1cd343974f333",
- "reference": "6dde820a8f6f183f4b6d751e5be1cd343974f333",
+ "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/0bcf0c54f4d35685211d435e25219cc7acbe6d48",
+ "reference": "0bcf0c54f4d35685211d435e25219cc7acbe6d48",
"shasum": ""
},
"require": {
"ext-curl": "*",
- "ext-readline": "*",
- "mustache/mustache": "~2.4",
- "php": ">=5.4",
- "ramsey/array_column": "~1.1",
- "rmccue/requests": "~1.6",
+ "mustache/mustache": "~2.13",
+ "php": "^5.6 || ^7.0 || ^8.0",
+ "rmccue/requests": "^1.8",
"symfony/finder": ">2.7",
"wp-cli/mustangostang-spyc": "^0.6.3",
"wp-cli/php-cli-tools": "~0.11.2"
@@ -968,9 +923,10 @@
"wp-cli/entity-command": "^1.2 || ^2",
"wp-cli/extension-command": "^1.1 || ^2",
"wp-cli/package-command": "^1 || ^2",
- "wp-cli/wp-cli-tests": "^2.0.8"
+ "wp-cli/wp-cli-tests": "^3.0.7"
},
"suggest": {
+ "ext-readline": "Include for a better --prompt implementation",
"ext-zip": "Needed to support extraction of ZIP archives when doing downloads or updates"
},
"bin": [
@@ -980,13 +936,17 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1.x-dev"
+ "dev-master": "2.5.x-dev"
}
},
"autoload": {
"psr-0": {
- "WP_CLI": "php"
- }
+ "WP_CLI\\": "php/"
+ },
+ "classmap": [
+ "php/class-wp-cli.php",
+ "php/class-wp-cli-command.php"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -1003,7 +963,7 @@
"issues": "https://github.com/wp-cli/wp-cli/issues",
"source": "https://github.com/wp-cli/wp-cli"
},
- "time": "2018-12-18T17:37:51+00:00"
+ "time": "2021-05-14T13:44:51+00:00"
},
{
"name": "wp-coding-standards/wpcs",
From d78b775f1be9531805913b4fdbf59a258ba45d11 Mon Sep 17 00:00:00 2001
From: Vlass Contreras <17748144+vlasscontreras@users.noreply.github.com>
Date: Fri, 21 May 2021 14:59:52 -0600
Subject: [PATCH 2/7] =?UTF-8?q?chore:=20=F0=9F=93=8C=20bump=20next=20versi?=
=?UTF-8?q?on?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
gragrid.php | 4 ++--
readme.txt | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index d098948..42fbeb3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
# Gragrid: Gravity Forms + SendGrid
[![GitHub Workflows](https://github.com/vlasscontreras/gragrid/workflows/Build/badge.svg)](https://github.com/vlasscontreras/gragrid)
-[![Version](https://img.shields.io/badge/version-2.1.0-brightgreen.svg)](https://github.com/vlasscontreras/gragrid)
+[![Version](https://img.shields.io/badge/version-2.2.0-brightgreen.svg)](https://github.com/vlasscontreras/gragrid)
[![Plugin Version](https://img.shields.io/wordpress/plugin/v/gragrid)](https://wordpress.org/plugins/gragrid/)
[![PHP Version](https://img.shields.io/wordpress/plugin/required-php/gragrid)](https://github.com/vlasscontreras/gragrid)
[![WordPress Plugin: Required WP Version](https://img.shields.io/wordpress/plugin/wp-version/gragrid)](https://github.com/vlasscontreras/gragrid)
diff --git a/gragrid.php b/gragrid.php
index 1b08c75..81fe2a4 100644
--- a/gragrid.php
+++ b/gragrid.php
@@ -10,7 +10,7 @@
* Plugin Name: Gragrid: Gravity Forms + SendGrid
* Plugin URI: https://github.com/vlasscontreras/gragrid
* Description: Integrates Gravity Forms with SendGrid, allowing form submissions to be automatically sent to your SendGrid contact lists.
- * Version: 2.1.0
+ * Version: 2.2.0
* Requires at least: 5.2
* Requires PHP: 7.3
* Author: Vladimir Contreras
@@ -28,7 +28,7 @@
/**
* Current add-on version
*/
-define( 'GRAGRID_VERSION', '2.1.0' );
+define( 'GRAGRID_VERSION', '2.2.0' );
/**
* If the Feed Add-On Framework exists, SendGrid Add-On is loaded.
diff --git a/readme.txt b/readme.txt
index 55cea35..9cca43e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,9 +3,9 @@ Contributors: vlass
Donate link: https://github.com/vlasscontreras/gragrid
Tags: forms, emails, subscribers, sendgrid, gravity forms
Requires at least: 5.2
-Tested up to: 5.7
+Tested up to: 5.7.2
Requires PHP: 7.3
-Stable tag: 2.1.0
+Stable tag: 2.2.0
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
From 1b63acfdcd4f0da462bec4d183aadb0f05d2cecb Mon Sep 17 00:00:00 2001
From: Vlass Contreras <17748144+vlasscontreras@users.noreply.github.com>
Date: Fri, 21 May 2021 15:20:36 -0600
Subject: [PATCH 3/7] =?UTF-8?q?chore:=20=F0=9F=92=A1=20correct=20class=20p?=
=?UTF-8?q?roperty=20type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
class-gragrid.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/class-gragrid.php b/class-gragrid.php
index 1a211c6..9b63bc9 100644
--- a/class-gragrid.php
+++ b/class-gragrid.php
@@ -119,9 +119,9 @@ class Gragrid extends GFFeedAddOn {
* @since 1.0.0
*
* @access protected
- * @var Gragrid_API $api Contains an instance of the SendGrid API library.
+ * @var Gragrid_API|null $api Contains an instance of the SendGrid API library.
*/
- public $api = null;
+ protected $api = null;
/**
* Add-on constructor
From 47069bdeb77d68dca45c2703da9576597f486b52 Mon Sep 17 00:00:00 2001
From: Vlass Contreras <17748144+vlasscontreras@users.noreply.github.com>
Date: Fri, 21 May 2021 15:21:08 -0600
Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=F0=9F=90=9B=20prevent=20method=20ex?=
=?UTF-8?q?ecution=20if=20API=20cannot=20be=20initialized?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
class-gragrid.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/class-gragrid.php b/class-gragrid.php
index 9b63bc9..5666ddf 100644
--- a/class-gragrid.php
+++ b/class-gragrid.php
@@ -469,6 +469,10 @@ public function sengrid_field_map() {
* @return array
*/
public function sengrid_custom_fields_map() {
+ if ( ! $this->init_api() ) {
+ return;
+ }
+
$fields = array();
$custom_fields = (array) rgar( $this->api->get_custom_fields(), 'custom_fields' );
$custom_fields = array_filter( $custom_fields );
From e8000724391850503802c189813067d04fcfab41 Mon Sep 17 00:00:00 2001
From: Vlass Contreras <17748144+vlasscontreras@users.noreply.github.com>
Date: Fri, 21 May 2021 15:50:17 -0600
Subject: [PATCH 5/7] =?UTF-8?q?chore:=20=F0=9F=9A=B8=20add=20failed=20cont?=
=?UTF-8?q?act=20lists=20feedback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
class-gragrid.php | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/class-gragrid.php b/class-gragrid.php
index 5666ddf..d68fa2f 100644
--- a/class-gragrid.php
+++ b/class-gragrid.php
@@ -307,21 +307,15 @@ public function settings_sendgrid_list( $field, $echo = true ) {
return;
}
- try {
- $this->log_debug( __METHOD__ . '(): Retrieving contact lists.' );
-
- $lists = $this->api->get_lists();
- } catch ( Exception $e ) {
- $this->log_error( __METHOD__ . ': Could not retrieve the contact lists ' . $e->getMessage() );
+ $lists = $this->api->get_lists();
- printf(
- // Translators: 1 line break, 2 error message.
- esc_html__( 'Could not load the contact lists. %1$sError: %2$s', 'gragrid' ),
- '
',
- $e->getMessage()
- ); // phpcs:ignore: XSS ok.
+ if ( is_wp_error( $lists ) ) {
+ $this->log_error( __METHOD__ . ': Could not retrieve the contact lists ' . $lists->get_error_message() );
- return;
+ return sprintf(
+ '
%s