From a506076afb1fa2663b184758d169174610058179 Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Mon, 21 Oct 2024 13:54:56 +0200 Subject: [PATCH 01/11] fix: cli add command method call --- readme.txt | 3 +++ src/Runtime.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index cc6c80ff..70fb77f2 100644 --- a/readme.txt +++ b/readme.txt @@ -297,6 +297,9 @@ Yes! We're offering a [custom plugin development](https://bracketspace.com/custo == Changelog == += [Next] = +* [Fixed] WP CLI add command function is not giving warnings anymore. + = 9.0.1 = * [Changed] Notification data is now kept in the wp_posts table for easier reverting to previous version. diff --git a/src/Runtime.php b/src/Runtime.php index 24870285..0e8d5003 100644 --- a/src/Runtime.php +++ b/src/Runtime.php @@ -121,7 +121,7 @@ public function cliCommands() return; } - \WP_CLI::addCommand('notification dump-hooks', Cli\DumpHooks::class); + \WP_CLI::add_command('notification dump-hooks', Cli\DumpHooks::class); } /** From 96f1d5e27eaa03a4b8b6cc85be51191045c96c0c Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Mon, 21 Oct 2024 14:25:55 +0200 Subject: [PATCH 02/11] fix: comment user email and display name tags --- readme.txt | 1 + src/Repository/Trigger/Comment/CommentReplied.php | 4 ++-- src/Repository/Trigger/Comment/CommentTrigger.php | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/readme.txt b/readme.txt index 70fb77f2..219e1323 100644 --- a/readme.txt +++ b/readme.txt @@ -299,6 +299,7 @@ Yes! We're offering a [custom plugin development](https://bracketspace.com/custo = [Next] = * [Fixed] WP CLI add command function is not giving warnings anymore. +* [Fixed] Comment author email and display name merge tags. = 9.0.1 = * [Changed] Notification data is now kept in the wp_posts table for easier reverting to previous version. diff --git a/src/Repository/Trigger/Comment/CommentReplied.php b/src/Repository/Trigger/Comment/CommentReplied.php index 09a6e6a0..de574dc6 100644 --- a/src/Repository/Trigger/Comment/CommentReplied.php +++ b/src/Repository/Trigger/Comment/CommentReplied.php @@ -101,8 +101,8 @@ public function context($commentNewStatus, $commentOldStatus, $comment) $this->parentCommentUserObject = new \StdClass(); $this->parentCommentUserObject->ID = ($this->parentComment->user_id) ? ($this->parentComment->user_id) : 0; - $this->parentCommentUserObject->displayName = $this->parentComment->comment_author; - $this->parentCommentUserObject->userEmail = $this->parentComment->comment_author_email; + $this->parentCommentUserObject->display_name = $this->parentComment->comment_author; + $this->parentCommentUserObject->user_email = $this->parentComment->comment_author_email; parent::assignProperties(); } diff --git a/src/Repository/Trigger/Comment/CommentTrigger.php b/src/Repository/Trigger/Comment/CommentTrigger.php index 56098b8d..b94cd6a2 100644 --- a/src/Repository/Trigger/Comment/CommentTrigger.php +++ b/src/Repository/Trigger/Comment/CommentTrigger.php @@ -110,8 +110,8 @@ public function assignProperties() $this->userObject = new \StdClass(); $this->userObject->ID = ($this->comment->user_id) ? ($this->comment->user_id) : 0; - $this->userObject->displayName = $this->comment->comment_author; - $this->userObject->userEmail = $this->comment->comment_author_email; + $this->userObject->display_name = $this->comment->comment_author; + $this->userObject->user_email = $this->comment->comment_author_email; $this->post = get_post((int)$this->comment->comment_post_ID); From 5265737aaa5cd52fdca79dbb3dc8a2b09f26de63 Mon Sep 17 00:00:00 2001 From: Krzysztof Grabania Date: Mon, 21 Oct 2024 15:02:46 +0200 Subject: [PATCH 03/11] fix: fix user password setup link and user password reset link resolvers CU-86964fpej --- .../MergeTag/User/UserPasswordResetLink.php | 2 +- .../Trigger/User/UserPasswordResetRequest.php | 18 ++++++------------ src/Repository/Trigger/User/UserRegistered.php | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/Repository/MergeTag/User/UserPasswordResetLink.php b/src/Repository/MergeTag/User/UserPasswordResetLink.php index ac301d79..2cabe2f6 100644 --- a/src/Repository/MergeTag/User/UserPasswordResetLink.php +++ b/src/Repository/MergeTag/User/UserPasswordResetLink.php @@ -57,7 +57,7 @@ public function __construct($params = []) sprintf( 'wp-login.php?action=rp&key=%s&login=%s', $trigger->{$this->keyPropertyName}, - rawurlencode($trigger->{$this->getTriggerProp()}->data->user_login) + rawurlencode($trigger->{$this->getTriggerProp()}->user_login) ) ); }, diff --git a/src/Repository/Trigger/User/UserPasswordResetRequest.php b/src/Repository/Trigger/User/UserPasswordResetRequest.php index 16454114..aa799ae5 100644 --- a/src/Repository/Trigger/User/UserPasswordResetRequest.php +++ b/src/Repository/Trigger/User/UserPasswordResetRequest.php @@ -50,10 +50,11 @@ public function __construct() */ public function context($username, $resetKey) { - $user = get_user_by( - 'login', - $username - ); + $user = get_user_by('login', $username); + + if (!$user instanceof \WP_User) { + return false; + } /** * Bail if we are handling the registration. @@ -71,14 +72,7 @@ public function context($username, $resetKey) return false; } - $this->userId = $user->data->ID; - - $user = get_userdata($this->userId); - - if (!$user instanceof \WP_User) { - return false; - } - + $this->userId = $user->ID; $this->userObject = $user; $this->passwordResetKey = $resetKey; } diff --git a/src/Repository/Trigger/User/UserRegistered.php b/src/Repository/Trigger/User/UserRegistered.php index d628efc5..42c15ede 100644 --- a/src/Repository/Trigger/User/UserRegistered.php +++ b/src/Repository/Trigger/User/UserRegistered.php @@ -82,7 +82,7 @@ public function mergeTags() sprintf( 'wp-login.php?action=rp&key=%s&login=%s', $trigger->getPasswordResetKey(), - rawurlencode($trigger->userObject->userLogin) + rawurlencode($trigger->userObject->user_login) ), 'login' ); From 92cecdd4e349704e4edd58ccfe36045bcf10f405 Mon Sep 17 00:00:00 2001 From: Krzysztof Grabania Date: Mon, 21 Oct 2024 15:11:16 +0200 Subject: [PATCH 04/11] fix: fix phpstan error --- phpstan-baseline.neon | 5 ----- 1 file changed, 5 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index b2ccf176..2d26364d 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1915,11 +1915,6 @@ parameters: count: 1 path: src/Repository/Trigger/User/UserPasswordChanged.php - - - message: "#^Cannot access property \\$data on WP_User\\|false\\.$#" - count: 1 - path: src/Repository/Trigger/User/UserPasswordResetRequest.php - - message: "#^Argument of an invalid type array\\|false supplied for foreach, only iterables are supported\\.$#" count: 1 From 52efa6fc1237a8d737d7bb3367911077e7c82c06 Mon Sep 17 00:00:00 2001 From: Krzysztof Grabania Date: Mon, 21 Oct 2024 15:28:53 +0200 Subject: [PATCH 05/11] chore: update strauss dependency --- composer.json | 4 +- composer.lock | 699 ++++++++++++++++++++++++++------------------------ 2 files changed, 372 insertions(+), 331 deletions(-) diff --git a/composer.json b/composer.json index 7ec93906..752d16ef 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "require": { "php": "^7.4 | ^8.0", "composer-runtime-api": "^2.0", - "brianhenryie/strauss": "^0.19.1", + "brianhenryie/strauss": "^0.19.4", "enshrined/svg-sanitize": "^0.16.0", "micropackage/ajax": "^1.0", "micropackage/cache": "^1.0", @@ -63,7 +63,7 @@ "classmap_prefix": "BracketSpace_Notification_Dependencies_", "exclude_from_prefix": { "file_patterns": [ - "compat/src-deprecated/helpers.php" + "#compat\/src-deprecated\/helpers.php#" ] } } diff --git a/composer.lock b/composer.lock index bfdd46d4..b1eef222 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a20bc30dd0bbf2b76aeec424e8b276c3", + "content-hash": "6f81c88d0cacb0a8b683532b44275655", "packages": [ { "name": "brianhenryie/strauss", - "version": "0.19.1", + "version": "0.19.4", "source": { "type": "git", "url": "https://github.com/BrianHenryIE/strauss.git", - "reference": "12be71cbf147900dfc1fc32a85b01bb7ee7f870b" + "reference": "b655469ea488848cda5203a721daa2f5845e9055" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BrianHenryIE/strauss/zipball/12be71cbf147900dfc1fc32a85b01bb7ee7f870b", - "reference": "12be71cbf147900dfc1fc32a85b01bb7ee7f870b", + "url": "https://api.github.com/repos/BrianHenryIE/strauss/zipball/b655469ea488848cda5203a721daa2f5845e9055", + "reference": "b655469ea488848cda5203a721daa2f5845e9055", "shasum": "" }, "require": { @@ -68,22 +68,22 @@ "description": "Composes all dependencies as a package inside a WordPress plugin", "support": { "issues": "https://github.com/BrianHenryIE/strauss/issues", - "source": "https://github.com/BrianHenryIE/strauss/tree/0.19.1" + "source": "https://github.com/BrianHenryIE/strauss/tree/0.19.4" }, - "time": "2024-04-26T16:51:21+00:00" + "time": "2024-10-10T21:04:04+00:00" }, { "name": "composer/ca-bundle", - "version": "1.5.0", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99" + "reference": "48a792895a2b7a6ee65dd5442c299d7b835b6137" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", - "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/48a792895a2b7a6ee65dd5442c299d7b835b6137", + "reference": "48a792895a2b7a6ee65dd5442c299d7b835b6137", "shasum": "" }, "require": { @@ -93,8 +93,8 @@ }, "require-dev": { "phpstan/phpstan": "^1.10", - "psr/log": "^1.0", - "symfony/phpunit-bridge": "^4.2 || ^5", + "phpunit/phpunit": "^8 || ^9", + "psr/log": "^1.0 || ^2.0 || ^3.0", "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", @@ -130,7 +130,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.0" + "source": "https://github.com/composer/ca-bundle/tree/1.5.2" }, "funding": [ { @@ -146,20 +146,20 @@ "type": "tidelift" } ], - "time": "2024-03-15T14:00:32+00:00" + "time": "2024-09-25T07:49:53+00:00" }, { "name": "composer/class-map-generator", - "version": "1.1.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "8286a62d243312ed99b3eee20d5005c961adb311" + "reference": "98bbf6780e56e0fd2404fe4b82eb665a0f93b783" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/8286a62d243312ed99b3eee20d5005c961adb311", - "reference": "8286a62d243312ed99b3eee20d5005c961adb311", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/98bbf6780e56e0fd2404fe4b82eb665a0f93b783", + "reference": "98bbf6780e56e0fd2404fe4b82eb665a0f93b783", "shasum": "" }, "require": { @@ -172,8 +172,8 @@ "phpstan/phpstan-deprecation-rules": "^1", "phpstan/phpstan-phpunit": "^1", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/filesystem": "^5.4 || ^6", - "symfony/phpunit-bridge": "^5" + "phpunit/phpunit": "^8", + "symfony/filesystem": "^5.4 || ^6" }, "type": "library", "extra": { @@ -203,7 +203,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.1.1" + "source": "https://github.com/composer/class-map-generator/tree/1.4.0" }, "funding": [ { @@ -219,52 +219,52 @@ "type": "tidelift" } ], - "time": "2024-03-15T12:53:41+00:00" + "time": "2024-10-03T18:14:00+00:00" }, { "name": "composer/composer", - "version": "2.7.2", + "version": "2.8.1", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "b826edb791571ab1eaf281eb1bd6e181a1192adc" + "reference": "e52b8672276cf436670cdd6bd5de4353740e83b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/b826edb791571ab1eaf281eb1bd6e181a1192adc", - "reference": "b826edb791571ab1eaf281eb1bd6e181a1192adc", + "url": "https://api.github.com/repos/composer/composer/zipball/e52b8672276cf436670cdd6bd5de4353740e83b2", + "reference": "e52b8672276cf436670cdd6bd5de4353740e83b2", "shasum": "" }, "require": { - "composer/ca-bundle": "^1.0", - "composer/class-map-generator": "^1.0", + "composer/ca-bundle": "^1.5", + "composer/class-map-generator": "^1.4.0", "composer/metadata-minifier": "^1.0", - "composer/pcre": "^2.1 || ^3.1", - "composer/semver": "^3.2.5", + "composer/pcre": "^2.2 || ^3.2", + "composer/semver": "^3.3", "composer/spdx-licenses": "^1.5.7", "composer/xdebug-handler": "^2.0.2 || ^3.0.3", - "justinrainbow/json-schema": "^5.2.11", + "justinrainbow/json-schema": "^5.3", "php": "^7.2.5 || ^8.0", "psr/log": "^1.0 || ^2.0 || ^3.0", - "react/promise": "^2.8 || ^3", + "react/promise": "^3.2", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", - "symfony/console": "^5.4.11 || ^6.0.11 || ^7", - "symfony/filesystem": "^5.4 || ^6.0 || ^7", - "symfony/finder": "^5.4 || ^6.0 || ^7", + "symfony/console": "^5.4.35 || ^6.3.12 || ^7.0.3", + "symfony/filesystem": "^5.4.35 || ^6.3.12 || ^7.0.3", + "symfony/finder": "^5.4.35 || ^6.3.12 || ^7.0.3", "symfony/polyfill-php73": "^1.24", "symfony/polyfill-php80": "^1.24", "symfony/polyfill-php81": "^1.24", - "symfony/process": "^5.4 || ^6.0 || ^7" + "symfony/process": "^5.4.35 || ^6.3.12 || ^7.0.3" }, "require-dev": { - "phpstan/phpstan": "^1.9.3", - "phpstan/phpstan-deprecation-rules": "^1", - "phpstan/phpstan-phpunit": "^1.0", - "phpstan/phpstan-strict-rules": "^1", - "phpstan/phpstan-symfony": "^1.2.10", - "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" + "phpstan/phpstan": "^1.11.8", + "phpstan/phpstan-deprecation-rules": "^1.2.0", + "phpstan/phpstan-phpunit": "^1.4.0", + "phpstan/phpstan-strict-rules": "^1.6.0", + "phpstan/phpstan-symfony": "^1.4.0", + "symfony/phpunit-bridge": "^6.4.3 || ^7.0.1" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -277,7 +277,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.7-dev" + "dev-main": "2.8-dev" }, "phpstan": { "includes": [ @@ -317,7 +317,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.7.2" + "source": "https://github.com/composer/composer/tree/2.8.1" }, "funding": [ { @@ -333,7 +333,7 @@ "type": "tidelift" } ], - "time": "2024-03-11T16:12:18+00:00" + "time": "2024-10-04T09:31:01+00:00" }, { "name": "composer/metadata-minifier", @@ -406,30 +406,38 @@ }, { "name": "composer/pcre", - "version": "3.1.3", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8" + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", - "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", + "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, + "conflict": { + "phpstan/phpstan": "<1.11.10" + }, "require-dev": { - "phpstan/phpstan": "^1.3", + "phpstan/phpstan": "^1.11.10", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^5" + "phpunit/phpunit": "^8 || ^9" }, "type": "library", "extra": { "branch-alias": { "dev-main": "3.x-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] } }, "autoload": { @@ -457,7 +465,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.3" + "source": "https://github.com/composer/pcre/tree/3.3.1" }, "funding": [ { @@ -473,28 +481,28 @@ "type": "tidelift" } ], - "time": "2024-03-19T10:26:25+00:00" + "time": "2024-08-27T18:44:43+00:00" }, { "name": "composer/semver", - "version": "3.4.0", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" }, "type": "library", "extra": { @@ -538,7 +546,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.0" + "source": "https://github.com/composer/semver/tree/3.4.3" }, "funding": [ { @@ -554,7 +562,7 @@ "type": "tidelift" } ], - "time": "2023-08-31T09:50:34+00:00" + "time": "2024-09-19T14:15:21+00:00" }, { "name": "composer/spdx-licenses", @@ -638,16 +646,16 @@ }, { "name": "composer/xdebug-handler", - "version": "3.0.4", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255" + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255", - "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef", "shasum": "" }, "require": { @@ -684,7 +692,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.4" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.5" }, "funding": [ { @@ -700,7 +708,7 @@ "type": "tidelift" } ], - "time": "2024-03-26T18:29:49+00:00" + "time": "2024-05-06T16:37:16+00:00" }, { "name": "enshrined/svg-sanitize", @@ -811,26 +819,26 @@ }, { "name": "json-mapper/json-mapper", - "version": "2.22.0", + "version": "2.22.2", "source": { "type": "git", "url": "https://github.com/JsonMapper/JsonMapper.git", - "reference": "6ad28693169ccd7b09ac9c282b562a90f428a7ea" + "reference": "cffe898d9fa034f8e633d7146a1f93bf7be52f2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JsonMapper/JsonMapper/zipball/6ad28693169ccd7b09ac9c282b562a90f428a7ea", - "reference": "6ad28693169ccd7b09ac9c282b562a90f428a7ea", + "url": "https://api.github.com/repos/JsonMapper/JsonMapper/zipball/cffe898d9fa034f8e633d7146a1f93bf7be52f2e", + "reference": "cffe898d9fa034f8e633d7146a1f93bf7be52f2e", "shasum": "" }, "require": { "ext-json": "*", "myclabs/php-enum": "^1.7", - "nikic/php-parser": "^4.13", + "nikic/php-parser": "^4.13 || ^5.0", "php": "^7.1 || ^8.0", "psr/log": "^1.1 || ^2.0 || ^3.0", "psr/simple-cache": " ^1.0 || ^2.0 || ^3.0", - "symfony/cache": "^4.4 || ^5.0 || ^6.0", + "symfony/cache": "^4.4 || ^5.0 || ^6.0 || ^7.0", "symfony/polyfill-php73": "^1.18" }, "require-dev": { @@ -876,24 +884,24 @@ "type": "github" } ], - "time": "2024-03-05T08:44:51+00:00" + "time": "2024-05-14T09:24:45+00:00" }, { "name": "justinrainbow/json-schema", - "version": "v5.2.13", + "version": "5.3.0", "source": { "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" + "url": "https://github.com/jsonrainbow/json-schema.git", + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", @@ -904,11 +912,6 @@ "bin/validate-json" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, "autoload": { "psr-4": { "JsonSchema\\": "src/JsonSchema/" @@ -943,10 +946,10 @@ "schema" ], "support": { - "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" + "issues": "https://github.com/jsonrainbow/json-schema/issues", + "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0" }, - "time": "2023-09-26T02:20:38+00:00" + "time": "2024-07-06T21:00:26+00:00" }, { "name": "league/flysystem", @@ -1036,16 +1039,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.15.0", + "version": "1.16.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301" + "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", - "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/2d6702ff215bf922936ccc1ad31007edc76451b9", + "reference": "2d6702ff215bf922936ccc1ad31007edc76451b9", "shasum": "" }, "require": { @@ -1076,7 +1079,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.16.0" }, "funding": [ { @@ -1088,7 +1091,7 @@ "type": "tidelift" } ], - "time": "2024-01-28T23:22:08+00:00" + "time": "2024-09-21T08:32:55+00:00" }, { "name": "micropackage/ajax", @@ -1523,25 +1526,27 @@ }, { "name": "nikic/php-parser", - "version": "v4.19.1", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", - "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", "shasum": "" }, "require": { + "ext-ctype": "*", + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.1" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -1549,7 +1554,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1573,9 +1578,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" }, - "time": "2024-03-17T08:10:35+00:00" + "time": "2024-10-08T18:51:32+00:00" }, { "name": "psr/cache", @@ -1777,16 +1782,16 @@ }, { "name": "react/promise", - "version": "v3.1.0", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c" + "reference": "8a164643313c71354582dc850b42b33fa12a4b63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/e563d55d1641de1dea9f5e84f3cccc66d2bfe02c", - "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c", + "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63", "shasum": "" }, "require": { @@ -1838,7 +1843,7 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v3.1.0" + "source": "https://github.com/reactphp/promise/tree/v3.2.0" }, "funding": [ { @@ -1846,27 +1851,27 @@ "type": "open_collective" } ], - "time": "2023-11-16T16:21:57+00:00" + "time": "2024-05-24T10:39:05+00:00" }, { "name": "seld/jsonlint", - "version": "1.10.2", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259" + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9bb7db07b5d66d90f6ebf542f09fc67d800e5259", - "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/1748aaf847fc731cfad7725aec413ee46f0cc3a2", + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2", "shasum": "" }, "require": { "php": "^5.3 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.5", + "phpstan/phpstan": "^1.11", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13" }, "bin": [ @@ -1898,7 +1903,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.10.2" + "source": "https://github.com/Seldaek/jsonlint/tree/1.11.0" }, "funding": [ { @@ -1910,7 +1915,7 @@ "type": "tidelift" } ], - "time": "2024-02-07T12:57:50+00:00" + "time": "2024-07-11T14:55:45+00:00" }, { "name": "seld/phar-utils", @@ -2023,16 +2028,16 @@ }, { "name": "symfony/cache", - "version": "v5.4.38", + "version": "v5.4.44", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "223c3afac82e003a76931b71d77db408636a0de8" + "reference": "4b3e7bf157b8b5a010865701d9106b5f0a9c99a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/223c3afac82e003a76931b71d77db408636a0de8", - "reference": "223c3afac82e003a76931b71d77db408636a0de8", + "url": "https://api.github.com/repos/symfony/cache/zipball/4b3e7bf157b8b5a010865701d9106b5f0a9c99a8", + "reference": "4b3e7bf157b8b5a010865701d9106b5f0a9c99a8", "shasum": "" }, "require": { @@ -2061,7 +2066,7 @@ "cache/integration-tests": "dev-master", "doctrine/cache": "^1.6|^2.0", "doctrine/dbal": "^2.13.1|^3|^4", - "predis/predis": "^1.1", + "predis/predis": "^1.1|^2.0", "psr/simple-cache": "^1.0|^2.0", "symfony/config": "^4.4|^5.0|^6.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", @@ -2100,7 +2105,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v5.4.38" + "source": "https://github.com/symfony/cache/tree/v5.4.44" }, "funding": [ { @@ -2116,7 +2121,7 @@ "type": "tidelift" } ], - "time": "2024-03-19T09:55:32+00:00" + "time": "2024-09-13T16:57:39+00:00" }, { "name": "symfony/cache-contracts", @@ -2199,16 +2204,16 @@ }, { "name": "symfony/console", - "version": "v5.4.36", + "version": "v5.4.44", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e" + "reference": "5b5a0aa66e3296e303e22490f90f521551835a83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e", - "reference": "39f75d9d73d0c11952fdcecf4877b4d0f62a8f6e", + "url": "https://api.github.com/repos/symfony/console/zipball/5b5a0aa66e3296e303e22490f90f521551835a83", + "reference": "5b5a0aa66e3296e303e22490f90f521551835a83", "shasum": "" }, "require": { @@ -2278,7 +2283,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.36" + "source": "https://github.com/symfony/console/tree/v5.4.44" }, "funding": [ { @@ -2294,7 +2299,7 @@ "type": "tidelift" } ], - "time": "2024-02-20T16:33:57+00:00" + "time": "2024-09-20T07:56:40+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2365,16 +2370,16 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.38", + "version": "v5.4.44", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "899330a01056077271e2f614c7b28b0379a671eb" + "reference": "76c3818964e9d32be3862c9318ae3ba9aa280ddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/899330a01056077271e2f614c7b28b0379a671eb", - "reference": "899330a01056077271e2f614c7b28b0379a671eb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/76c3818964e9d32be3862c9318ae3ba9aa280ddc", + "reference": "76c3818964e9d32be3862c9318ae3ba9aa280ddc", "shasum": "" }, "require": { @@ -2383,6 +2388,9 @@ "symfony/polyfill-mbstring": "~1.8", "symfony/polyfill-php80": "^1.16" }, + "require-dev": { + "symfony/process": "^5.4|^6.4" + }, "type": "library", "autoload": { "psr-4": { @@ -2409,7 +2417,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.38" + "source": "https://github.com/symfony/filesystem/tree/v5.4.44" }, "funding": [ { @@ -2425,20 +2433,20 @@ "type": "tidelift" } ], - "time": "2024-03-21T08:05:07+00:00" + "time": "2024-09-16T14:52:48+00:00" }, { "name": "symfony/finder", - "version": "v5.4.35", + "version": "v5.4.43", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435" + "reference": "ae25a9145a900764158d439653d5630191155ca0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/abe6d6f77d9465fed3cd2d029b29d03b56b56435", - "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435", + "url": "https://api.github.com/repos/symfony/finder/zipball/ae25a9145a900764158d439653d5630191155ca0", + "reference": "ae25a9145a900764158d439653d5630191155ca0", "shasum": "" }, "require": { @@ -2472,7 +2480,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v5.4.35" + "source": "https://github.com/symfony/finder/tree/v5.4.43" }, "funding": [ { @@ -2488,24 +2496,24 @@ "type": "tidelift" } ], - "time": "2024-01-23T13:51:25+00:00" + "time": "2024-08-13T14:03:51+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -2551,7 +2559,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -2567,24 +2575,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -2629,7 +2637,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -2645,24 +2653,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "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" @@ -2710,7 +2718,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -2726,24 +2734,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -2790,7 +2798,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -2806,24 +2814,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -2866,7 +2874,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" }, "funding": [ { @@ -2882,24 +2890,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -2946,7 +2954,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -2962,24 +2970,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -3022,7 +3030,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" }, "funding": [ { @@ -3038,20 +3046,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", - "version": "v5.4.36", + "version": "v5.4.44", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975" + "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/4fdf34004f149cc20b2f51d7d119aa500caad975", - "reference": "4fdf34004f149cc20b2f51d7d119aa500caad975", + "url": "https://api.github.com/repos/symfony/process/zipball/1b9fa82b5c62cd49da8c9e3952dd8531ada65096", + "reference": "1b9fa82b5c62cd49da8c9e3952dd8531ada65096", "shasum": "" }, "require": { @@ -3084,7 +3092,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v5.4.36" + "source": "https://github.com/symfony/process/tree/v5.4.44" }, "funding": [ { @@ -3100,7 +3108,7 @@ "type": "tidelift" } ], - "time": "2024-02-12T15:49:53+00:00" + "time": "2024-09-17T12:46:43+00:00" }, { "name": "symfony/service-contracts", @@ -3187,16 +3195,16 @@ }, { "name": "symfony/string", - "version": "v5.4.36", + "version": "v5.4.44", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "4e232c83622bd8cd32b794216aa29d0d266d353b" + "reference": "832caa16b6d9aac6bf11747315225f5aba384c24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/4e232c83622bd8cd32b794216aa29d0d266d353b", - "reference": "4e232c83622bd8cd32b794216aa29d0d266d353b", + "url": "https://api.github.com/repos/symfony/string/zipball/832caa16b6d9aac6bf11747315225f5aba384c24", + "reference": "832caa16b6d9aac6bf11747315225f5aba384c24", "shasum": "" }, "require": { @@ -3253,7 +3261,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.36" + "source": "https://github.com/symfony/string/tree/v5.4.44" }, "funding": [ { @@ -3269,20 +3277,20 @@ "type": "tidelift" } ], - "time": "2024-02-01T08:49:30+00:00" + "time": "2024-09-20T07:56:40+00:00" }, { "name": "symfony/var-exporter", - "version": "v5.4.35", + "version": "v5.4.40", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "abb0a151b62d6b07e816487e20040464af96cae7" + "reference": "6a13d37336d512927986e09f19a4bed24178baa6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/abb0a151b62d6b07e816487e20040464af96cae7", - "reference": "abb0a151b62d6b07e816487e20040464af96cae7", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/6a13d37336d512927986e09f19a4bed24178baa6", + "reference": "6a13d37336d512927986e09f19a4bed24178baa6", "shasum": "" }, "require": { @@ -3326,7 +3334,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v5.4.35" + "source": "https://github.com/symfony/var-exporter/tree/v5.4.40" }, "funding": [ { @@ -3342,26 +3350,26 @@ "type": "tidelift" } ], - "time": "2024-01-23T13:51:25+00:00" + "time": "2024-05-31T14:33:22+00:00" } ], "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" @@ -3390,9 +3398,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/phpcs-neutron-ruleset", @@ -3748,26 +3756,26 @@ }, { "name": "filp/whoops", - "version": "2.15.4", + "version": "2.16.0", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546" + "reference": "befcdc0e5dce67252aa6322d82424be928214fa2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546", - "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546", + "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2", + "reference": "befcdc0e5dce67252aa6322d82424be928214fa2", "shasum": "" }, "require": { - "php": "^5.5.9 || ^7.0 || ^8.0", + "php": "^7.1 || ^8.0", "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "require-dev": { - "mockery/mockery": "^0.9 || ^1.0", - "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3", - "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0" + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3", + "symfony/var-dumper": "^4.0 || ^5.0" }, "suggest": { "symfony/var-dumper": "Pretty print complex values better with var-dumper available", @@ -3807,7 +3815,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.15.4" + "source": "https://github.com/filp/whoops/tree/2.16.0" }, "funding": [ { @@ -3815,7 +3823,7 @@ "type": "github" } ], - "time": "2023-11-03T12:00:00+00:00" + "time": "2024-09-25T12:00:00+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -3870,16 +3878,16 @@ }, { "name": "mockery/mockery", - "version": "1.6.11", + "version": "1.6.12", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "81a161d0b135df89951abd52296adf97deb0723d" + "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d", - "reference": "81a161d0b135df89951abd52296adf97deb0723d", + "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699", + "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699", "shasum": "" }, "require": { @@ -3949,20 +3957,20 @@ "security": "https://github.com/mockery/mockery/security/advisories", "source": "https://github.com/mockery/mockery" }, - "time": "2024-03-21T18:34:15+00:00" + "time": "2024-05-16T03:13:13+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -3970,11 +3978,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -4000,7 +4009,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -4008,7 +4017,7 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "nunomaduro/collision", @@ -4443,27 +4452,28 @@ }, { "name": "php-stubs/wordpress-stubs", - "version": "v6.5.2", + "version": "v6.6.2", "source": { "type": "git", "url": "https://github.com/php-stubs/wordpress-stubs.git", - "reference": "379f17a90c01498d4c99a0d15aab6e7aa6a2c840" + "reference": "f50fd7ed45894d036e4fef9ab7e5bbbaff6a30cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/379f17a90c01498d4c99a0d15aab6e7aa6a2c840", - "reference": "379f17a90c01498d4c99a0d15aab6e7aa6a2c840", + "url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/f50fd7ed45894d036e4fef9ab7e5bbbaff6a30cc", + "reference": "f50fd7ed45894d036e4fef9ab7e5bbbaff6a30cc", "shasum": "" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^1.0", "nikic/php-parser": "^4.13", - "php": "^7.4 || ~8.0.0", + "php": "^7.4 || ^8.0", "php-stubs/generator": "^0.8.3", - "phpdocumentor/reflection-docblock": "5.3", + "phpdocumentor/reflection-docblock": "^5.4.1", "phpstan/phpstan": "^1.10.49", "phpunit/phpunit": "^9.5", - "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.11" + "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^1.0", + "wp-coding-standards/wpcs": "3.1.0 as 2.3.0" }, "suggest": { "paragonie/sodium_compat": "Pure PHP implementation of libsodium", @@ -4484,9 +4494,9 @@ ], "support": { "issues": "https://github.com/php-stubs/wordpress-stubs/issues", - "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.5.2" + "source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.6.2" }, - "time": "2024-04-14T17:30:14+00:00" + "time": "2024-09-30T07:10:48+00:00" }, { "name": "php-stubs/wp-cli-stubs", @@ -4596,28 +4606,28 @@ }, { "name": "phpcompatibility/phpcompatibility-paragonie", - "version": "1.3.2", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git", - "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26" + "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/bba5a9dfec7fcfbd679cfaf611d86b4d3759da26", - "reference": "bba5a9dfec7fcfbd679cfaf611d86b4d3759da26", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/293975b465e0e709b571cbf0c957c6c0a7b9a2ac", + "reference": "293975b465e0e709b571cbf0c957c6c0a7b9a2ac", "shasum": "" }, "require": { "phpcompatibility/php-compatibility": "^9.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0", "paragonie/random_compat": "dev-master", "paragonie/sodium_compat": "dev-master" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -4647,22 +4657,37 @@ ], "support": { "issues": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/issues", + "security": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie/security/policy", "source": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie" }, - "time": "2022-10-25T01:46:02+00:00" + "funding": [ + { + "url": "https://github.com/PHPCompatibility", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-04-24T21:30:46+00:00" }, { "name": "phpcompatibility/phpcompatibility-wp", - "version": "2.1.4", + "version": "2.1.5", "source": { "type": "git", "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git", - "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5" + "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5", - "reference": "b6c1e3ee1c35de6c41a511d5eb9bd03e447480a5", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/01c1ff2704a58e46f0cb1ca9d06aee07b3589082", + "reference": "01c1ff2704a58e46f0cb1ca9d06aee07b3589082", "shasum": "" }, "require": { @@ -4670,10 +4695,10 @@ "phpcompatibility/phpcompatibility-paragonie": "^1.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7" + "dealerdirect/phpcodesniffer-composer-installer": "^1.0" }, "suggest": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", + "dealerdirect/phpcodesniffer-composer-installer": "^1.0 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.", "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." }, "type": "phpcodesniffer-standard", @@ -4702,9 +4727,24 @@ ], "support": { "issues": "https://github.com/PHPCompatibility/PHPCompatibilityWP/issues", + "security": "https://github.com/PHPCompatibility/PHPCompatibilityWP/security/policy", "source": "https://github.com/PHPCompatibility/PHPCompatibilityWP" }, - "time": "2022-10-24T09:00:36+00:00" + "funding": [ + { + "url": "https://github.com/PHPCompatibility", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-04-24T21:37:59+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -4761,16 +4801,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.11.5", + "version": "1.12.7", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "490f0ae1c92b082f154681d7849aee776a7c1443" + "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/490f0ae1c92b082f154681d7849aee776a7c1443", - "reference": "490f0ae1c92b082f154681d7849aee776a7c1443", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", + "reference": "dc2b9976bd8b0f84ec9b0e50cc35378551de7af0", "shasum": "" }, "require": { @@ -4815,39 +4855,39 @@ "type": "github" } ], - "time": "2024-06-17T15:10:54+00:00" + "time": "2024-10-18T11:12:07+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.31", + "version": "9.2.32", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", - "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", + "nikic/php-parser": "^4.19.1 || ^5.1.0", "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-text-template": "^2.0.4", + "sebastian/code-unit-reverse-lookup": "^2.0.3", + "sebastian/complexity": "^2.0.3", + "sebastian/environment": "^5.1.5", + "sebastian/lines-of-code": "^1.0.4", + "sebastian/version": "^3.0.2", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -4856,7 +4896,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-main": "9.2.x-dev" } }, "autoload": { @@ -4885,7 +4925,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" }, "funding": [ { @@ -4893,7 +4933,7 @@ "type": "github" } ], - "time": "2024-03-02T06:37:42+00:00" + "time": "2024-08-22T04:23:01+00:00" }, { "name": "phpunit/php-file-iterator", @@ -5138,45 +5178,45 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.19", + "version": "9.6.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", - "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1 || ^2", + "doctrine/instantiator": "^1.5.0 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.28", - "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-code-coverage": "^9.2.32", + "phpunit/php-file-iterator": "^3.0.6", "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", + "phpunit/php-text-template": "^2.0.4", + "phpunit/php-timer": "^5.0.3", + "sebastian/cli-parser": "^1.0.2", + "sebastian/code-unit": "^1.0.8", "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", + "sebastian/diff": "^4.0.6", + "sebastian/environment": "^5.1.5", + "sebastian/exporter": "^4.0.6", + "sebastian/global-state": "^5.0.7", + "sebastian/object-enumerator": "^4.0.4", + "sebastian/resource-operations": "^3.0.4", + "sebastian/type": "^3.2.1", "sebastian/version": "^3.0.2" }, "suggest": { @@ -5221,7 +5261,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.19" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" }, "funding": [ { @@ -5237,7 +5277,7 @@ "type": "tidelift" } ], - "time": "2024-04-05T04:35:58+00:00" + "time": "2024-09-19T10:50:18+00:00" }, { "name": "sebastian/cli-parser", @@ -6254,16 +6294,16 @@ }, { "name": "sirbrillig/phpcs-variable-analysis", - "version": "v2.11.17", + "version": "v2.11.19", "source": { "type": "git", "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git", - "reference": "3b71162a6bf0cde2bff1752e40a1788d8273d049" + "reference": "bc8d7e30e2005bce5c59018b7cdb08e9fb45c0d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/3b71162a6bf0cde2bff1752e40a1788d8273d049", - "reference": "3b71162a6bf0cde2bff1752e40a1788d8273d049", + "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/bc8d7e30e2005bce5c59018b7cdb08e9fb45c0d1", + "reference": "bc8d7e30e2005bce5c59018b7cdb08e9fb45c0d1", "shasum": "" }, "require": { @@ -6308,7 +6348,7 @@ "source": "https://github.com/sirbrillig/phpcs-variable-analysis", "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki" }, - "time": "2023-08-05T23:46:11+00:00" + "time": "2024-06-26T20:08:34+00:00" }, { "name": "slevomat/coding-standard", @@ -6373,16 +6413,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.1", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909" + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/267a4405fff1d9c847134db3a3c92f1ab7f77909", - "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", "shasum": "" }, "require": { @@ -6449,7 +6489,7 @@ "type": "open_collective" } ], - "time": "2024-03-31T21:03:09+00:00" + "time": "2024-09-18T10:38:58+00:00" }, { "name": "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset", @@ -6491,16 +6531,16 @@ }, { "name": "szepeviktor/phpstan-wordpress", - "version": "v1.3.4", + "version": "v1.3.5", "source": { "type": "git", "url": "https://github.com/szepeviktor/phpstan-wordpress.git", - "reference": "891d0767855a32c886a439efae090408cc1fa156" + "reference": "7f8cfe992faa96b6a33bbd75c7bace98864161e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/szepeviktor/phpstan-wordpress/zipball/891d0767855a32c886a439efae090408cc1fa156", - "reference": "891d0767855a32c886a439efae090408cc1fa156", + "url": "https://api.github.com/repos/szepeviktor/phpstan-wordpress/zipball/7f8cfe992faa96b6a33bbd75c7bace98864161e7", + "reference": "7f8cfe992faa96b6a33bbd75c7bace98864161e7", "shasum": "" }, "require": { @@ -6515,7 +6555,8 @@ "php-parallel-lint/php-parallel-lint": "^1.1", "phpstan/phpstan-strict-rules": "^1.2", "phpunit/phpunit": "^8.0 || ^9.0", - "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.8" + "szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^1.0", + "wp-coding-standards/wpcs": "3.1.0 as 2.3.0" }, "suggest": { "swissspidy/phpstan-no-private": "Detect usage of internal core functions, classes and methods" @@ -6547,9 +6588,9 @@ ], "support": { "issues": "https://github.com/szepeviktor/phpstan-wordpress/issues", - "source": "https://github.com/szepeviktor/phpstan-wordpress/tree/v1.3.4" + "source": "https://github.com/szepeviktor/phpstan-wordpress/tree/v1.3.5" }, - "time": "2024-03-21T16:32:59+00:00" + "time": "2024-06-28T22:27:19+00:00" }, { "name": "theseer/tokenizer", @@ -6654,16 +6695,16 @@ }, { "name": "yoast/phpunit-polyfills", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/Yoast/PHPUnit-Polyfills.git", - "reference": "4a088f125c970d6d6ea52c927f96fe39b330d0f1" + "reference": "562f449a2ec8ab92fe7b30d94da9622c7b1345fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/4a088f125c970d6d6ea52c927f96fe39b330d0f1", - "reference": "4a088f125c970d6d6ea52c927f96fe39b330d0f1", + "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/562f449a2ec8ab92fe7b30d94da9622c7b1345fe", + "reference": "562f449a2ec8ab92fe7b30d94da9622c7b1345fe", "shasum": "" }, "require": { @@ -6678,7 +6719,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.x-dev" + "dev-main": "3.x-dev" } }, "autoload": { @@ -6713,7 +6754,7 @@ "security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy", "source": "https://github.com/Yoast/PHPUnit-Polyfills" }, - "time": "2024-04-05T16:36:44+00:00" + "time": "2024-09-06T22:38:28+00:00" } ], "aliases": [], From 4827f6dc78e9674dfa2cbfc08b5664aee549edbd Mon Sep 17 00:00:00 2001 From: Krzysztof Grabania Date: Tue, 22 Oct 2024 12:19:26 +0200 Subject: [PATCH 06/11] fix: do not escape HTML entities in URL merge tags CU-86969q38x --- readme.txt | 1 + src/Repository/MergeTag/UrlTag.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 219e1323..439a4efc 100644 --- a/readme.txt +++ b/readme.txt @@ -300,6 +300,7 @@ Yes! We're offering a [custom plugin development](https://bracketspace.com/custo = [Next] = * [Fixed] WP CLI add command function is not giving warnings anymore. * [Fixed] Comment author email and display name merge tags. +* [Fixed] Do not escape HTML entities in URL merge tags. = 9.0.1 = * [Changed] Notification data is now kept in the wp_posts table for easier reverting to previous version. diff --git a/src/Repository/MergeTag/UrlTag.php b/src/Repository/MergeTag/UrlTag.php index 3ee2f0af..f3f3d440 100644 --- a/src/Repository/MergeTag/UrlTag.php +++ b/src/Repository/MergeTag/UrlTag.php @@ -41,6 +41,6 @@ public function validate($value) */ public function sanitize($value) { - return esc_url($value); + return esc_url_raw($value); } } From 1e117c6d212fa2cc43dd9adc4d849994a2034690 Mon Sep 17 00:00:00 2001 From: Krzysztof Grabania Date: Tue, 22 Oct 2024 12:20:21 +0200 Subject: [PATCH 07/11] chore: add missing changelog --- readme.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.txt b/readme.txt index 439a4efc..06f8be7d 100644 --- a/readme.txt +++ b/readme.txt @@ -301,6 +301,7 @@ Yes! We're offering a [custom plugin development](https://bracketspace.com/custo * [Fixed] WP CLI add command function is not giving warnings anymore. * [Fixed] Comment author email and display name merge tags. * [Fixed] Do not escape HTML entities in URL merge tags. +* [Fixed] Fix user password setup link and user password reset link resolvers. = 9.0.1 = * [Changed] Notification data is now kept in the wp_posts table for easier reverting to previous version. From 7213c01bcff9da3ecdc7696a71f2a45f1a08fb1a Mon Sep 17 00:00:00 2001 From: Krzysztof Grabania Date: Tue, 22 Oct 2024 12:29:52 +0200 Subject: [PATCH 08/11] chore: fix phpstan errors --- composer.json | 2 +- phpstan-baseline.neon | 20 -------------------- src/Admin/Wizard.php | 2 +- src/Repository/MergeTag/UrlTag.php | 2 +- src/Repository/Trigger/Post/PostTrigger.php | 1 + src/Utils/Settings.php | 12 +++++++++--- 6 files changed, 13 insertions(+), 26 deletions(-) diff --git a/composer.json b/composer.json index 752d16ef..f77b07ca 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,7 @@ "phpcbf": "phpcbf --parallel=4", "phpcs": "phpcs --parallel=4", "phplint": "parallel-lint --exclude node_modules --exclude vendor --exclude dependencies .", - "phpstan": "phpstan analyze --memory-limit=-1", + "phpstan": "phpstan analyze --memory-limit=-1 -v", "generate-stubs": "generate-stubs --finder=compat/stub-finder.php --out=compat/stubs.php --force", "prefix-namespaces-dev": [ "strauss", diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 2d26364d..f30a1f9f 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -1580,11 +1580,6 @@ parameters: count: 1 path: src/Repository/MergeTag/Taxonomy/TermSlug.php - - - message: "#^Parameter \\#1 \\$url of function esc_url expects string, mixed given\\.$#" - count: 1 - path: src/Repository/MergeTag/UrlTag.php - - message: "#^Parameter \\#1 \\$triggerPropertyName of method BracketSpace\\\\Notification\\\\Repository\\\\MergeTag\\\\BaseMergeTag\\:\\:setTriggerProp\\(\\) expects string, mixed given\\.$#" count: 1 @@ -2015,21 +2010,6 @@ parameters: count: 1 path: src/Store/Trigger.php - - - message: "#^Cannot access offset 'host' on array\\{scheme\\?\\: string, host\\?\\: string, port\\?\\: int, user\\?\\: string, pass\\?\\: string, path\\?\\: string, query\\?\\: string, fragment\\?\\: string\\}\\|false\\.$#" - count: 1 - path: src/Utils/Settings.php - - - - message: "#^Cannot access offset 'path' on array\\{scheme\\?\\: string, host\\?\\: string, port\\?\\: int, user\\?\\: string, pass\\?\\: string, path\\?\\: string, query\\?\\: string, fragment\\?\\: string\\}\\|false\\.$#" - count: 3 - path: src/Utils/Settings.php - - - - message: "#^Cannot access offset 'scheme' on array\\{scheme\\?\\: string, host\\?\\: string, port\\?\\: int, user\\?\\: string, pass\\?\\: string, path\\?\\: string, query\\?\\: string, fragment\\?\\: string\\}\\|false\\.$#" - count: 1 - path: src/Utils/Settings.php - - message: "#^Cannot access offset mixed on mixed\\.$#" count: 2 diff --git a/src/Admin/Wizard.php b/src/Admin/Wizard.php index 6bffa0aa..b3afd76f 100644 --- a/src/Admin/Wizard.php +++ b/src/Admin/Wizard.php @@ -347,7 +347,7 @@ private function saveOptionToDismissWizard() if (get_option($this->dismissedOption) !== false) { update_option($this->dismissedOption, true); } else { - add_option($this->dismissedOption, true, '', 'no'); + add_option($this->dismissedOption, true, '', false); } } diff --git a/src/Repository/MergeTag/UrlTag.php b/src/Repository/MergeTag/UrlTag.php index f3f3d440..b7b66865 100644 --- a/src/Repository/MergeTag/UrlTag.php +++ b/src/Repository/MergeTag/UrlTag.php @@ -41,6 +41,6 @@ public function validate($value) */ public function sanitize($value) { - return esc_url_raw($value); + return is_string($value) ? esc_url_raw($value) : ''; } } diff --git a/src/Repository/Trigger/Post/PostTrigger.php b/src/Repository/Trigger/Post/PostTrigger.php index 6af9a672..fc2dc149 100644 --- a/src/Repository/Trigger/Post/PostTrigger.php +++ b/src/Repository/Trigger/Post/PostTrigger.php @@ -605,6 +605,7 @@ public function __get($property) if (in_array($property, array_keys($propertyMap), true)) { wp_trigger_error( + // @phpstan-ignore argument.type static::class, sprintf( 'Property `%s` is deprecated since 9.0.0, use `post` property instead.', diff --git a/src/Utils/Settings.php b/src/Utils/Settings.php index 20498e1a..a542a229 100644 --- a/src/Utils/Settings.php +++ b/src/Utils/Settings.php @@ -359,15 +359,21 @@ public function setVariables() // URI. $themeUrl = wp_parse_url(get_stylesheet_directory_uri()); - $themePos = strpos($this->path, $themeUrl['path']); + $themePos = strpos($this->path, $themeUrl['path'] ?? ''); if ($themePos !== false) { // loaded from theme. $pluginRelativeDir = str_replace( - $themeUrl['path'], + $themeUrl['path'] ?? '', '', substr($this->path, $themePos) ); - $this->uri = $themeUrl['scheme'] . '://' . $themeUrl['host'] . $themeUrl['path'] . $pluginRelativeDir; + $this->uri = sprintf( + '%s://%s%s%s', + $themeUrl['scheme'] ?? '', + $themeUrl['host'] ?? '', + $themeUrl['path'] ?? '', + $pluginRelativeDir + ); } else { // loaded from plugin. $this->uri = trailingslashit(plugins_url('', dirname(__FILE__))); } From c54c76fce460bf05a5de4a97f03ab4207950e8fd Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Wed, 23 Oct 2024 10:58:27 +0200 Subject: [PATCH 09/11] fix: post triggers users merge tags --- readme.txt | 1 + src/Repository/Trigger/Post/PostApproved.php | 20 +++++++++---------- src/Repository/Trigger/Post/PostPublished.php | 20 +++++++++---------- .../Trigger/Post/PostPublishedPrivately.php | 20 +++++++++---------- src/Repository/Trigger/Post/PostScheduled.php | 20 +++++++++---------- src/Repository/Trigger/Post/PostTrashed.php | 20 +++++++++---------- src/Repository/Trigger/Post/PostTrigger.php | 20 +++++++++---------- src/Repository/Trigger/Post/PostUpdated.php | 20 +++++++++---------- 8 files changed, 71 insertions(+), 70 deletions(-) diff --git a/readme.txt b/readme.txt index 06f8be7d..d644e84c 100644 --- a/readme.txt +++ b/readme.txt @@ -302,6 +302,7 @@ Yes! We're offering a [custom plugin development](https://bracketspace.com/custo * [Fixed] Comment author email and display name merge tags. * [Fixed] Do not escape HTML entities in URL merge tags. * [Fixed] Fix user password setup link and user password reset link resolvers. +* [Fixed] Post triggers various user merge tags. = 9.0.1 = * [Changed] Notification data is now kept in the wp_posts table for easier reverting to previous version. diff --git a/src/Repository/Trigger/Post/PostApproved.php b/src/Repository/Trigger/Post/PostApproved.php index d224465b..512366a8 100644 --- a/src/Repository/Trigger/Post/PostApproved.php +++ b/src/Repository/Trigger/Post/PostApproved.php @@ -112,7 +112,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s approving user ID', 'notification'), $postTypeName), - 'property_name' => 'approving_user', + 'property_name' => 'approvingUser', 'group' => __('Approving user', 'notification'), ] ) @@ -127,7 +127,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s approving user login', 'notification'), $postTypeName), - 'property_name' => 'approving_user', + 'property_name' => 'approvingUser', 'group' => __('Approving user', 'notification'), ] ) @@ -142,7 +142,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s approving user email', 'notification'), $postTypeName), - 'property_name' => 'approving_user', + 'property_name' => 'approvingUser', 'group' => __('Approving user', 'notification'), ] ) @@ -157,7 +157,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s approving user nicename', 'notification'), $postTypeName), - 'property_name' => 'approving_user', + 'property_name' => 'approvingUser', 'group' => __('Approving user', 'notification'), ] ) @@ -172,7 +172,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s approving user nickname', 'notification'), $postTypeName), - 'property_name' => 'approving_user', + 'property_name' => 'approvingUser', 'group' => __('Approving user', 'notification'), ] ) @@ -187,7 +187,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s approving user display name', 'notification'), $postTypeName), - 'property_name' => 'approving_user', + 'property_name' => 'approvingUser', 'group' => __('Approving user', 'notification'), ] ) @@ -202,7 +202,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s approving user first name', 'notification'), $postTypeName), - 'property_name' => 'approving_user', + 'property_name' => 'approvingUser', 'group' => __('Approving user', 'notification'), ] ) @@ -217,7 +217,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s approving user last name', 'notification'), $postTypeName), - 'property_name' => 'approving_user', + 'property_name' => 'approvingUser', 'group' => __('Approving user', 'notification'), ] ) @@ -232,7 +232,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s approving user avatar', 'notification'), $postTypeName), - 'property_name' => 'approving_user', + 'property_name' => 'approvingUser', 'group' => __('Approving user', 'notification'), ] ) @@ -247,7 +247,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s approving user role', 'notification'), $postTypeName), - 'property_name' => 'approving_user', + 'property_name' => 'approvingUser', 'group' => __('Approving user', 'notification'), ] ) diff --git a/src/Repository/Trigger/Post/PostPublished.php b/src/Repository/Trigger/Post/PostPublished.php index 1ecbc137..b2b62282 100644 --- a/src/Repository/Trigger/Post/PostPublished.php +++ b/src/Repository/Trigger/Post/PostPublished.php @@ -125,7 +125,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user ID', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -140,7 +140,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user login', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -155,7 +155,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user email', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -170,7 +170,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user nicename', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -185,7 +185,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user nickname', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -200,7 +200,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user display name', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -215,7 +215,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user first name', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -230,7 +230,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user last name', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -245,7 +245,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user avatar', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -260,7 +260,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user role', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) diff --git a/src/Repository/Trigger/Post/PostPublishedPrivately.php b/src/Repository/Trigger/Post/PostPublishedPrivately.php index 039cc0b9..dc708704 100644 --- a/src/Repository/Trigger/Post/PostPublishedPrivately.php +++ b/src/Repository/Trigger/Post/PostPublishedPrivately.php @@ -125,7 +125,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user ID', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -140,7 +140,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user login', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -155,7 +155,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user email', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -170,7 +170,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user nicename', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -185,7 +185,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user nickname', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -200,7 +200,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user display name', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -215,7 +215,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user first name', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -230,7 +230,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user last name', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -245,7 +245,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user avatar', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) @@ -260,7 +260,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s publishing user role', 'notification'), $postTypeName), - 'property_name' => 'publishing_user', + 'property_name' => 'publishingUser', 'group' => __('Publishing user', 'notification'), ] ) diff --git a/src/Repository/Trigger/Post/PostScheduled.php b/src/Repository/Trigger/Post/PostScheduled.php index f02cfb6b..feb3b4ca 100644 --- a/src/Repository/Trigger/Post/PostScheduled.php +++ b/src/Repository/Trigger/Post/PostScheduled.php @@ -136,7 +136,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s scheduling user ID', 'notification'), $postTypeName), - 'property_name' => 'scheduling_user', + 'property_name' => 'schedulingUser', 'group' => __('Scheduling user', 'notification'), ] ) @@ -151,7 +151,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s scheduling user login', 'notification'), $postTypeName), - 'property_name' => 'scheduling_user', + 'property_name' => 'schedulingUser', 'group' => __('Scheduling user', 'notification'), ] ) @@ -166,7 +166,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s scheduling user email', 'notification'), $postTypeName), - 'property_name' => 'scheduling_user', + 'property_name' => 'schedulingUser', 'group' => __('Scheduling user', 'notification'), ] ) @@ -181,7 +181,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s scheduling user nicename', 'notification'), $postTypeName), - 'property_name' => 'scheduling_user', + 'property_name' => 'schedulingUser', 'group' => __('Scheduling user', 'notification'), ] ) @@ -196,7 +196,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s scheduling user nickname', 'notification'), $postTypeName), - 'property_name' => 'scheduling_user', + 'property_name' => 'schedulingUser', 'group' => __('Scheduling user', 'notification'), ] ) @@ -211,7 +211,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s scheduling user display name', 'notification'), $postTypeName), - 'property_name' => 'scheduling_user', + 'property_name' => 'schedulingUser', 'group' => __('Scheduling user', 'notification'), ] ) @@ -226,7 +226,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s scheduling user first name', 'notification'), $postTypeName), - 'property_name' => 'scheduling_user', + 'property_name' => 'schedulingUser', 'group' => __('Scheduling user', 'notification'), ] ) @@ -241,7 +241,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s scheduling user last name', 'notification'), $postTypeName), - 'property_name' => 'scheduling_user', + 'property_name' => 'schedulingUser', 'group' => __('Scheduling user', 'notification'), ] ) @@ -256,7 +256,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s scheduling user email', 'notification'), $postTypeName), - 'property_name' => 'scheduling_user', + 'property_name' => 'schedulingUser', 'group' => __('Scheduling user', 'notification'), ] ) @@ -271,7 +271,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s scheduling user role', 'notification'), $postTypeName), - 'property_name' => 'scheduling_user', + 'property_name' => 'schedulingUser', 'group' => __('Scheduling user', 'notification'), ] ) diff --git a/src/Repository/Trigger/Post/PostTrashed.php b/src/Repository/Trigger/Post/PostTrashed.php index 0119a677..f215795f 100644 --- a/src/Repository/Trigger/Post/PostTrashed.php +++ b/src/Repository/Trigger/Post/PostTrashed.php @@ -113,7 +113,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s trashing user ID', 'notification'), $postTypeName), - 'property_name' => 'trashing_user', + 'property_name' => 'trashingUser', 'group' => __('Trashing user', 'notification'), ] ) @@ -128,7 +128,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s trashing user login', 'notification'), $postTypeName), - 'property_name' => 'trashing_user', + 'property_name' => 'trashingUser', 'group' => __('Trashing user', 'notification'), ] ) @@ -143,7 +143,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s trashing user email', 'notification'), $postTypeName), - 'property_name' => 'trashing_user', + 'property_name' => 'trashingUser', 'group' => __('Trashing user', 'notification'), ] ) @@ -158,7 +158,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s trashing user nicename', 'notification'), $postTypeName), - 'property_name' => 'trashing_user', + 'property_name' => 'trashingUser', 'group' => __('Trashing user', 'notification'), ] ) @@ -173,7 +173,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s trashing user nickname', 'notification'), $postTypeName), - 'property_name' => 'trashing_user', + 'property_name' => 'trashingUser', 'group' => __('Trashing user', 'notification'), ] ) @@ -188,7 +188,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s trashing user display name', 'notification'), $postTypeName), - 'property_name' => 'trashing_user', + 'property_name' => 'trashingUser', 'group' => __('Trashing user', 'notification'), ] ) @@ -203,7 +203,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s trashing user first name', 'notification'), $postTypeName), - 'property_name' => 'trashing_user', + 'property_name' => 'trashingUser', 'group' => __('Trashing user', 'notification'), ] ) @@ -218,7 +218,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s trashing user last name', 'notification'), $postTypeName), - 'property_name' => 'trashing_user', + 'property_name' => 'trashingUser', 'group' => __('Trashing user', 'notification'), ] ) @@ -233,7 +233,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s trashing user avatar', 'notification'), $postTypeName), - 'property_name' => 'trashing_user', + 'property_name' => 'trashingUser', 'group' => __('Trashing user', 'notification'), ] ) @@ -248,7 +248,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s trashing user role', 'notification'), $postTypeName), - 'property_name' => 'trashing_user', + 'property_name' => 'trashingUser', 'group' => __('Trashing user', 'notification'), ] ) diff --git a/src/Repository/Trigger/Post/PostTrigger.php b/src/Repository/Trigger/Post/PostTrigger.php index fc2dc149..8f3e7330 100644 --- a/src/Repository/Trigger/Post/PostTrigger.php +++ b/src/Repository/Trigger/Post/PostTrigger.php @@ -432,7 +432,7 @@ public function mergeTags() // translators: singular post name. 'name' => sprintf(__('%s last editor ID', 'notification'), $postTypeName), - 'property_name' => 'last_editor', + 'property_name' => 'lastEditor', 'group' => __('Last editor', 'notification'), ] ) @@ -448,7 +448,7 @@ public function mergeTags() // translators: singular post name. 'name' => sprintf(__('%s last editor login', 'notification'), $postTypeName), - 'property_name' => 'last_editor', + 'property_name' => 'lastEditor', 'group' => __('Last editor', 'notification'), ] ) @@ -464,7 +464,7 @@ public function mergeTags() // translators: singular post name. 'name' => sprintf(__('%s last editor email', 'notification'), $postTypeName), - 'property_name' => 'last_editor', + 'property_name' => 'lastEditor', 'group' => __('Last editor', 'notification'), ] ) @@ -480,7 +480,7 @@ public function mergeTags() // translators: singular post name. 'name' => sprintf(__('%s last editor nicename', 'notification'), $postTypeName), - 'property_name' => 'last_editor', + 'property_name' => 'lastEditor', 'group' => __('Last editor', 'notification'), ] ) @@ -496,7 +496,7 @@ public function mergeTags() // translators: singular post name. 'name' => sprintf(__('%s last editor nickname', 'notification'), $postTypeName), - 'property_name' => 'last_editor', + 'property_name' => 'lastEditor', 'group' => __('Last editor', 'notification'), ] ) @@ -512,7 +512,7 @@ public function mergeTags() // translators: singular post name. 'name' => sprintf(__('%s last editor display name', 'notification'), $postTypeName), - 'property_name' => 'last_editor', + 'property_name' => 'lastEditor', 'group' => __('Last editor', 'notification'), ] ) @@ -528,7 +528,7 @@ public function mergeTags() // translators: singular post name. 'name' => sprintf(__('%s last editor first name', 'notification'), $postTypeName), - 'property_name' => 'last_editor', + 'property_name' => 'lastEditor', 'group' => __('Last editor', 'notification'), ] ) @@ -544,7 +544,7 @@ public function mergeTags() // translators: singular post name. 'name' => sprintf(__('%s last editor last name', 'notification'), $postTypeName), - 'property_name' => 'last_editor', + 'property_name' => 'lastEditor', 'group' => __('Last editor', 'notification'), ] ) @@ -560,7 +560,7 @@ public function mergeTags() // translators: singular post name. 'name' => sprintf(__('%s last editor avatar', 'notification'), $postTypeName), - 'property_name' => 'last_editor', + 'property_name' => 'lastEditor', 'group' => __('Last editor', 'notification'), ] ) @@ -576,7 +576,7 @@ public function mergeTags() // translators: singular post name. 'name' => sprintf(__('%s last editor role', 'notification'), $postTypeName), - 'property_name' => 'last_editor', + 'property_name' => 'lastEditor', 'group' => __('Last editor', 'notification'), ] ) diff --git a/src/Repository/Trigger/Post/PostUpdated.php b/src/Repository/Trigger/Post/PostUpdated.php index 9501693d..921d62bd 100644 --- a/src/Repository/Trigger/Post/PostUpdated.php +++ b/src/Repository/Trigger/Post/PostUpdated.php @@ -135,7 +135,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s updating user ID', 'notification'), $postTypeName), - 'property_name' => 'updating_user', + 'property_name' => 'updatingUser', 'group' => __('Updating user', 'notification'), ] ) @@ -150,7 +150,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s updating user login', 'notification'), $postTypeName), - 'property_name' => 'updating_user', + 'property_name' => 'updatingUser', 'group' => __('Updating user', 'notification'), ] ) @@ -165,7 +165,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s updating user email', 'notification'), $postTypeName), - 'property_name' => 'updating_user', + 'property_name' => 'updatingUser', 'group' => __('Updating user', 'notification'), ] ) @@ -180,7 +180,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s updating user nicename', 'notification'), $postTypeName), - 'property_name' => 'updating_user', + 'property_name' => 'updatingUser', 'group' => __('Updating user', 'notification'), ] ) @@ -195,7 +195,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s updating user nickname', 'notification'), $postTypeName), - 'property_name' => 'updating_user', + 'property_name' => 'updatingUser', 'group' => __('Updating user', 'notification'), ] ) @@ -210,7 +210,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s updating user display name', 'notification'), $postTypeName), - 'property_name' => 'updating_user', + 'property_name' => 'updatingUser', 'group' => __('Updating user', 'notification'), ] ) @@ -225,7 +225,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s updating user first name', 'notification'), $postTypeName), - 'property_name' => 'updating_user', + 'property_name' => 'updatingUser', 'group' => __('Updating user', 'notification'), ] ) @@ -240,7 +240,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s updating user last name', 'notification'), $postTypeName), - 'property_name' => 'updating_user', + 'property_name' => 'updatingUser', 'group' => __('Updating user', 'notification'), ] ) @@ -255,7 +255,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s updating user email', 'notification'), $postTypeName), - 'property_name' => 'updating_user', + 'property_name' => 'updatingUser', 'group' => __('Updating user', 'notification'), ] ) @@ -270,7 +270,7 @@ public function mergeTags() ), // translators: singular post name. 'name' => sprintf(__('%s updating user role', 'notification'), $postTypeName), - 'property_name' => 'updating_user', + 'property_name' => 'updatingUser', 'group' => __('Updating user', 'notification'), ] ) From 6e49d3a7910094cab7ec6cf188ab0d3ed912957a Mon Sep 17 00:00:00 2001 From: Jakub Mikita Date: Wed, 23 Oct 2024 11:02:47 +0200 Subject: [PATCH 10/11] fix: comment triggers post author merge tags --- readme.txt | 1 + .../Trigger/Comment/CommentTrigger.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/readme.txt b/readme.txt index d644e84c..bc7081b3 100644 --- a/readme.txt +++ b/readme.txt @@ -303,6 +303,7 @@ Yes! We're offering a [custom plugin development](https://bracketspace.com/custo * [Fixed] Do not escape HTML entities in URL merge tags. * [Fixed] Fix user password setup link and user password reset link resolvers. * [Fixed] Post triggers various user merge tags. +* [Fixed] Comment triggers post author merge tags. = 9.0.1 = * [Changed] Notification data is now kept in the wp_posts table for easier reverting to previous version. diff --git a/src/Repository/Trigger/Comment/CommentTrigger.php b/src/Repository/Trigger/Comment/CommentTrigger.php index b94cd6a2..bc351294 100644 --- a/src/Repository/Trigger/Comment/CommentTrigger.php +++ b/src/Repository/Trigger/Comment/CommentTrigger.php @@ -302,7 +302,7 @@ public function mergeTags() 'slug' => 'post_author_user_ID', // Translators: singular post name. 'name' => sprintf(__('%s author user ID', 'notification'), __('Post', 'notification')), - 'property_name' => 'post_author', + 'property_name' => 'postAuthor', // Translators: Post type name. 'group' => sprintf(__('%s author', 'notification'), $postTypeName), ] @@ -315,7 +315,7 @@ public function mergeTags() 'slug' => 'post_author_user_login', // Translators: singular post name. 'name' => sprintf(__('%s author user login', 'notification'), __('Post', 'notification')), - 'property_name' => 'post_author', + 'property_name' => 'postAuthor', // Translators: Post type name. 'group' => sprintf(__('%s author', 'notification'), $postTypeName), ] @@ -328,7 +328,7 @@ public function mergeTags() 'slug' => 'post_author_user_email', // Translators: singular post name. 'name' => sprintf(__('%s author user email', 'notification'), __('Post', 'notification')), - 'property_name' => 'post_author', + 'property_name' => 'postAuthor', // Translators: Post type name. 'group' => sprintf(__('%s author', 'notification'), $postTypeName), ] @@ -341,7 +341,7 @@ public function mergeTags() 'slug' => 'post_author_user_nicename', // Translators: singular post name. 'name' => sprintf(__('%s author user nicename', 'notification'), __('Post', 'notification')), - 'property_name' => 'post_author', + 'property_name' => 'postAuthor', // Translators: Post type name. 'group' => sprintf(__('%s author', 'notification'), $postTypeName), ] @@ -354,7 +354,7 @@ public function mergeTags() 'slug' => 'post_author_user_nickname', // Translators: singular post name. 'name' => sprintf(__('%s author user nickname', 'notification'), __('Post', 'notification')), - 'property_name' => 'post_author', + 'property_name' => 'postAuthor', // Translators: Post type name. 'group' => sprintf(__('%s author', 'notification'), $postTypeName), ] @@ -367,7 +367,7 @@ public function mergeTags() 'slug' => 'post_author_user_display_name', // Translators: singular post name. 'name' => sprintf(__('%s author user display name', 'notification'), __('Post', 'notification')), - 'property_name' => 'post_author', + 'property_name' => 'postAuthor', // Translators: Post type name. 'group' => sprintf(__('%s author', 'notification'), $postTypeName), ] @@ -380,7 +380,7 @@ public function mergeTags() 'slug' => 'post_author_user_firstname', // Translators: singular post name. 'name' => sprintf(__('%s author user first name', 'notification'), __('Post', 'notification')), - 'property_name' => 'post_author', + 'property_name' => 'postAuthor', // Translators: Post type name. 'group' => sprintf(__('%s author', 'notification'), $postTypeName), ] @@ -393,7 +393,7 @@ public function mergeTags() 'slug' => 'post_author_user_lastname', // Translators: singular post name. 'name' => sprintf(__('%s author user last name', 'notification'), __('Post', 'notification')), - 'property_name' => 'post_author', + 'property_name' => 'postAuthor', // Translators: Post type name. 'group' => sprintf(__('%s author', 'notification'), $postTypeName), ] From 82a2d7880831e6f78598d18b6a54b28d31536468 Mon Sep 17 00:00:00 2001 From: BracketSpaceWorker Date: Wed, 23 Oct 2024 10:33:35 +0000 Subject: [PATCH 11/11] Version bump --- notification.php | 2 +- readme.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/notification.php b/notification.php index 0e6156db..dfa5062f 100644 --- a/notification.php +++ b/notification.php @@ -4,7 +4,7 @@ * Description: Customisable email and webhook notifications with powerful developer friendly API for custom triggers and notifications. Send alerts easily. * Author: BracketSpace * Author URI: https://bracketspace.com - * Version: 9.0.1 + * Version: 9.0.2 * Requires PHP: 7.4 * Requires at least: 5.8 * License: GPL3 diff --git a/readme.txt b/readme.txt index bc7081b3..759522cc 100644 --- a/readme.txt +++ b/readme.txt @@ -3,7 +3,7 @@ Contributors: notification, bracketspace, Kubitomakita, tomaszadamowicz, insejn, Tags: notification, notify, alert, email, mail, webhook, API, developer, framework Requires at least: 4.9 Tested up to: 6.6 -Stable tag: 9.0.1 +Stable tag: 9.0.2 Requires PHP: 7.4 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -297,7 +297,7 @@ Yes! We're offering a [custom plugin development](https://bracketspace.com/custo == Changelog == -= [Next] = += 9.0.2 = * [Fixed] WP CLI add command function is not giving warnings anymore. * [Fixed] Comment author email and display name merge tags. * [Fixed] Do not escape HTML entities in URL merge tags.