From bd79dd70caf07f7dd34e92e5c698f0a3b41ff237 Mon Sep 17 00:00:00 2001 From: Eddie Date: Thu, 17 Oct 2024 16:05:35 +0100 Subject: [PATCH 1/8] Added zendesk logic and snippet --- .../help-hub/support-hub-docsbot.php | 2 +- src/resources/js/admin/help-page.js | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/admin-views/help-hub/support-hub-docsbot.php b/src/admin-views/help-hub/support-hub-docsbot.php index 5e285bb02..2ab813d29 100644 --- a/src/admin-views/help-hub/support-hub-docsbot.php +++ b/src/admin-views/help-hub/support-hub-docsbot.php @@ -12,6 +12,6 @@ ?>
- + diff --git a/src/resources/js/admin/help-page.js b/src/resources/js/admin/help-page.js index 1328b0305..a672e6f8d 100644 --- a/src/resources/js/admin/help-page.js +++ b/src/resources/js/admin/help-page.js @@ -22,7 +22,9 @@ tribe.helpPage = tribe.helpPage || {}; * Initializes chat widgets if on correct page. */ obj.setupChat = function () { - + if ( ! zE ) { + return; + } $( obj.selectors.openSupportChat ).on( 'click', @@ -32,6 +34,17 @@ tribe.helpPage = tribe.helpPage || {}; } ); + // When we close the chat, let's hide it completely until they click "support" link. + zE( + "messenger:on", + "close", + function () { + zE( 'messenger', 'hide' ); + } + ); + + // On page load always close widget (it will be opened later). + zE( 'messenger', 'hide' ); // Initialize DocsBot. DocsBotAI.init( @@ -50,7 +63,8 @@ tribe.helpPage = tribe.helpPage || {}; * Open the support chat. */ obj.openSupportChat = function () { - + zE( 'messenger', 'show' ); + zE( 'messenger', 'open' ); } /** From b9301d73ffd9d1027187286f86592618cf769394 Mon Sep 17 00:00:00 2001 From: Eddie Date: Thu, 17 Oct 2024 19:00:36 +0100 Subject: [PATCH 2/8] Notice html rendering via new lib. --- src/Tribe/Admin/Help_Page.php | 30 +++++++++------------ src/Tribe/Admin/Notice/Service_Provider.php | 5 ++++ 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/Tribe/Admin/Help_Page.php b/src/Tribe/Admin/Help_Page.php index 5032c7a94..b86bf81dc 100644 --- a/src/Tribe/Admin/Help_Page.php +++ b/src/Tribe/Admin/Help_Page.php @@ -7,6 +7,8 @@ */ use TEC\Common\Configuration\Configuration; +use TEC\Common\StellarWP\AdminNotices\AdminNotice; +use TEC\Common\StellarWP\AdminNotices\AdminNotices; use TEC\Common\Telemetry\Telemetry; if ( ! defined( 'ABSPATH' ) ) { @@ -58,9 +60,6 @@ public static function instance() { * @since TBD */ public function do_help_tab() { - $main = Tribe__Main::instance(); - $template = new \Tribe__Template(); - // Setup our admin notice. $notice_slug = 'tec-common-help-chatbot-notice'; $notice_content = sprintf( @@ -75,19 +74,16 @@ public function do_help_tab() { ); // Our notices. - tribe_transient_notice( - $notice_slug, - "

$notice_content

", - [ - 'type' => 'info', - 'dismiss' => true, - 'priority' => 1, - 'inline' => true, - ], - YEAR_IN_SECONDS - ); - - $notice = Tribe__Admin__Notices::instance()->render( $notice_slug ); + $notice_admin = ( new AdminNotice( $notice_slug, "

$notice_content

" ) ) + ->urgency( 'info' ) + ->inline() + ->dismissible() + ->withWrapper(); + $notice_html = AdminNotices::render( $notice_admin, false ); + + // Our template vars. + $main = Tribe__Main::instance(); + $template = new \Tribe__Template(); $common_telemetry = tribe( Telemetry::class ); $is_opted_in = $common_telemetry->calculate_optin_status(); $is_license_valid = Tribe__PUE__Checker::is_any_license_valid(); @@ -97,7 +93,7 @@ public function do_help_tab() { $template->set_values( [ 'main' => $main, - 'notice' => $notice, + 'notice' => $notice_html, 'is_opted_in' => $is_opted_in, 'is_license_valid' => $is_license_valid, 'zendesk_chat_key' => $zendesk_chat_key, diff --git a/src/Tribe/Admin/Notice/Service_Provider.php b/src/Tribe/Admin/Notice/Service_Provider.php index 8bdc0d250..54a7721e8 100644 --- a/src/Tribe/Admin/Notice/Service_Provider.php +++ b/src/Tribe/Admin/Notice/Service_Provider.php @@ -10,6 +10,7 @@ namespace Tribe\Admin\Notice; use TEC\Common\Contracts\Service_Provider as Provider_Contract; +use TEC\Common\StellarWP\AdminNotices\AdminNotices; /** * Class Notice @@ -31,6 +32,10 @@ public function register() { tribe_singleton( WP_Version::class, WP_Version::class, [ 'hook' ] ); tribe_singleton( 'admin.notice.php.version', \Tribe__Admin__Notice__Php_Version::class, [ 'hook' ] ); tribe_singleton( Marketing\Stellar_Sale::class, Marketing\Stellar_Sale::class, [ 'hook' ] ); + AdminNotices::initialize( + 'tec_common', + plugin_dir_url( \Tribe__Main::instance()->plugin_path ) . 'common/vendor/vendor-prefixed/stellarwp/admin-notices' + ); $this->hooks(); } From 6b459e3d3934086afd8a1fe9ba934ae030f629ce Mon Sep 17 00:00:00 2001 From: Eddie Date: Thu, 17 Oct 2024 19:17:54 +0100 Subject: [PATCH 3/8] Bump and install admin notices package. --- composer.json | 10 +- composer.lock | 322 +++++++++++++++++++++++--------------------------- 2 files changed, 157 insertions(+), 175 deletions(-) diff --git a/composer.json b/composer.json index 0a447cebe..e37d607c8 100644 --- a/composer.json +++ b/composer.json @@ -24,14 +24,15 @@ "firebase/php-jwt": "~6.3.0", "lucatume/di52": "^3.3.7", "monolog/monolog": "1.24.*", - "psr/container": "^1.0.0", + "psr/container": "1.1.1", "stellarwp/container-contract": "^1.0.4", "stellarwp/db": "^1.0.3", "stellarwp/installer": "^1.1.0", "stellarwp/models": "dev-main", "stellarwp/schema": "^1.1.3", "stellarwp/telemetry": "^2.3.1", - "stellarwp/assets": "^1.2.6" + "stellarwp/assets": "^1.2.6", + "stellarwp/admin-notices": "^1.1" }, "require-dev": { "automattic/vipwpcs": "^3.0", @@ -43,7 +44,7 @@ "lucatume/function-mocker-le": "^1.0", "lucatume/wp-browser": "^3.0.14", "stellarwp/coding-standards": "dev-main", - "the-events-calendar/tec-testing-facilities": "dev-mocker", + "the-events-calendar/tec-testing-facilities": "dev-master", "wp-cli/checksum-command": "1.0.5", "wp-coding-standards/wpcs": "^3.0.0", "automattic/jetpack-changelogger": "^4.2" @@ -91,7 +92,8 @@ "monolog/monolog", "firebase/php-jwt", "psr/container", - "stellarwp/assets" + "stellarwp/assets", + "stellarwp/admin-notices" ], "exclude_from_prefix": { "file_patterns": [] diff --git a/composer.lock b/composer.lock index 155cb5efb..398ca3db2 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": "be6d00322c83caee63872c2b0f55033d", + "content-hash": "5d508c9305a35df512e6fea911de6b77", "packages": [ { "name": "firebase/php-jwt", @@ -197,20 +197,20 @@ }, { "name": "psr/container", - "version": "1.1.2", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", "shasum": "" }, "require": { - "php": ">=7.4.0" + "php": ">=7.2.0" }, "type": "library", "autoload": { @@ -239,9 +239,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "source": "https://github.com/php-fig/container/tree/1.1.1" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-03-05T17:36:06+00:00" }, { "name": "psr/log", @@ -293,18 +293,71 @@ }, "time": "2021-05-03T11:20:27+00:00" }, + { + "name": "stellarwp/admin-notices", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/stellarwp/admin-notices.git", + "reference": "e95e6d2268316412e5d8f4b88539e3593129905e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/stellarwp/admin-notices/zipball/e95e6d2268316412e5d8f4b88539e3593129905e", + "reference": "e95e6d2268316412e5d8f4b88539e3593129905e", + "shasum": "" + }, + "require": { + "psr/container": "1.1.1" + }, + "require-dev": { + "codeception/module-asserts": "^1.0", + "codeception/module-cli": "^1.0", + "codeception/module-db": "^1.0", + "codeception/module-filesystem": "^1.0", + "codeception/module-phpbrowser": "^1.0", + "codeception/module-rest": "^1.0", + "codeception/module-webdriver": "^1.0", + "codeception/util-universalframework": "^1.0", + "lucatume/wp-browser": "^3.6.5", + "phpunit/phpunit": "^9.5", + "szepeviktor/phpstan-wordpress": "^1.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "StellarWP\\AdminNotices\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jason Adams", + "email": "jason.adams@stellarwp.com" + } + ], + "description": "A handy package for easily displaying admin notices in WordPress with simple to complex visibility conditions", + "support": { + "issues": "https://github.com/stellarwp/admin-notices/issues", + "source": "https://github.com/stellarwp/admin-notices/tree/1.1.0" + }, + "time": "2024-10-16T19:05:13+00:00" + }, { "name": "stellarwp/assets", - "version": "1.2.9", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/stellarwp/assets.git", - "reference": "1cd83c9799ff1e5c4b7f3c7d301f3b8b8b2d6ee4" + "reference": "dd6e75c8ef04296ae7970ee6a5eb103889a2823e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stellarwp/assets/zipball/1cd83c9799ff1e5c4b7f3c7d301f3b8b8b2d6ee4", - "reference": "1cd83c9799ff1e5c4b7f3c7d301f3b8b8b2d6ee4", + "url": "https://api.github.com/repos/stellarwp/assets/zipball/dd6e75c8ef04296ae7970ee6a5eb103889a2823e", + "reference": "dd6e75c8ef04296ae7970ee6a5eb103889a2823e", "shasum": "" }, "require-dev": { @@ -345,9 +398,9 @@ "description": "A library for managing asset registration and enqueuing in WordPress.", "support": { "issues": "https://github.com/stellarwp/assets/issues", - "source": "https://github.com/stellarwp/assets/tree/1.2.9" + "source": "https://github.com/stellarwp/assets/tree/1.3.1" }, - "time": "2024-08-08T20:46:30+00:00" + "time": "2024-09-28T18:20:48+00:00" }, { "name": "stellarwp/container-contract", @@ -511,12 +564,12 @@ "source": { "type": "git", "url": "https://github.com/stellarwp/models.git", - "reference": "7c21d232c06a6670e5845570945791f2887ead48" + "reference": "ac30397971ac654278ebe2cf703524db81459630" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stellarwp/models/zipball/7c21d232c06a6670e5845570945791f2887ead48", - "reference": "7c21d232c06a6670e5845570945791f2887ead48", + "url": "https://api.github.com/repos/stellarwp/models/zipball/ac30397971ac654278ebe2cf703524db81459630", + "reference": "ac30397971ac654278ebe2cf703524db81459630", "shasum": "" }, "require": { @@ -558,9 +611,9 @@ ], "support": { "issues": "https://github.com/stellarwp/models/issues", - "source": "https://github.com/stellarwp/models/tree/main" + "source": "https://github.com/stellarwp/models/tree/1.2.2" }, - "time": "2024-05-10T21:20:20+00:00" + "time": "2024-09-26T18:03:55+00:00" }, { "name": "stellarwp/schema", @@ -674,20 +727,20 @@ "packages-dev": [ { "name": "antecedent/patchwork", - "version": "2.1.28", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/antecedent/patchwork.git", - "reference": "6b30aff81ebadf0f2feb9268d3e08385cebcc08d" + "reference": "b07d4fb37c3c723c8755122160c089e077d5de65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/antecedent/patchwork/zipball/6b30aff81ebadf0f2feb9268d3e08385cebcc08d", - "reference": "6b30aff81ebadf0f2feb9268d3e08385cebcc08d", + "url": "https://api.github.com/repos/antecedent/patchwork/zipball/b07d4fb37c3c723c8755122160c089e077d5de65", + "reference": "b07d4fb37c3c723c8755122160c089e077d5de65", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=7.1.0" }, "require-dev": { "phpunit/phpunit": ">=4" @@ -716,9 +769,9 @@ ], "support": { "issues": "https://github.com/antecedent/patchwork/issues", - "source": "https://github.com/antecedent/patchwork/tree/2.1.28" + "source": "https://github.com/antecedent/patchwork/tree/2.2.0" }, - "time": "2024-02-06T09:26:11+00:00" + "time": "2024-09-27T16:59:55+00:00" }, { "name": "automattic/jetpack-changelogger", @@ -1278,20 +1331,20 @@ }, { "name": "dg/mysql-dump", - "version": "v1.5.1", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/dg/MySQL-dump.git", - "reference": "e0e287b715b43293773a8b0edf8514f606e01780" + "reference": "b83859026dc3651c6aa39376705fbfa57c0486c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dg/MySQL-dump/zipball/e0e287b715b43293773a8b0edf8514f606e01780", - "reference": "e0e287b715b43293773a8b0edf8514f606e01780", + "url": "https://api.github.com/repos/dg/MySQL-dump/zipball/b83859026dc3651c6aa39376705fbfa57c0486c5", + "reference": "b83859026dc3651c6aa39376705fbfa57c0486c5", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.1" }, "type": "library", "autoload": { @@ -1315,9 +1368,9 @@ "mysql" ], "support": { - "source": "https://github.com/dg/MySQL-dump/tree/master" + "source": "https://github.com/dg/MySQL-dump/tree/v1.6.0" }, - "time": "2019-09-10T21:36:25+00:00" + "time": "2024-09-16T04:30:48+00:00" }, { "name": "doctrine/deprecations", @@ -3258,16 +3311,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.30.0", + "version": "1.33.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f" + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/5ceb0e384997db59f38774bf79c2a6134252c08f", - "reference": "5ceb0e384997db59f38774bf79c2a6134252c08f", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140", + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140", "shasum": "" }, "require": { @@ -3299,9 +3352,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0" }, - "time": "2024-08-29T09:54:52+00:00" + "time": "2024-10-13T11:25:22+00:00" }, { "name": "phpunit/php-code-coverage", @@ -4666,16 +4719,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.2", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", "shasum": "" }, "require": { @@ -4742,7 +4795,7 @@ "type": "open_collective" } ], - "time": "2024-07-21T23:26:44+00:00" + "time": "2024-09-18T10:38:58+00:00" }, { "name": "stellarwp/coding-standards", @@ -4750,12 +4803,12 @@ "source": { "type": "git", "url": "https://github.com/stellarwp/coding-standards.git", - "reference": "fa3c0b7387072d8fde885e386986e66ee2869f4b" + "reference": "bdf05c1ebfef736c75f94bad78df690550f1a241" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stellarwp/coding-standards/zipball/fa3c0b7387072d8fde885e386986e66ee2869f4b", - "reference": "fa3c0b7387072d8fde885e386986e66ee2869f4b", + "url": "https://api.github.com/repos/stellarwp/coding-standards/zipball/bdf05c1ebfef736c75f94bad78df690550f1a241", + "reference": "bdf05c1ebfef736c75f94bad78df690550f1a241", "shasum": "" }, "require": { @@ -4797,7 +4850,7 @@ "support": { "source": "https://github.com/stellarwp/coding-standards/tree/main" }, - "time": "2024-02-04T03:55:54+00:00" + "time": "2024-10-11T17:05:07+00:00" }, { "name": "symfony/browser-kit", @@ -5395,20 +5448,20 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -5454,7 +5507,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -5470,26 +5523,25 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c" + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", - "reference": "a6e83bdeb3c84391d1dfe16f42e40727ce524a5c", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -5538,7 +5590,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" }, "funding": [ { @@ -5554,24 +5606,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -5619,7 +5671,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -5635,24 +5687,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -5699,7 +5751,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -5715,97 +5767,24 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.30.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "10112722600777e02d2745716b70c5db4ca70442" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/10112722600777e02d2745716b70c5db4ca70442", - "reference": "10112722600777e02d2745716b70c5db4ca70442", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.30.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1" + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/ec444d3f3f6505bb28d11afa41e75faadebc10a1", - "reference": "ec444d3f3f6505bb28d11afa41e75faadebc10a1", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -5848,7 +5827,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" }, "funding": [ { @@ -5864,24 +5843,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -5928,7 +5907,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -5944,7 +5923,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", @@ -6337,16 +6316,16 @@ }, { "name": "the-events-calendar/tec-testing-facilities", - "version": "dev-mocker", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/the-events-calendar/tec-testing-facilities.git", - "reference": "f753cde5e0176ffe06de43585c7e7d139ee96119" + "reference": "acc56cfa577c2f0b4926711143cf43722e588cac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/the-events-calendar/tec-testing-facilities/zipball/f753cde5e0176ffe06de43585c7e7d139ee96119", - "reference": "f753cde5e0176ffe06de43585c7e7d139ee96119", + "url": "https://api.github.com/repos/the-events-calendar/tec-testing-facilities/zipball/acc56cfa577c2f0b4926711143cf43722e588cac", + "reference": "acc56cfa577c2f0b4926711143cf43722e588cac", "shasum": "" }, "require": { @@ -6362,6 +6341,7 @@ "wordpress/wordpress": "dev-master", "wp-coding-standards/wpcs": "^2.1" }, + "default-branch": true, "type": "library", "autoload": { "files": [ @@ -6384,9 +6364,9 @@ "description": "Testing facilities, helpers and examples.", "support": { "issues": "https://github.com/the-events-calendar/tec-testing-facilities/issues", - "source": "https://github.com/the-events-calendar/tec-testing-facilities/tree/mocker" + "source": "https://github.com/the-events-calendar/tec-testing-facilities/tree/master" }, - "time": "2024-08-19T19:17:00+00:00" + "time": "2024-08-20T13:23:06+00:00" }, { "name": "theseer/tokenizer", From 1251bdf98465ad59f398e999010a48f11b98d09f Mon Sep 17 00:00:00 2001 From: Eddie Date: Fri, 18 Oct 2024 12:19:33 +0100 Subject: [PATCH 4/8] Bump composer with latest admin notices. --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 398ca3db2..3cba0463b 100644 --- a/composer.lock +++ b/composer.lock @@ -295,16 +295,16 @@ }, { "name": "stellarwp/admin-notices", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/stellarwp/admin-notices.git", - "reference": "e95e6d2268316412e5d8f4b88539e3593129905e" + "reference": "63a51add8ebd81c4b83b8b2fb520ce5f79ce24e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stellarwp/admin-notices/zipball/e95e6d2268316412e5d8f4b88539e3593129905e", - "reference": "e95e6d2268316412e5d8f4b88539e3593129905e", + "url": "https://api.github.com/repos/stellarwp/admin-notices/zipball/63a51add8ebd81c4b83b8b2fb520ce5f79ce24e4", + "reference": "63a51add8ebd81c4b83b8b2fb520ce5f79ce24e4", "shasum": "" }, "require": { @@ -342,9 +342,9 @@ "description": "A handy package for easily displaying admin notices in WordPress with simple to complex visibility conditions", "support": { "issues": "https://github.com/stellarwp/admin-notices/issues", - "source": "https://github.com/stellarwp/admin-notices/tree/1.1.0" + "source": "https://github.com/stellarwp/admin-notices/tree/1.2.0" }, - "time": "2024-10-16T19:05:13+00:00" + "time": "2024-10-17T18:29:35+00:00" }, { "name": "stellarwp/assets", From 906fea04471120479df80c9877d288972b6b03bc Mon Sep 17 00:00:00 2001 From: Brian Krane Date: Mon, 21 Oct 2024 15:02:17 -0400 Subject: [PATCH 5/8] Fixing bug with the chat bot notice link not working properly. --- src/admin-views/help-hub/resources-sidebar-no-license.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/admin-views/help-hub/resources-sidebar-no-license.php b/src/admin-views/help-hub/resources-sidebar-no-license.php index 75500468d..ca89fa273 100644 --- a/src/admin-views/help-hub/resources-sidebar-no-license.php +++ b/src/admin-views/help-hub/resources-sidebar-no-license.php @@ -35,7 +35,7 @@ ?>

- + Date: Mon, 21 Oct 2024 15:02:17 -0400 Subject: [PATCH 6/8] Fixing bug with the chat bot notice link not working properly. --- src/Tribe/Admin/Help_Page.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tribe/Admin/Help_Page.php b/src/Tribe/Admin/Help_Page.php index b86bf81dc..4a37a0132 100644 --- a/src/Tribe/Admin/Help_Page.php +++ b/src/Tribe/Admin/Help_Page.php @@ -69,7 +69,7 @@ public function do_help_tab() { 'The callout notice to try the chatbot with a link to the page', 'tribe-common' ), - '', + '', '' ); From 6c4b4f2802ec732f771ab793193c523275178f47 Mon Sep 17 00:00:00 2001 From: Brian Krane Date: Mon, 21 Oct 2024 15:12:05 -0400 Subject: [PATCH 7/8] PHPCS fixes. --- src/admin-views/help-hub/shared-live-support.php | 4 ++-- .../help-hub/shared-sidebar-has-license-no-consent.php | 8 ++++---- src/admin-views/help-hub/support-hub-docsbot.php | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/admin-views/help-hub/shared-live-support.php b/src/admin-views/help-hub/shared-live-support.php index c14d578bd..b8716b0b2 100644 --- a/src/admin-views/help-hub/shared-live-support.php +++ b/src/admin-views/help-hub/shared-live-support.php @@ -15,8 +15,8 @@

diff --git a/src/admin-views/help-hub/shared-sidebar-has-license-no-consent.php b/src/admin-views/help-hub/shared-sidebar-has-license-no-consent.php index 7a17b6a21..15f8ff75c 100644 --- a/src/admin-views/help-hub/shared-sidebar-has-license-no-consent.php +++ b/src/admin-views/help-hub/shared-sidebar-has-license-no-consent.php @@ -37,8 +37,8 @@
@@ -65,8 +65,8 @@
diff --git a/src/admin-views/help-hub/support-hub-docsbot.php b/src/admin-views/help-hub/support-hub-docsbot.php index 2ab813d29..9d0d16b84 100644 --- a/src/admin-views/help-hub/support-hub-docsbot.php +++ b/src/admin-views/help-hub/support-hub-docsbot.php @@ -8,7 +8,6 @@ * @var string $zendesk_chat_key The zendesk chat ID. */ - ?>
From e8ac989a5a7543a8fb9160b841c7cd52458ab4c5 Mon Sep 17 00:00:00 2001 From: Brian Krane Date: Mon, 21 Oct 2024 15:14:11 -0400 Subject: [PATCH 8/8] PHPCS fixes. --- .../help-hub/support-hub-sidebar-has-license-has-consent.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/admin-views/help-hub/support-hub-sidebar-has-license-has-consent.php b/src/admin-views/help-hub/support-hub-sidebar-has-license-has-consent.php index 483a2af5c..57296d3dc 100644 --- a/src/admin-views/help-hub/support-hub-sidebar-has-license-has-consent.php +++ b/src/admin-views/help-hub/support-hub-sidebar-has-license-has-consent.php @@ -19,8 +19,8 @@