Merge pull request #51 from asdfdotdev/development

Update for v5.7 and Fix Rebrandly API

Author: chrislarrycarl

.github/workflows/code-coverage.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         php-versions: [ '7.4' ]
-        wordpress-versions: [ '5.6' ]
+        wordpress-versions: [ '5.7' ]
         operating-system: [ ubuntu-20.04 ]
     env:
       UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}

.github/workflows/code-styles.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         php-versions: [ '7.4' ]
-        wordpress-versions: [ '5.6' ]
+        wordpress-versions: [ '5.7' ]
         operating-system: [ ubuntu-20.04 ]
 
     steps:

.github/workflows/phpunit-tests-7.yml

@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         php-versions: [ '7.4', '7.3' ]
-        wordpress-versions: [ 'nightly', '5.6', '5.5', '5.4' ]
+        wordpress-versions: [ 'nightly', '5.7', '5.6', '5.5', '5.4' ]
         operating-system: [ ubuntu-18.04 ]
     env:
       UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}

README.txt

@@ -5,7 +5,7 @@ Tags: analytics, utm codes, analytics, google analytics, campaign marketing, lin
 Requires at least: 4.7.0
 Tested up to: 5.7
 Requires PHP: 5.6.0
-Stable tag: 1.7.4
+Stable tag: 1.7.5
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -97,6 +97,12 @@ That isn't a question. But thank you.
 
 == Changelog ==
 
+= 1.7.5 =
+
+- Supports WordPress v5.7
+- Adds important fix for rebrandly custom domain API response sanitation
+- Update dependencies
+
 = 1.7.4 =
 
 - Supports WordPress v5.6

classes/shorten/class-bitly.php

@@ -91,7 +91,7 @@ public function shorten( $data, $query_string ) {
 					}
 
 					if ( filter_var( $response_url, FILTER_VALIDATE_URL ) ) {
-						$this->response = esc_url( wp_unslash( $body->link ) );
+						$this->response = esc_url( wp_unslash( $response_url ) );
 					}
 				} elseif ( 403 === $response_code ) {
 					$this->error_code = 4030;

classes/shorten/class-rebrandly.php

@@ -169,8 +169,8 @@ function( $domain ) {
 
 						if ( $is_active && $dns_verified ) {
 							return array(
-								'id'        => $domain->id,
-								'full_name' => $domain->fullName,
+								'id'        => sanitize_text_field( wp_unslash( $domain->id ) ),
+								'full_name' => sanitize_text_field( wp_unslash( $domain->fullName ) ),
 							);
 						}
 					},

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "asdfdotdev/utm.codes",
-    "version": "1.7.4",
+    "version": "1.7.5",
     "description": "A plugin that makes building analytics friendly links quick and easy.",
     "type": "wordpress-plugin",
     "require-dev": {

languages/utm-dot-codes.pot

@@ -1,15 +1,15 @@
-# Copyright (C) 2020 Chris Carlevato
+# Copyright (C) 2021 Chris Carlevato
 # This file is distributed under the same license as the utm.codes plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: utm.codes 1.7.4\n"
+"Project-Id-Version: utm.codes 1.7.5\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/_utm-dot-codes\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2020-12-24T20:55:18+00:00\n"
+"POT-Creation-Date: 2021-04-02T22:42:17+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.4.0\n"
 "X-Domain: utm-dot-codes\n"