Merge pull request #68 from asdfdotdev/development

v1.8.3
asdfdotdev · Jan 13, 2023 · cb8e0b3 · cb8e0b3
2 parents bc35d36 + 2ba0019
commit cb8e0b3
Show file tree

Hide file tree

Showing 19 changed files with 2,576 additions and 2,368 deletions.
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     services:
       mysql-service:
-        image: mysql:5.7
+        image: mysql:8.0
         env:
           MYSQL_ROOT_PASSWORD: root
         ports:
@@ -29,9 +29,9 @@ jobs:
           --health-retries=3
     strategy:
       matrix:
-        php-versions: [ '7.4' ]
-        wordpress-versions: [ '5.9' ]
-        operating-system: [ ubuntu-20.04 ]
+        php-versions: [ '8.2' ]
+        wordpress-versions: [ '6.1' ]
+        operating-system: [ ubuntu-22.04 ]
     env:
       UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}
       UTMDC_REBRANDLY_API: ${{secrets.UTMDC_REBRANDLY_API}}
@@ -42,8 +42,8 @@ jobs:
         run: sudo /etc/init.d/mysql start
 
       - name: Setup PHP
-        # Commit hash for v2.17.0: https://github.com/shivammathur/setup-php/releases/tag/2.17.0
-        uses: shivammathur/setup-php@7854a0cae7fa7a5f3feac66d27bae2dc42d1067a
+        # Commit hash for v2.23.0: https://github.com/shivammathur/setup-php/releases/tag/2.23.0
+        uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -56,6 +56,7 @@ jobs:
           echo "$GITHUB_EVENT_NAME"
           php --version
           mysql --version
+          lsb_release -a
 
       - name: Checkout utm.codes
         uses: actions/checkout@v2
@@ -64,7 +65,7 @@ jobs:
 
       - name: Install PHPUnit
         run: |
-          composer require phpunit/phpunit:^7 --update-with-dependencies
+          composer require phpunit/phpunit:^9 --update-with-dependencies
 
       - name: Install WordPress
         run: |

diff --git a/.github/workflows/code-styles.yml b/.github/workflows/code-styles.yml
@@ -17,14 +17,14 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        php-versions: [ '7.4' ]
-        wordpress-versions: [ '5.9' ]
-        operating-system: [ ubuntu-20.04 ]
+        php-versions: [ '8.2' ]
+        wordpress-versions: [ '6.1' ]
+        operating-system: [ ubuntu-22.04 ]
 
     steps:
       - name: Setup PHP
-        # Commit hash for v2.17.0: https://github.com/shivammathur/setup-php/releases/tag/2.17.0
-        uses: shivammathur/setup-php@7854a0cae7fa7a5f3feac66d27bae2dc42d1067a
+        # Commit hash for v2.23.0: https://github.com/shivammathur/setup-php/releases/tag/2.23.0
+        uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -48,6 +48,7 @@ jobs:
           echo "$GITHUB_EVENT_NAME"
           php --version
           mysql --version
+          lsb_release -a
           ./vendor/bin/phpcs --version
           ./vendor/bin/phpcs -i
 

diff --git a/.github/workflows/phpunit-tests-7.yml b/.github/workflows/phpunit-tests-7.yml
@@ -29,8 +29,8 @@ jobs:
           --health-retries=3
     strategy:
       matrix:
-        php-versions: [ '7.4', '7.3' ]
-        wordpress-versions: [ '5.9', '5.8', '5.7', '5.6', '5.5' ]
+        php-versions: [ '7.4' ]
+        wordpress-versions: [ '6.0', '5.9', '5.8', '5.7' ]
         operating-system: [ ubuntu-18.04 ]
     env:
       UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}
@@ -42,8 +42,8 @@ jobs:
         run: sudo /etc/init.d/mysql start
 
       - name: Setup PHP
-        # Commit hash for v2.17.0: https://github.com/shivammathur/setup-php/releases/tag/2.17.0
-        uses: shivammathur/setup-php@7854a0cae7fa7a5f3feac66d27bae2dc42d1067a
+        # Commit hash for v2.23.0: https://github.com/shivammathur/setup-php/releases/tag/2.23.0
+        uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -56,6 +56,7 @@ jobs:
           echo "$GITHUB_EVENT_NAME"
           php --version
           mysql --version
+          lsb_release -a
 
       - name: Checkout utm.codes
         uses: actions/checkout@v2

diff --git a/.github/workflows/phpunit-tests-8.yml b/.github/workflows/phpunit-tests-8.yml
@@ -29,8 +29,8 @@ jobs:
           --health-retries=3
     strategy:
       matrix:
-        php-versions: [ '8.1', '8.0' ]
-        wordpress-versions: [ '5.9' ]
+        php-versions: [ '8.2', '8.1', '8.0' ]
+        wordpress-versions: [ '6.1', '6.0', '5.9' ]
         operating-system: [ ubuntu-20.04 ]
     env:
       UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}
@@ -42,8 +42,8 @@ jobs:
         run: sudo /etc/init.d/mysql start
 
       - name: Setup PHP
-        # Commit hash for v2.17.0: https://github.com/shivammathur/setup-php/releases/tag/2.17.0
-        uses: shivammathur/setup-php@7854a0cae7fa7a5f3feac66d27bae2dc42d1067a
+        # Commit hash for v2.23.0: https://github.com/shivammathur/setup-php/releases/tag/2.23.0
+        uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -56,6 +56,7 @@ jobs:
           echo "$GITHUB_EVENT_NAME"
           php --version
           mysql --version
+          lsb_release -a
 
       - name: Checkout utm.codes
         uses: actions/checkout@v2

diff --git a/.github/workflows/phpunit-tests-legacy-56.yml b/.github/workflows/phpunit-tests-legacy-56.yml
@@ -42,8 +42,8 @@ jobs:
         run: sudo /etc/init.d/mysql start
 
       - name: Setup PHP
-        # Commit hash for v2.17.0: https://github.com/shivammathur/setup-php/releases/tag/2.17.0
-        uses: shivammathur/setup-php@7854a0cae7fa7a5f3feac66d27bae2dc42d1067a
+        # Commit hash for v2.23.0: https://github.com/shivammathur/setup-php/releases/tag/2.23.0
+        uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -56,6 +56,7 @@ jobs:
           echo "$GITHUB_EVENT_NAME"
           php --version
           mysql --version
+          lsb_release -a
 
       - name: Checkout utm.codes
         uses: actions/checkout@v2

diff --git a/.github/workflows/phpunit-tests-legacy-7.yml b/.github/workflows/phpunit-tests-legacy-7.yml
@@ -29,7 +29,7 @@ jobs:
           --health-retries=3
     strategy:
       matrix:
-        php-versions: [ '7.2', '7.1', '7.0' ]
+        php-versions: [ '7.3', '7.2', '7.1', '7.0' ]
         wordpress-versions: [ '5.4', '5.3', '5.2', '5.1', '5.0' ]
         operating-system: [ ubuntu-18.04 ]
     env:
@@ -42,8 +42,8 @@ jobs:
         run: sudo /etc/init.d/mysql start
 
       - name: Setup PHP
-        # Commit hash for v2.17.0: https://github.com/shivammathur/setup-php/releases/tag/2.17.0
-        uses: shivammathur/setup-php@7854a0cae7fa7a5f3feac66d27bae2dc42d1067a
+        # Commit hash for v2.23.0: https://github.com/shivammathur/setup-php/releases/tag/2.23.0
+        uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, mysqli
@@ -57,6 +57,7 @@ jobs:
           echo "WordPress $WORDPRESS_VERSION"
           php --version
           mysql --version
+          lsb_release -a
 
       - name: Checkout utm.codes
         uses: actions/checkout@v2

diff --git a/.github/workflows/phpunit-tests-nightly-7.yml b/.github/workflows/phpunit-tests-nightly-7.yml
@@ -29,9 +29,9 @@ jobs:
           --health-retries=3
     strategy:
       matrix:
-        php-versions: [ '7.4', '7.3' ]
+        php-versions: [ '7.4' ]
         wordpress-versions: [ 'nightly' ]
-        operating-system: [ ubuntu-18.04 ]
+        operating-system: [ ubuntu-20.04 ]
     env:
       UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}
       UTMDC_REBRANDLY_API: ${{secrets.UTMDC_REBRANDLY_API}}
@@ -42,8 +42,8 @@ jobs:
         run: sudo /etc/init.d/mysql start
 
       - name: Setup PHP
-        # Commit hash for v2.17.0: https://github.com/shivammathur/setup-php/releases/tag/2.17.0
-        uses: shivammathur/setup-php@7854a0cae7fa7a5f3feac66d27bae2dc42d1067a
+        # Commit hash for v2.23.0: https://github.com/shivammathur/setup-php/releases/tag/2.23.0
+        uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -56,6 +56,7 @@ jobs:
           echo "$GITHUB_EVENT_NAME"
           php --version
           mysql --version
+          lsb_release -a
 
       - name: Checkout utm.codes
         uses: actions/checkout@v2

diff --git a/.github/workflows/phpunit-tests-nightly-8.yml b/.github/workflows/phpunit-tests-nightly-8.yml
@@ -29,9 +29,9 @@ jobs:
           --health-retries=3
     strategy:
       matrix:
-        php-versions: [ '8.1' ]
+        php-versions: [ '8.2', '8.1', '8.0' ]
         wordpress-versions: [ 'nightly' ]
-        operating-system: [ ubuntu-20.04 ]
+        operating-system: [ ubuntu-22.04 ]
     env:
       UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}}
       UTMDC_REBRANDLY_API: ${{secrets.UTMDC_REBRANDLY_API}}
@@ -42,8 +42,8 @@ jobs:
         run: sudo /etc/init.d/mysql start
 
       - name: Setup PHP
-        # Commit hash for v2.17.0: https://github.com/shivammathur/setup-php/releases/tag/2.17.0
-        uses: shivammathur/setup-php@7854a0cae7fa7a5f3feac66d27bae2dc42d1067a
+        # Commit hash for v2.23.0: https://github.com/shivammathur/setup-php/releases/tag/2.23.0
+        uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -56,6 +56,7 @@ jobs:
           echo "$GITHUB_EVENT_NAME"
           php --version
           mysql --version
+          lsb_release -a
 
       - name: Checkout utm.codes
         uses: actions/checkout@v2

diff --git a/.github/workflows/phpunit-tests-nightly-legacy-56.yml b/.github/workflows/phpunit-tests-nightly-legacy-56.yml
@@ -42,8 +42,8 @@ jobs:
         run: sudo /etc/init.d/mysql start
 
       - name: Setup PHP
-        # Commit hash for v2.17.0: https://github.com/shivammathur/setup-php/releases/tag/2.17.0
-        uses: shivammathur/setup-php@7854a0cae7fa7a5f3feac66d27bae2dc42d1067a
+        # Commit hash for v2.23.0: https://github.com/shivammathur/setup-php/releases/tag/2.23.0
+        uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -56,6 +56,7 @@ jobs:
           echo "$GITHUB_EVENT_NAME"
           php --version
           mysql --version
+          lsb_release -a
 
       - name: Checkout utm.codes
         uses: actions/checkout@v2

diff --git a/.github/workflows/phpunit-tests-nightly-legacy-7.yml b/.github/workflows/phpunit-tests-nightly-legacy-7.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     services:
       mysql-service:
-        image: mysql:5.6
+        image: mysql:5.7
         env:
           MYSQL_ROOT_PASSWORD: root
         ports:
@@ -42,8 +42,8 @@ jobs:
         run: sudo /etc/init.d/mysql start
 
       - name: Setup PHP
-        # Commit hash for v2.17.0: https://github.com/shivammathur/setup-php/releases/tag/2.17.0
-        uses: shivammathur/setup-php@7854a0cae7fa7a5f3feac66d27bae2dc42d1067a
+        # Commit hash for v2.23.0: https://github.com/shivammathur/setup-php/releases/tag/2.23.0
+        uses: shivammathur/setup-php@8e2ac35f639d3e794c1da1f28999385ab6fdf0fc
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring, mysqli
@@ -57,6 +57,7 @@ jobs:
           echo "WordPress $WORDPRESS_VERSION"
           php --version
           mysql --version
+          lsb_release -a
 
       - name: Checkout utm.codes
         uses: actions/checkout@v2

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v14.19.3
+v14.21.2
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 <p align="center" style="padding-bottom:20px"><img src="img/utm-dot-codes-logo.png" width="400"></p><p>&nbsp;</p>
 
-![PHPUnit Tests (8.x)](https://github.com/asdfdotdev/utm.codes/workflows/PHPUnit%20Tests%20(8.x)/badge.svg)
-![PHPUnit Tests (7.x)](https://github.com/asdfdotdev/utm.codes/workflows/PHPUnit%20Tests%20(7.x)/badge.svg)
-![PHPUnit Tests (Legacy 7.x)](https://github.com/asdfdotdev/utm.codes/workflows/PHPUnit%20Tests%20(Legacy%207.x)/badge.svg)
-![PHPUnit Tests (Legacy 5.6)](https://github.com/asdfdotdev/utm.codes/workflows/PHPUnit%20Tests%20(Legacy%205.6)/badge.svg)
+[![PHPUnit Tests (8.x)](https://github.com/asdfdotdev/utm.codes/workflows/PHPUnit%20Tests%20(8.x)/badge.svg)](https://github.com/asdfdotdev/utm.codes/actions)
+[![PHPUnit Tests (7.x)](https://github.com/asdfdotdev/utm.codes/workflows/PHPUnit%20Tests%20(7.x)/badge.svg)](https://github.com/asdfdotdev/utm.codes/actions)
+[![PHPUnit Tests (Legacy 7.x)](https://github.com/asdfdotdev/utm.codes/workflows/PHPUnit%20Tests%20(Legacy%207.x)/badge.svg)](https://github.com/asdfdotdev/utm.codes/actions)
+[![PHPUnit Tests (Legacy 5.6)](https://github.com/asdfdotdev/utm.codes/workflows/PHPUnit%20Tests%20(Legacy%205.6)/badge.svg)](https://github.com/asdfdotdev/utm.codes/actions)
 [![codecov](https://codecov.io/gh/asdfdotdev/utm.codes/branch/main/graph/badge.svg)](https://codecov.io/gh/asdfdotdev/utm.codes)
 
 Welcome to the developer repository for utm.codes, a WordPress plugin that makes creating analytics friendly marketing links quick and easy.
@@ -14,12 +14,13 @@ To download just the plugin (without the developer extras in this repo) check ou
 
 ### Compatibility
 
-[![WordPress Compatibility](https://img.shields.io/badge/WordPress-4.7_to_5.9-blue.svg?logo=wordpress)](https://wordpress.org/) [![PHP Compatibility](https://img.shields.io/badge/PHP-5.6_to_8.1-%238892BF.svg?logo=php)](https://php.net/)
+[![WordPress Compatibility](https://img.shields.io/badge/WordPress-4.7_to_6.1-blue.svg?logo=wordpress)](https://wordpress.org/)
+[![PHP Compatibility](https://img.shields.io/badge/PHP-5.6_to_8.2-%238892BF.svg?logo=php)](https://php.net/)
 
 utm.codes is developed for, and tested with, a variety of recent platform versions, including:
 
-- WordPress 4.7, 4.8, 4.9, 5.0, 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9 and 6.0
-- PHP 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, and 8.1
+- WordPress 4.7, 4.8, 4.9, 5.0, 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 6.0, and 6.1
+- PHP 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, and 8.2
 
 ## Branches
 

diff --git a/README.txt b/README.txt
@@ -3,9 +3,9 @@ Contributors: chrislarrycarl
 Donate link: https://utm.codes/pricing/
 Tags: analytics, utm codes, analytics, google analytics, campaign marketing, link generator
 Requires at least: 4.7.0
-Tested up to: 6.0
+Tested up to: 6.1
 Requires PHP: 5.6.0
-Stable tag: 1.8.1
+Stable tag: 1.8.3
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -34,7 +34,7 @@ For more information, videos, and helpful tips [visit the utm.codes website](htt
 - Supports adding additional custom parameters to links for improved versatility
 - Multi-user access within WordPress to share creation and management responsibilities
 - See your current link count in the admin dashboard "At a Glance"
-- Works with PHP 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, and 8.1
+- Works with PHP 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, and 8.2
 - 100% Free and Open Source
 
 = Installation =
@@ -97,7 +97,13 @@ That isn't a question. But thank you.
 
 == Changelog ==
 
-= 1.8.1 =
+= 1.8.3 =
+
+- Supports WordPress v6.1
+- Supports PHP 8.2
+- Update dependencies
+
+= 1.8.2 =
 
 - Supports WordPress v6.0
 - Update dependencies

diff --git a/composer.json b/composer.json
@@ -1,14 +1,14 @@
 {
     "name": "asdfdotdev/utm.codes",
-    "version": "1.8.2",
+    "version": "1.8.3",
     "description": "A plugin that makes building analytics friendly links quick and easy.",
     "type": "wordpress-plugin",
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.5",
         "wp-coding-standards/wpcs": "2.3",
         "phpcompatibility/php-compatibility": "^9.3",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^9.5",
         "yoast/phpunit-polyfills": "^1.0"
     },
     "license": "GPL-2.0-only",