From 230aa320677b3063343a39b783eba4de7ffb2f55 Mon Sep 17 00:00:00 2001 From: Chris Carlevato Date: Sat, 8 Jun 2024 11:00:58 -0400 Subject: [PATCH 1/7] Change test filenames, update phpunit config. --- _test/phpunit.xml | 2 +- .../{test-activation.php => TestUtmDotCodesActivation.php} | 0 _test/tests/{test-ajax.php => TestUtmDotCodesAjax.php} | 0 .../{test-integration.php => TestUtmDotCodesIntegration.php} | 0 .../{test-permissions.php => TestUtmDotCodesPermissions.php} | 0 .../{test-shorten-bitly.php => TestUtmDotCodesShortenBitly.php} | 0 ...horten-rebrandly.php => TestUtmDotCodesShortenRebrandly.php} | 0 _test/tests/{test-unit.php => TestUtmDotCodesUnit.php} | 0 _test/tests/bootstrap.php | 2 +- 9 files changed, 2 insertions(+), 2 deletions(-) rename _test/tests/{test-activation.php => TestUtmDotCodesActivation.php} (100%) rename _test/tests/{test-ajax.php => TestUtmDotCodesAjax.php} (100%) rename _test/tests/{test-integration.php => TestUtmDotCodesIntegration.php} (100%) rename _test/tests/{test-permissions.php => TestUtmDotCodesPermissions.php} (100%) rename _test/tests/{test-shorten-bitly.php => TestUtmDotCodesShortenBitly.php} (100%) rename _test/tests/{test-shorten-rebrandly.php => TestUtmDotCodesShortenRebrandly.php} (100%) rename _test/tests/{test-unit.php => TestUtmDotCodesUnit.php} (100%) diff --git a/_test/phpunit.xml b/_test/phpunit.xml index 3e1629c..011a81d 100644 --- a/_test/phpunit.xml +++ b/_test/phpunit.xml @@ -8,7 +8,7 @@ > - ./tests/ + ./tests/ diff --git a/_test/tests/test-activation.php b/_test/tests/TestUtmDotCodesActivation.php similarity index 100% rename from _test/tests/test-activation.php rename to _test/tests/TestUtmDotCodesActivation.php diff --git a/_test/tests/test-ajax.php b/_test/tests/TestUtmDotCodesAjax.php similarity index 100% rename from _test/tests/test-ajax.php rename to _test/tests/TestUtmDotCodesAjax.php diff --git a/_test/tests/test-integration.php b/_test/tests/TestUtmDotCodesIntegration.php similarity index 100% rename from _test/tests/test-integration.php rename to _test/tests/TestUtmDotCodesIntegration.php diff --git a/_test/tests/test-permissions.php b/_test/tests/TestUtmDotCodesPermissions.php similarity index 100% rename from _test/tests/test-permissions.php rename to _test/tests/TestUtmDotCodesPermissions.php diff --git a/_test/tests/test-shorten-bitly.php b/_test/tests/TestUtmDotCodesShortenBitly.php similarity index 100% rename from _test/tests/test-shorten-bitly.php rename to _test/tests/TestUtmDotCodesShortenBitly.php diff --git a/_test/tests/test-shorten-rebrandly.php b/_test/tests/TestUtmDotCodesShortenRebrandly.php similarity index 100% rename from _test/tests/test-shorten-rebrandly.php rename to _test/tests/TestUtmDotCodesShortenRebrandly.php diff --git a/_test/tests/test-unit.php b/_test/tests/TestUtmDotCodesUnit.php similarity index 100% rename from _test/tests/test-unit.php rename to _test/tests/TestUtmDotCodesUnit.php diff --git a/_test/tests/bootstrap.php b/_test/tests/bootstrap.php index bcd163b..c5d8470 100644 --- a/_test/tests/bootstrap.php +++ b/_test/tests/bootstrap.php @@ -37,7 +37,7 @@ * Manually load the utm.codes plugin for testing */ function _manually_load_utm_dot_codes() { - require_once '../utm-dot-codes.php'; + require_once getenv( 'UTMDC_PLUGIN_DIR' ) . '/utm-dot-codes.php'; update_option( 'active_plugins', 'utm-dot-codes/utm-dot-codes.php' ); } tests_add_filter( 'muplugins_loaded', '_manually_load_utm_dot_codes' ); From 5940a70df26a35ca9aafe1290be8cbb82d830b95 Mon Sep 17 00:00:00 2001 From: Chris Carlevato Date: Sat, 8 Jun 2024 11:01:29 -0400 Subject: [PATCH 2/7] Update composer dependencies --- composer.json | 4 +- composer.lock | 241 +++++++++++++++++++++++++++++--------------------- 2 files changed, 140 insertions(+), 105 deletions(-) diff --git a/composer.json b/composer.json index 81cf700..fedc7c6 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,11 @@ "description": "A plugin that makes building analytics friendly links quick and easy.", "type": "wordpress-plugin", "require-dev": { - "squizlabs/php_codesniffer": "^3.7", + "squizlabs/php_codesniffer": "^3.10", "wp-coding-standards/wpcs": "2.3", "phpcompatibility/php-compatibility": "^9.3", "dealerdirect/phpcodesniffer-composer-installer": "^1.0", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "yoast/phpunit-polyfills": "^2.0" }, "license": "GPL-2.0-only", diff --git a/composer.lock b/composer.lock index eb67f4c..5a5a42c 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": "c0246548738db9b99fa121e4cbeae8ac", + "content-hash": "bcb74d24c8fe62d754c5168264b39fae", "packages": [], "packages-dev": [ { @@ -216,25 +216,27 @@ }, { "name": "nikic/php-parser", - "version": "v4.16.0", + "version": "v5.0.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17" + "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17", - "reference": "19526a33fb561ef417e822e85f08a00db4059c17", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/139676794dc1e9231bf7bcd123cfc0c99182cb13", + "reference": "139676794dc1e9231bf7bcd123cfc0c99182cb13", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -242,7 +244,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -266,26 +268,27 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.2" }, - "time": "2023-06-25T14:52:30+00:00" + "time": "2024-03-05T20:51:40+00:00" }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -326,9 +329,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -445,23 +454,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.26", + "version": "9.2.31", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -510,7 +519,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.26" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31" }, "funding": [ { @@ -518,7 +528,7 @@ "type": "github" } ], - "time": "2023-03-06T12:58:08+00:00" + "time": "2024-03-02T06:37:42+00:00" }, { "name": "phpunit/php-file-iterator", @@ -763,16 +773,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.9", + "version": "9.6.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778" + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a9aceaf20a682aeacf28d582654a1670d8826778", - "reference": "a9aceaf20a682aeacf28d582654a1670d8826778", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", "shasum": "" }, "require": { @@ -787,7 +797,7 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", + "phpunit/php-code-coverage": "^9.2.28", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -846,7 +856,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.9" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19" }, "funding": [ { @@ -862,20 +872,20 @@ "type": "tidelift" } ], - "time": "2023-06-11T06:13:56+00:00" + "time": "2024-04-05T04:35:58+00:00" }, { "name": "sebastian/cli-parser", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", "shasum": "" }, "require": { @@ -910,7 +920,7 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" }, "funding": [ { @@ -918,7 +928,7 @@ "type": "github" } ], - "time": "2020-09-28T06:08:49+00:00" + "time": "2024-03-02T06:27:43+00:00" }, { "name": "sebastian/code-unit", @@ -1107,20 +1117,20 @@ }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -1152,7 +1162,7 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -1160,20 +1170,20 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/diff", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", "shasum": "" }, "require": { @@ -1218,7 +1228,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" }, "funding": [ { @@ -1226,7 +1236,7 @@ "type": "github" } ], - "time": "2023-05-07T05:35:17+00:00" + "time": "2024-03-02T06:30:58+00:00" }, { "name": "sebastian/environment", @@ -1293,16 +1303,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", "shasum": "" }, "require": { @@ -1358,7 +1368,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" }, "funding": [ { @@ -1366,20 +1376,20 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2024-03-02T06:33:00+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", "shasum": "" }, "require": { @@ -1422,7 +1432,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" }, "funding": [ { @@ -1430,24 +1440,24 @@ "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2024-03-02T06:35:11+00:00" }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -1479,7 +1489,7 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -1487,7 +1497,7 @@ "type": "github" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", @@ -1666,16 +1676,16 @@ }, { "name": "sebastian/resource-operations", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", "shasum": "" }, "require": { @@ -1687,7 +1697,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -1708,8 +1718,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" }, "funding": [ { @@ -1717,7 +1726,7 @@ "type": "github" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2024-03-14T16:00:52+00:00" }, { "name": "sebastian/type", @@ -1830,16 +1839,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.2", + "version": "3.10.1", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877", + "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877", "shasum": "" }, "require": { @@ -1849,11 +1858,11 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", "extra": { @@ -1868,35 +1877,58 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", "standards", "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2023-02-22T23:07:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-05-22T21:24:41+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -1925,7 +1957,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -1933,7 +1965,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "wp-coding-standards/wpcs", @@ -1988,16 +2020,16 @@ }, { "name": "yoast/phpunit-polyfills", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/Yoast/PHPUnit-Polyfills.git", - "reference": "c758753e8f9dac251fed396a73c8305af3f17922" + "reference": "4a088f125c970d6d6ea52c927f96fe39b330d0f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/c758753e8f9dac251fed396a73c8305af3f17922", - "reference": "c758753e8f9dac251fed396a73c8305af3f17922", + "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/4a088f125c970d6d6ea52c927f96fe39b330d0f1", + "reference": "4a088f125c970d6d6ea52c927f96fe39b330d0f1", "shasum": "" }, "require": { @@ -2005,7 +2037,9 @@ "phpunit/phpunit": "^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0 || ^10.0" }, "require-dev": { - "yoast/yoastcs": "^2.3.0" + "php-parallel-lint/php-console-highlighter": "^1.0.0", + "php-parallel-lint/php-parallel-lint": "^1.4.0", + "yoast/yoastcs": "^3.1.0" }, "type": "library", "extra": { @@ -2042,9 +2076,10 @@ ], "support": { "issues": "https://github.com/Yoast/PHPUnit-Polyfills/issues", + "security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy", "source": "https://github.com/Yoast/PHPUnit-Polyfills" }, - "time": "2023-06-06T20:28:24+00:00" + "time": "2024-04-05T16:36:44+00:00" } ], "aliases": [], @@ -2054,5 +2089,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 6ce434703c4aa4a8e95264c8e0252bbce26d0e9d Mon Sep 17 00:00:00 2001 From: Chris Carlevato Date: Sat, 8 Jun 2024 11:01:57 -0400 Subject: [PATCH 3/7] Update node dependencies --- package-lock.json | 175 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 137 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8c6f411..18719a0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1284,21 +1284,121 @@ } }, "@babel/traverse": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.5.tgz", - "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", + "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", "dev": true, "requires": { - "@babel/code-frame": "^7.22.5", - "@babel/generator": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5", - "debug": "^4.1.0", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9", + "debug": "^4.3.1", "globals": "^11.1.0" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", + "dev": true, + "requires": { + "@babel/highlight": "^7.23.4", + "chalk": "^2.4.2" + } + }, + "@babel/generator": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "dev": true, + "requires": { + "@babel/types": "^7.23.6", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + } + }, + "@babel/helper-environment-visitor": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "dev": true + }, + "@babel/helper-function-name": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "dev": true, + "requires": { + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", + "dev": true, + "requires": { + "@babel/types": "^7.22.5" + } + }, + "@babel/helper-string-parser": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", + "dev": true + }, + "@babel/helper-validator-identifier": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "dev": true + }, + "@babel/highlight": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz", + "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==", + "dev": true + }, + "@babel/template": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz", + "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9" + } + }, + "@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + } } }, "@babel/types": { @@ -2329,20 +2429,20 @@ } }, "browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "dev": true, "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.4", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.6", + "readable-stream": "^3.6.2", + "safe-buffer": "^5.2.1" } }, "browserify-zlib": { @@ -5616,9 +5716,9 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, "optional": true }, @@ -6210,9 +6310,9 @@ "optional": true }, "nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true }, "nanomatch": { @@ -7037,12 +7137,12 @@ "dev": true }, "postcss": { - "version": "8.4.24", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz", - "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==", + "version": "8.4.33", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", + "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", "dev": true, "requires": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } @@ -7892,9 +7992,9 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true }, "type-fest": { @@ -8352,9 +8452,9 @@ } }, "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true }, "sentence-case": { @@ -9596,8 +9696,7 @@ }, "semver": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "resolved": "", "dev": true } } From a802fcded748114086b1afabba16ca2ab2c9c18f Mon Sep 17 00:00:00 2001 From: Chris Carlevato Date: Sat, 8 Jun 2024 11:06:10 -0400 Subject: [PATCH 4/7] Update workflows for new wordpress and php versions --- .github/workflows/phpunit-tests-8.yml | 4 +- .github/workflows/phpunit-tests-legacy-8.yml | 78 ++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/phpunit-tests-legacy-8.yml diff --git a/.github/workflows/phpunit-tests-8.yml b/.github/workflows/phpunit-tests-8.yml index 7f913b6..fbdb1f9 100644 --- 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.2', '8.1', '8.0' ] - wordpress-versions: [ '6.2', '6.1', '6.0' ] + php-versions: [ '8.3', '8.2' ] + wordpress-versions: [ '6.5', '6.4', '6.3' ] operating-system: [ ubuntu-20.04 ] env: UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}} diff --git a/.github/workflows/phpunit-tests-legacy-8.yml b/.github/workflows/phpunit-tests-legacy-8.yml new file mode 100644 index 0000000..087fc2d --- /dev/null +++ b/.github/workflows/phpunit-tests-legacy-8.yml @@ -0,0 +1,78 @@ +name: PHPUnit Tests (8.x) + +on: + push: + branches: + - main + - development + pull_request: + branches: + types: [closed] + schedule: + - cron: '0 0 * * 0' + +jobs: + test-php: + name: WordPress ${{ matrix.wordpress-versions }} - PHP ${{ matrix.php-versions }} on ${{ matrix.operating-system }} + runs-on: ${{ matrix.operating-system }} + services: + mysql-service: + image: mysql:8.0 + env: + MYSQL_ROOT_PASSWORD: root + ports: + - 3306 + options: >- + --health-cmd="mysqladmin ping" + --health-interval=10s + --health-timeout=5s + --health-retries=3 + strategy: + matrix: + php-versions: [ '8.1', '8.0' ] + wordpress-versions: [ '6.2', '6.1', '6.0' ] + operating-system: [ ubuntu-20.04 ] + env: + UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}} + UTMDC_REBRANDLY_API: ${{secrets.UTMDC_REBRANDLY_API}} + UTMDC_PLUGIN_DIR: ${{secrets.UTMDC_PLUGIN_DIR}} + + steps: + - name: Start MySQL + run: sudo /etc/init.d/mysql start + + - name: Setup PHP + # Commit hash for v2.25.4: https://github.com/shivammathur/setup-php/releases/tag/2.25.4 + uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b + with: + php-version: ${{ matrix.php-versions }} + extensions: mbstring + ini-values: post_max_size=256M, max_execution_time=180 + coverage: xdebug + + - name: Log Debug Information + run: | + echo "$GITHUB_REF" + echo "$GITHUB_EVENT_NAME" + php --version + mysql --version + lsb_release -a + + - name: Checkout utm.codes + # Commit hash for v3.5.3: https://github.com/actions/checkout/releases/tag/v3.5.3 + uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + with: + fetch-depth: 0 + + - name: Install PHPUnit + run: | + composer require phpunit/phpunit:^9.5 --update-with-dependencies + + - name: Install WordPress + run: | + bash _test/bin/install-wp-tests.sh wordpress_test root root localhost:3306 ${{ matrix.wordpress-versions }} + + - name: Run PHPUnit Tests + run: | + cd _test + ../vendor/bin/phpunit From 691d23c859c440e876cdffa065b8eb50e2130851 Mon Sep 17 00:00:00 2001 From: Chris Carlevato Date: Sat, 8 Jun 2024 11:25:09 -0400 Subject: [PATCH 5/7] Update font awesome - Increase version to 6.5.2 - Update Twitter (X) logo - Switch to cdnjs --- _test/tests/TestUtmDotCodesIntegration.php | 6 +++--- classes/class-utmdotcodes.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_test/tests/TestUtmDotCodesIntegration.php b/_test/tests/TestUtmDotCodesIntegration.php index ba969a0..037fdfb 100644 --- a/_test/tests/TestUtmDotCodesIntegration.php +++ b/_test/tests/TestUtmDotCodesIntegration.php @@ -1027,7 +1027,7 @@ function test_add_static_resources() { $this->assertTrue( in_array( 'utm-dot-codes', $wp_scripts->queue ) ); $this->assertTrue( array_key_exists( 'font-awesome', $wp_styles->registered ) ); - $this->assertEquals( $wp_styles->registered['font-awesome']->src, 'https://use.fontawesome.com/releases/v5.15.0/css/all.css' ); + $this->assertEquals( $wp_styles->registered['font-awesome']->src, 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css' ); $this->assertTrue( in_array( 'font-awesome', $wp_styles->queue ) ); $this->assertTrue( array_key_exists( 'utm-dot-codes', $wp_styles->registered ) ); @@ -1237,7 +1237,7 @@ function test_social_api_filter_hook() { 'stack-exchange' => array( 'Stack Exchange', 'fab fa-stack-exchange' ), 'stack-overflow' => array( 'Stack Overflow', 'fab fa-stack-overflow' ), 'tumblr' => array( 'Tumblr', 'fab fa-tumblr' ), - 'twitter' => array( 'Twitter', 'fab fa-twitter' ), + 'twitter' => array( 'X (Twitter)', 'fab fa-x-twitter' ), 'vimeo' => array( 'Vimeo', 'fab fa-vimeo-v' ), 'vk' => array( 'VK', 'fab fa-vk'), 'weibo' => array( 'Weibo', 'fab fa-weibo'), @@ -1282,7 +1282,7 @@ function( $networks ) { 'stack-exchange' => array( 'Stack Exchange', 'fab fa-stack-exchange' ), 'stack-overflow' => array( 'Stack Overflow', 'fab fa-stack-overflow' ), 'tumblr' => array( 'Tumblr', 'fab fa-tumblr' ), - 'twitter' => array( 'Twitter', 'fab fa-twitter' ), + 'twitter' => array( 'X (Twitter)', 'fab fa-x-twitter' ), 'vimeo' => array( 'Vimeo', 'fab fa-vimeo-v' ), 'vk' => array( 'VK', 'fab fa-vk'), 'weibo' => array( 'Weibo', 'fab fa-weibo'), diff --git a/classes/class-utmdotcodes.php b/classes/class-utmdotcodes.php index 9e6d696..52dfa69 100644 --- a/classes/class-utmdotcodes.php +++ b/classes/class-utmdotcodes.php @@ -1346,7 +1346,7 @@ public function bulk_actions( $bulk_actions ) { public function add_css() { wp_enqueue_style( 'font-awesome', - 'https://use.fontawesome.com/releases/v5.15.0/css/all.css', + 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css', array(), UTMDC_VERSION, 'all' @@ -1656,7 +1656,7 @@ public function get_social_networks() { 'stack-exchange' => array( 'Stack Exchange', 'fab fa-stack-exchange' ), 'stack-overflow' => array( 'Stack Overflow', 'fab fa-stack-overflow' ), 'tumblr' => array( 'Tumblr', 'fab fa-tumblr' ), - 'twitter' => array( 'Twitter', 'fab fa-twitter' ), + 'twitter' => array( 'X (Twitter)', 'fab fa-x-twitter' ), 'vimeo' => array( 'Vimeo', 'fab fa-vimeo-v' ), 'vk' => array( 'VK', 'fab fa-vk' ), 'weibo' => array( 'Weibo', 'fab fa-weibo' ), From 754974764264101e5036ced014697d1eab2ddb37 Mon Sep 17 00:00:00 2001 From: Chris Carlevato Date: Sat, 8 Jun 2024 11:39:50 -0400 Subject: [PATCH 6/7] Fix PHP/WordPress test pairs --- .github/workflows/phpunit-tests-8.yml | 2 +- .github/workflows/phpunit-tests-legacy-8.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpunit-tests-8.yml b/.github/workflows/phpunit-tests-8.yml index fbdb1f9..2a38581 100644 --- a/.github/workflows/phpunit-tests-8.yml +++ b/.github/workflows/phpunit-tests-8.yml @@ -30,7 +30,7 @@ jobs: strategy: matrix: php-versions: [ '8.3', '8.2' ] - wordpress-versions: [ '6.5', '6.4', '6.3' ] + wordpress-versions: [ '6.5', '6.4' ] operating-system: [ ubuntu-20.04 ] env: UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}} diff --git a/.github/workflows/phpunit-tests-legacy-8.yml b/.github/workflows/phpunit-tests-legacy-8.yml index 087fc2d..fa8c168 100644 --- a/.github/workflows/phpunit-tests-legacy-8.yml +++ b/.github/workflows/phpunit-tests-legacy-8.yml @@ -30,7 +30,7 @@ jobs: strategy: matrix: php-versions: [ '8.1', '8.0' ] - wordpress-versions: [ '6.2', '6.1', '6.0' ] + wordpress-versions: [ '6.3', '6.2', '6.1', '6.0' ] operating-system: [ ubuntu-20.04 ] env: UTMDC_BITLY_API: ${{secrets.UTMDC_BITLY_API}} From 7a31beea3b2c6c845db4546d80b8dfceff4f09fc Mon Sep 17 00:00:00 2001 From: Chris Carlevato Date: Sat, 8 Jun 2024 11:59:13 -0400 Subject: [PATCH 7/7] Update version number and READMEs --- README.md | 4 ++-- README.txt | 13 ++++++++----- composer.json | 2 +- languages/utm-dot-codes.pot | 15 ++++++++++----- package-lock.json | 2 +- package.json | 2 +- utm-dot-codes.php | 6 +++--- 7 files changed, 26 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 538b33d..6e62853 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,8 @@ To download just the plugin (without the developer extras in this repo) check ou utm.codes is developed for, and tested with, platform versions covering [the vast majority of WordPress users](https://wordpress.org/about/stats/), including: -- WordPress 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 6.0, 6.1, 6.2, 6.3, and 6.4 -- PHP 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, and 8.2 +- WordPress 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 6.0, 6.1, 6.2, 6.3, 6.4, and 6.5 +- PHP 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, and 8.3 ## Branches diff --git a/README.txt b/README.txt index 23c94eb..f022d6b 100644 --- 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: 5.1.0 -Tested up to: 6.4 +Tested up to: 6.5 Requires PHP: 7.1.0 -Stable tag: 1.8.4 +Stable tag: 1.8.5 License: GPLv2 License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -34,8 +34,8 @@ 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" -- Tested with WordPress 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 6.0, 6.1, and 6.2 -- Tested with PHP 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, and 8.2 +- Tested with WordPress 5.1, 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 5.9, 6.0, 6.1, 6.2, 6.3, 6.4, 6.5 +- Tested with PHP 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3 - Tested with MySQL 5.6, 5.7, 8.0 - 100% Free and Open Source @@ -99,12 +99,15 @@ That isn't a question. But thank you. == Changelog == += 1.8.5 = +- Supports WordPress v6.3, v6.4, v6.5 +- Update dependencies + = 1.8.4 = - Supports WordPress v6.2 - Update dependencies - Update minimum requirements - = 1.8.3 = - Supports WordPress v6.1 diff --git a/composer.json b/composer.json index fedc7c6..9ddf7e9 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "asdfdotdev/utm.codes", - "version": "1.8.4", + "version": "1.8.5", "description": "A plugin that makes building analytics friendly links quick and easy.", "type": "wordpress-plugin", "require-dev": { diff --git a/languages/utm-dot-codes.pot b/languages/utm-dot-codes.pot index fdaac30..f7df3f1 100644 --- a/languages/utm-dot-codes.pot +++ b/languages/utm-dot-codes.pot @@ -1,37 +1,42 @@ -# Copyright (C) 2023 Chris Carlevato +# Copyright (C) 2024 Chris Carlevato # This file is distributed under the GPL v2. msgid "" msgstr "" -"Project-Id-Version: utm.codes 1.8.4\n" -"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/_utm-dot-codes\n" +"Project-Id-Version: utm.codes 1.8.5\n" +"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/utm.codes\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2023-07-02T16:24:52+00:00\n" +"POT-Creation-Date: 2024-06-08T15:30:08+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"X-Generator: WP-CLI 2.8.1\n" +"X-Generator: WP-CLI 2.10.0\n" "X-Domain: utm-dot-codes\n" #. Plugin Name of the plugin +#: utm-dot-codes.php #: classes/class-utmdotcodes.php:355 msgid "utm.codes" msgstr "" #. Plugin URI of the plugin +#: utm-dot-codes.php msgid "https://utm.codes" msgstr "" #. Description of the plugin +#: utm-dot-codes.php msgid "A plugin that makes building analytics friendly links quick and easy." msgstr "" #. Author of the plugin +#: utm-dot-codes.php msgid "Chris Carlevato" msgstr "" #. Author URI of the plugin +#: utm-dot-codes.php msgid "https://asdf.dev" msgstr "" diff --git a/package-lock.json b/package-lock.json index 18719a0..b8b5804 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "utm-dot-codes", - "version": "1.8.4", + "version": "1.8.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a7d4d4e..b01c520 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "utm-dot-codes", - "version": "1.8.4", + "version": "1.8.5", "description": "A plugin that makes building analytics friendly links quick and easy.", "main": "index.js", "scripts": { diff --git a/utm-dot-codes.php b/utm-dot-codes.php index dc027d7..a997cd5 100644 --- a/utm-dot-codes.php +++ b/utm-dot-codes.php @@ -3,7 +3,7 @@ * Utm.codes - A plugin that makes building analytics friendly links quick and easy. * * @package UtmDotCodes - * @copyright 2018-2023 Chris Carlevato (https://asdf.dev) + * @copyright 2018-2024 Chris Carlevato (https://asdf.dev) * @license http://www.gnu.org/licenses/gpl-2.0.html * @link https://utm.codes * @@ -11,7 +11,7 @@ * Plugin Name: utm.codes * Plugin URI: https://utm.codes * Description: A plugin that makes building analytics friendly links quick and easy. - * Version: 1.8.4 + * Version: 1.8.5 * Author: Chris Carlevato * Author URI: https://asdf.dev * License: GPL v2 @@ -26,7 +26,7 @@ die( '-1' ); } -define( 'UTMDC_VERSION', '1.8.4' ); +define( 'UTMDC_VERSION', '1.8.5' ); define( 'UTMDC_MINIMUM_WP_VERSION', '4.7' ); define( 'UTMDC_MINIMUM_PHP_VERSION', '5.6' ); define( 'UTMDC_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );