From a71aa6c36dade029de2b9158b0b88d88e5b74647 Mon Sep 17 00:00:00 2001 From: "lee.5151" <lee.5151@osu.edu> Date: Mon, 14 Nov 2022 14:50:57 -0500 Subject: [PATCH] Upgrading drupal/honeypot (2.1.0 => 2.1.2) --- composer.json | 2 +- composer.lock | 106 ++--- vendor/composer/installed.json | 130 +++--- vendor/composer/installed.php | 52 +-- vendor/symfony/console/Application.php | 24 +- vendor/symfony/http-kernel/HttpKernel.php | 12 +- vendor/symfony/http-kernel/Kernel.php | 6 +- vendor/symfony/http-kernel/Log/Logger.php | 16 +- vendor/symfony/polyfill-php72/Php72.php | 6 +- vendor/symfony/polyfill-php72/composer.json | 2 +- vendor/symfony/polyfill-php73/composer.json | 2 +- .../Resources/stubs/ReturnTypeWillChange.php | 9 + vendor/symfony/polyfill-php81/composer.json | 2 +- .../Resources/translations/validators.af.xlf | 16 + .../Resources/translations/validators.az.xlf | 16 + .../Resources/translations/validators.ur.xlf | 407 ++++++++++++++++++ .../config/optional/tour.tour.honeypot.yml | 14 +- web/modules/honeypot/honeypot.info.yml | 6 +- web/modules/honeypot/honeypot.install | 3 + web/modules/honeypot/honeypot.post_update.php | 73 ++++ web/modules/honeypot/src/HoneypotService.php | 15 +- .../honeypot_test/honeypot_test.info.yml | 6 +- .../HoneypotFileFieldTest.php | 42 ++ 23 files changed, 781 insertions(+), 186 deletions(-) create mode 100644 vendor/symfony/validator/Resources/translations/validators.ur.xlf create mode 100644 web/modules/honeypot/honeypot.post_update.php create mode 100644 web/modules/honeypot/tests/src/FunctionalJavascript/HoneypotFileFieldTest.php diff --git a/composer.json b/composer.json index 69998b3eb7..0a4ad24ea7 100644 --- a/composer.json +++ b/composer.json @@ -126,7 +126,7 @@ "drupal/focal_point": "1.5", "drupal/google_analytics": "^4.0", "drupal/google_tag": "1.4", - "drupal/honeypot": "2.1.0", + "drupal/honeypot": "2.1.2", "drupal/inline_entity_form": "1.0-rc9", "drupal/libraries": "3.0-beta1", "drupal/link_attributes": "1.11", diff --git a/composer.lock b/composer.lock index 47919d38c6..095d65a735 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e19bbc8cca8ae09736e3d9b709548c69", + "content-hash": "fd0ccf7c087dd3a1e90fb2103f5e6b62", "packages": [ { "name": "alchemy/zippy", @@ -4644,17 +4644,17 @@ }, { "name": "drupal/honeypot", - "version": "2.1.0", + "version": "2.1.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/honeypot.git", - "reference": "2.1.0" + "reference": "2.1.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/honeypot-2.1.0.zip", - "reference": "2.1.0", - "shasum": "7ddb2d0bfeaa65d55823d82bdf01c9c330a1e12f" + "url": "https://ftp.drupal.org/files/projects/honeypot-2.1.2.zip", + "reference": "2.1.2", + "shasum": "9511fd6db37c153f2290950bf79611b27510cede" }, "require": { "drupal/core": "^9.2 || ^10" @@ -4665,8 +4665,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.0", - "datestamp": "1654198317", + "version": "2.1.2", + "datestamp": "1664658244", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -12864,16 +12864,16 @@ }, { "name": "symfony/console", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7" + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4f40012db8d55c956406890b5720f686fee7f7b7", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7", + "url": "https://api.github.com/repos/symfony/console/zipball/8e70c1cab07ac641b885ce80385b9824a293c623", + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623", "shasum": "" }, "require": { @@ -12934,7 +12934,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.47" + "source": "https://github.com/symfony/console/tree/v4.4.48" }, "funding": [ { @@ -12950,7 +12950,7 @@ "type": "tidelift" } ], - "time": "2022-10-04T05:58:30+00:00" + "time": "2022-10-26T16:02:45+00:00" }, { "name": "symfony/css-selector", @@ -13896,16 +13896,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811" + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7eea76ae186c68466e7676e62812ce2769f96811", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cd4f478e67f7c8776a13b17e7d44241fd66261ad", + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad", "shasum": "" }, "require": { @@ -13944,7 +13944,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.47" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.48" }, "funding": [ { @@ -13960,20 +13960,20 @@ "type": "tidelift" } ], - "time": "2022-10-01T21:39:02+00:00" + "time": "2022-10-12T09:40:54+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d" + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/91cf5dbc9ea4d902470e596246a736179acfb79d", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a6d5229dd9466e046674baad8449ad92ee24eddd", + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd", "shasum": "" }, "require": { @@ -14048,7 +14048,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.47" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.48" }, "funding": [ { @@ -14064,7 +14064,7 @@ "type": "tidelift" } ], - "time": "2022-10-12T07:05:45+00:00" + "time": "2022-10-28T16:49:22+00:00" }, { "name": "symfony/mime", @@ -14570,16 +14570,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "shasum": "" }, "require": { @@ -14588,7 +14588,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -14626,7 +14626,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" }, "funding": [ { @@ -14642,20 +14642,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", "shasum": "" }, "require": { @@ -14664,7 +14664,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -14705,7 +14705,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" }, "funding": [ { @@ -14721,7 +14721,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", @@ -14808,16 +14808,16 @@ }, { "name": "symfony/polyfill-php81", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", "shasum": "" }, "require": { @@ -14826,7 +14826,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -14867,7 +14867,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" }, "funding": [ { @@ -14883,7 +14883,7 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", @@ -15470,16 +15470,16 @@ }, { "name": "symfony/validator", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8" + "reference": "54781a4c41efbd283b779110bf8ae7f263737775" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/37456082bb034cb5f2d8602471a0de6c448535b8", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8", + "url": "https://api.github.com/repos/symfony/validator/zipball/54781a4c41efbd283b779110bf8ae7f263737775", + "reference": "54781a4c41efbd283b779110bf8ae7f263737775", "shasum": "" }, "require": { @@ -15556,7 +15556,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v4.4.47" + "source": "https://github.com/symfony/validator/tree/v4.4.48" }, "funding": [ { @@ -15572,7 +15572,7 @@ "type": "tidelift" } ], - "time": "2022-10-01T17:13:09+00:00" + "time": "2022-10-25T13:54:11+00:00" }, { "name": "symfony/var-dumper", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index ce7df05764..cb863e5c41 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -4791,18 +4791,18 @@ }, { "name": "drupal/honeypot", - "version": "2.1.0", - "version_normalized": "2.1.0.0", + "version": "2.1.2", + "version_normalized": "2.1.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/honeypot.git", - "reference": "2.1.0" + "reference": "2.1.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/honeypot-2.1.0.zip", - "reference": "2.1.0", - "shasum": "7ddb2d0bfeaa65d55823d82bdf01c9c330a1e12f" + "url": "https://ftp.drupal.org/files/projects/honeypot-2.1.2.zip", + "reference": "2.1.2", + "shasum": "9511fd6db37c153f2290950bf79611b27510cede" }, "require": { "drupal/core": "^9.2 || ^10" @@ -4813,8 +4813,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.0", - "datestamp": "1651894953", + "version": "2.1.2", + "datestamp": "1664658244", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4832,16 +4832,16 @@ "authors": [ { "name": "Jeff Geerling", - "homepage": "https://www.drupal.org/user/213194", + "homepage": "https://www.drupal.org/user/389011", "email": "geerlingguy@mac.com" }, { - "name": "TR", - "homepage": "https://www.drupal.org/user/202830" + "name": "Manuel Garcia", + "homepage": "https://www.drupal.org/user/213194" }, { - "name": "geerlingguy", - "homepage": "https://www.drupal.org/user/389011" + "name": "TR", + "homepage": "https://www.drupal.org/user/202830" }, { "name": "vijaycs85", @@ -13346,17 +13346,17 @@ }, { "name": "symfony/console", - "version": "v4.4.47", - "version_normalized": "4.4.47.0", + "version": "v4.4.48", + "version_normalized": "4.4.48.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7" + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4f40012db8d55c956406890b5720f686fee7f7b7", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7", + "url": "https://api.github.com/repos/symfony/console/zipball/8e70c1cab07ac641b885ce80385b9824a293c623", + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623", "shasum": "" }, "require": { @@ -13391,7 +13391,7 @@ "symfony/lock": "", "symfony/process": "" }, - "time": "2022-10-04T05:58:30+00:00", + "time": "2022-10-26T16:02:45+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -13419,7 +13419,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.47" + "source": "https://github.com/symfony/console/tree/v4.4.48" }, "funding": [ { @@ -14417,17 +14417,17 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.47", - "version_normalized": "4.4.47.0", + "version": "v4.4.48", + "version_normalized": "4.4.48.0", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811" + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7eea76ae186c68466e7676e62812ce2769f96811", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cd4f478e67f7c8776a13b17e7d44241fd66261ad", + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad", "shasum": "" }, "require": { @@ -14440,7 +14440,7 @@ "predis/predis": "~1.0", "symfony/expression-language": "^3.4|^4.0|^5.0" }, - "time": "2022-10-01T21:39:02+00:00", + "time": "2022-10-12T09:40:54+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -14468,7 +14468,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.47" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.48" }, "funding": [ { @@ -14488,17 +14488,17 @@ }, { "name": "symfony/http-kernel", - "version": "v4.4.47", - "version_normalized": "4.4.47.0", + "version": "v4.4.48", + "version_normalized": "4.4.48.0", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d" + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/91cf5dbc9ea4d902470e596246a736179acfb79d", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a6d5229dd9466e046674baad8449ad92ee24eddd", + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd", "shasum": "" }, "require": { @@ -14547,7 +14547,7 @@ "symfony/console": "", "symfony/dependency-injection": "" }, - "time": "2022-10-12T07:05:45+00:00", + "time": "2022-10-28T16:49:22+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -14575,7 +14575,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.47" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.48" }, "funding": [ { @@ -15115,27 +15115,27 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.26.0", - "version_normalized": "1.26.0.0", + "version": "v1.27.0", + "version_normalized": "1.27.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "shasum": "" }, "require": { "php": ">=7.1" }, - "time": "2022-05-24T11:49:31+00:00", + "time": "2022-11-03T14:55:06+00:00", "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -15174,7 +15174,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" }, "funding": [ { @@ -15194,27 +15194,27 @@ }, { "name": "symfony/polyfill-php73", - "version": "v1.26.0", - "version_normalized": "1.26.0.0", + "version": "v1.27.0", + "version_normalized": "1.27.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", - "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", "shasum": "" }, "require": { "php": ">=7.1" }, - "time": "2022-05-24T11:49:31+00:00", + "time": "2022-11-03T14:55:06+00:00", "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -15256,7 +15256,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" }, "funding": [ { @@ -15362,27 +15362,27 @@ }, { "name": "symfony/polyfill-php81", - "version": "v1.26.0", - "version_normalized": "1.26.0.0", + "version": "v1.27.0", + "version_normalized": "1.27.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", - "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", + "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", "shasum": "" }, "require": { "php": ">=7.1" }, - "time": "2022-05-24T11:49:31+00:00", + "time": "2022-11-03T14:55:06+00:00", "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -15424,7 +15424,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" }, "funding": [ { @@ -16048,17 +16048,17 @@ }, { "name": "symfony/validator", - "version": "v4.4.47", - "version_normalized": "4.4.47.0", + "version": "v4.4.48", + "version_normalized": "4.4.48.0", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8" + "reference": "54781a4c41efbd283b779110bf8ae7f263737775" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/37456082bb034cb5f2d8602471a0de6c448535b8", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8", + "url": "https://api.github.com/repos/symfony/validator/zipball/54781a4c41efbd283b779110bf8ae7f263737775", + "reference": "54781a4c41efbd283b779110bf8ae7f263737775", "shasum": "" }, "require": { @@ -16109,7 +16109,7 @@ "symfony/translation": "For translating validation errors.", "symfony/yaml": "" }, - "time": "2022-10-01T17:13:09+00:00", + "time": "2022-10-25T13:54:11+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -16137,7 +16137,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v4.4.47" + "source": "https://github.com/symfony/validator/tree/v4.4.48" }, "funding": [ { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 4e7710b1a9..2d2284782f 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'osu-asc-webservices/d8-upstream', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'a951dabf39faebf5051f29113cc4cde06dffbcca', + 'reference' => 'ec8f1fc59e22f9cb9307f144ff097d99430d51ad', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -848,9 +848,9 @@ 'dev_requirement' => false, ), 'drupal/honeypot' => array( - 'pretty_version' => '2.1.0', - 'version' => '2.1.0.0', - 'reference' => '2.1.0', + 'pretty_version' => '2.1.2', + 'version' => '2.1.2.0', + 'reference' => '2.1.2', 'type' => 'drupal-module', 'install_path' => __DIR__ . '/../../web/modules/honeypot', 'aliases' => array(), @@ -1594,7 +1594,7 @@ 'osu-asc-webservices/d8-upstream' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => 'a951dabf39faebf5051f29113cc4cde06dffbcca', + 'reference' => 'ec8f1fc59e22f9cb9307f144ff097d99430d51ad', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -2154,9 +2154,9 @@ 'dev_requirement' => false, ), 'symfony/console' => array( - 'pretty_version' => 'v4.4.47', - 'version' => '4.4.47.0', - 'reference' => '4f40012db8d55c956406890b5720f686fee7f7b7', + 'pretty_version' => 'v4.4.48', + 'version' => '4.4.48.0', + 'reference' => '8e70c1cab07ac641b885ce80385b9824a293c623', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/console', 'aliases' => array(), @@ -2277,18 +2277,18 @@ 'dev_requirement' => false, ), 'symfony/http-foundation' => array( - 'pretty_version' => 'v4.4.47', - 'version' => '4.4.47.0', - 'reference' => '7eea76ae186c68466e7676e62812ce2769f96811', + 'pretty_version' => 'v4.4.48', + 'version' => '4.4.48.0', + 'reference' => 'cd4f478e67f7c8776a13b17e7d44241fd66261ad', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/http-foundation', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/http-kernel' => array( - 'pretty_version' => 'v4.4.47', - 'version' => '4.4.47.0', - 'reference' => '91cf5dbc9ea4d902470e596246a736179acfb79d', + 'pretty_version' => 'v4.4.48', + 'version' => '4.4.48.0', + 'reference' => 'a6d5229dd9466e046674baad8449ad92ee24eddd', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/http-kernel', 'aliases' => array(), @@ -2349,18 +2349,18 @@ 'dev_requirement' => false, ), 'symfony/polyfill-php72' => array( - 'pretty_version' => 'v1.26.0', - 'version' => '1.26.0.0', - 'reference' => 'bf44a9fd41feaac72b074de600314a93e2ae78e2', + 'pretty_version' => 'v1.27.0', + 'version' => '1.27.0.0', + 'reference' => '869329b1e9894268a8a61dabb69153029b7a8c97', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-php72', 'aliases' => array(), 'dev_requirement' => false, ), 'symfony/polyfill-php73' => array( - 'pretty_version' => 'v1.26.0', - 'version' => '1.26.0.0', - 'reference' => 'e440d35fa0286f77fb45b79a03fedbeda9307e85', + 'pretty_version' => 'v1.27.0', + 'version' => '1.27.0.0', + 'reference' => '9e8ecb5f92152187c4799efd3c96b78ccab18ff9', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-php73', 'aliases' => array(), @@ -2376,9 +2376,9 @@ 'dev_requirement' => false, ), 'symfony/polyfill-php81' => array( - 'pretty_version' => 'v1.26.0', - 'version' => '1.26.0.0', - 'reference' => '13f6d1271c663dc5ae9fb843a8f16521db7687a1', + 'pretty_version' => 'v1.27.0', + 'version' => '1.27.0.0', + 'reference' => '707403074c8ea6e2edaf8794b0157a0bfa52157a', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/polyfill-php81', 'aliases' => array(), @@ -2460,9 +2460,9 @@ ), ), 'symfony/validator' => array( - 'pretty_version' => 'v4.4.47', - 'version' => '4.4.47.0', - 'reference' => '37456082bb034cb5f2d8602471a0de6c448535b8', + 'pretty_version' => 'v4.4.48', + 'version' => '4.4.48.0', + 'reference' => '54781a4c41efbd283b779110bf8ae7f263737775', 'type' => 'library', 'install_path' => __DIR__ . '/../symfony/validator', 'aliases' => array(), diff --git a/vendor/symfony/console/Application.php b/vendor/symfony/console/Application.php index 1021a900f0..42c4911a0f 100644 --- a/vendor/symfony/console/Application.php +++ b/vendor/symfony/console/Application.php @@ -254,7 +254,9 @@ public function doRun(InputInterface $input, OutputInterface $output) $alternative = $alternatives[0]; $style = new SymfonyStyle($input, $output); - $style->block(sprintf("\nCommand \"%s\" is not defined.\n", $name), null, 'error'); + $output->writeln(''); + $formattedBlock = (new FormatterHelper())->formatBlock(sprintf('Command "%s" is not defined.', $name), 'error', true); + $output->writeln($formattedBlock); if (!$style->confirm(sprintf('Do you want to run "%s" instead? ', $alternative), false)) { if (null !== $this->dispatcher) { $event = new ConsoleErrorEvent($input, $output, $e); @@ -955,11 +957,21 @@ protected function configureIO(InputInterface $input, OutputInterface $output) } switch ($shellVerbosity = (int) getenv('SHELL_VERBOSITY')) { - case -1: $output->setVerbosity(OutputInterface::VERBOSITY_QUIET); break; - case 1: $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE); break; - case 2: $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE); break; - case 3: $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG); break; - default: $shellVerbosity = 0; break; + case -1: + $output->setVerbosity(OutputInterface::VERBOSITY_QUIET); + break; + case 1: + $output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE); + break; + case 2: + $output->setVerbosity(OutputInterface::VERBOSITY_VERY_VERBOSE); + break; + case 3: + $output->setVerbosity(OutputInterface::VERBOSITY_DEBUG); + break; + default: + $shellVerbosity = 0; + break; } if (true === $input->hasParameterOption(['--quiet', '-q'], true)) { diff --git a/vendor/symfony/http-kernel/HttpKernel.php b/vendor/symfony/http-kernel/HttpKernel.php index d53b80665b..e23023d3c4 100644 --- a/vendor/symfony/http-kernel/HttpKernel.php +++ b/vendor/symfony/http-kernel/HttpKernel.php @@ -112,7 +112,17 @@ public function terminateWithException(\Throwable $exception, Request $request = throw $exception; } - $response = $this->handleThrowable($exception, $request, self::MASTER_REQUEST); + if ($pop = $request !== $this->requestStack->getMasterRequest()) { + $this->requestStack->push($request); + } + + try { + $response = $this->handleThrowable($exception, $request, self::MASTER_REQUEST); + } finally { + if ($pop) { + $this->requestStack->pop(); + } + } $response->sendHeaders(); $response->sendContent(); diff --git a/vendor/symfony/http-kernel/Kernel.php b/vendor/symfony/http-kernel/Kernel.php index f944b3d9e6..54ea465379 100644 --- a/vendor/symfony/http-kernel/Kernel.php +++ b/vendor/symfony/http-kernel/Kernel.php @@ -76,11 +76,11 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl private static $freshCache = []; - public const VERSION = '4.4.47'; - public const VERSION_ID = 40447; + public const VERSION = '4.4.48'; + public const VERSION_ID = 40448; public const MAJOR_VERSION = 4; public const MINOR_VERSION = 4; - public const RELEASE_VERSION = 47; + public const RELEASE_VERSION = 48; public const EXTRA_VERSION = ''; public const END_OF_MAINTENANCE = '11/2022'; diff --git a/vendor/symfony/http-kernel/Log/Logger.php b/vendor/symfony/http-kernel/Log/Logger.php index d7f297f586..1238517f64 100644 --- a/vendor/symfony/http-kernel/Log/Logger.php +++ b/vendor/symfony/http-kernel/Log/Logger.php @@ -44,10 +44,14 @@ public function __construct(string $minLevel = null, $output = null, callable $f if (isset($_ENV['SHELL_VERBOSITY']) || isset($_SERVER['SHELL_VERBOSITY'])) { switch ((int) ($_ENV['SHELL_VERBOSITY'] ?? $_SERVER['SHELL_VERBOSITY'])) { - case -1: $minLevel = LogLevel::ERROR; break; - case 1: $minLevel = LogLevel::NOTICE; break; - case 2: $minLevel = LogLevel::INFO; break; - case 3: $minLevel = LogLevel::DEBUG; break; + case -1: $minLevel = LogLevel::ERROR; + break; + case 1: $minLevel = LogLevel::NOTICE; + break; + case 2: $minLevel = LogLevel::INFO; + break; + case 3: $minLevel = LogLevel::DEBUG; + break; } } } @@ -80,7 +84,7 @@ public function log($level, $message, array $context = []) $formatter = $this->formatter; if ($this->handle) { - @fwrite($this->handle, $formatter($level, $message, $context)); + @fwrite($this->handle, $formatter($level, $message, $context).\PHP_EOL); } else { error_log($formatter($level, $message, $context, false)); } @@ -105,7 +109,7 @@ private function format(string $level, string $message, array $context, bool $pr $message = strtr($message, $replacements); } - $log = sprintf('[%s] %s', $level, $message).\PHP_EOL; + $log = sprintf('[%s] %s', $level, $message); if ($prefixDate) { $log = date(\DateTime::RFC3339).' '.$log; } diff --git a/vendor/symfony/polyfill-php72/Php72.php b/vendor/symfony/polyfill-php72/Php72.php index 5e20d5bf8f..7bf96c9969 100644 --- a/vendor/symfony/polyfill-php72/Php72.php +++ b/vendor/symfony/polyfill-php72/Php72.php @@ -83,7 +83,7 @@ public static function php_os_family() 'SunOS' => 'Solaris', ]; - return isset($map[\PHP_OS]) ? $map[\PHP_OS] : 'Unknown'; + return $map[\PHP_OS] ?? 'Unknown'; } public static function spl_object_id($object) @@ -96,7 +96,7 @@ public static function spl_object_id($object) } // On 32-bit systems, PHP_INT_SIZE is 4, - return self::$hashMask ^ hexdec(substr($hash, 16 - (\PHP_INT_SIZE * 2 - 1), (\PHP_INT_SIZE * 2 - 1))); + return self::$hashMask ^ hexdec(substr($hash, 16 - (\PHP_INT_SIZE * 2 - 1), \PHP_INT_SIZE * 2 - 1)); } public static function sapi_windows_vt100_support($stream, $enable = null) @@ -167,7 +167,7 @@ private static function initHashMask() self::$hashMask = (int) substr(ob_get_clean(), 17); } - self::$hashMask ^= hexdec(substr(spl_object_hash($obj), 16 - (\PHP_INT_SIZE * 2 - 1), (\PHP_INT_SIZE * 2 - 1))); + self::$hashMask ^= hexdec(substr(spl_object_hash($obj), 16 - (\PHP_INT_SIZE * 2 - 1), \PHP_INT_SIZE * 2 - 1)); } public static function mb_chr($code, $encoding = null) diff --git a/vendor/symfony/polyfill-php72/composer.json b/vendor/symfony/polyfill-php72/composer.json index 4eac690e08..5f17af3438 100644 --- a/vendor/symfony/polyfill-php72/composer.json +++ b/vendor/symfony/polyfill-php72/composer.json @@ -25,7 +25,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", diff --git a/vendor/symfony/polyfill-php73/composer.json b/vendor/symfony/polyfill-php73/composer.json index af0cf42d23..b5c58ec193 100644 --- a/vendor/symfony/polyfill-php73/composer.json +++ b/vendor/symfony/polyfill-php73/composer.json @@ -26,7 +26,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", diff --git a/vendor/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php b/vendor/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php index f4cad34f64..cb7720a8da 100644 --- a/vendor/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php +++ b/vendor/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php @@ -1,5 +1,14 @@ <?php +/* + * This file is part of the Symfony package. + * + * (c) Fabien Potencier <fabien@symfony.com> + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + if (\PHP_VERSION_ID < 80100) { #[Attribute(Attribute::TARGET_METHOD)] final class ReturnTypeWillChange diff --git a/vendor/symfony/polyfill-php81/composer.json b/vendor/symfony/polyfill-php81/composer.json index 014da788e3..149b598215 100644 --- a/vendor/symfony/polyfill-php81/composer.json +++ b/vendor/symfony/polyfill-php81/composer.json @@ -26,7 +26,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", diff --git a/vendor/symfony/validator/Resources/translations/validators.af.xlf b/vendor/symfony/validator/Resources/translations/validators.af.xlf index 61b9eac232..d1dcf3ec8f 100644 --- a/vendor/symfony/validator/Resources/translations/validators.af.xlf +++ b/vendor/symfony/validator/Resources/translations/validators.af.xlf @@ -382,6 +382,22 @@ <source>This value is not a valid International Securities Identification Number (ISIN).</source> <target>Hierdie waarde is nie 'n geldige Internasionale veiligheidsidentifikasienommer (ISIN) nie.</target> </trans-unit> + <trans-unit id="100"> + <source>This value should be a valid expression.</source> + <target>Hierdie waarde moet 'n geldige uitdrukking wees.</target> + </trans-unit> + <trans-unit id="101"> + <source>This value is not a valid CSS color.</source> + <target>Hierdie waarde is nie 'n geldige CSS-kleur nie.</target> + </trans-unit> + <trans-unit id="102"> + <source>This value is not a valid CIDR notation.</source> + <target>Hierdie waarde is nie 'n geldige CIDR-notasie nie.</target> + </trans-unit> + <trans-unit id="103"> + <source>The value of the netmask should be between {{ min }} and {{ max }}.</source> + <target>Die waarde van die netmasker moet tussen {{ min }} en {{ max }} wees.</target> + </trans-unit> </body> </file> </xliff> diff --git a/vendor/symfony/validator/Resources/translations/validators.az.xlf b/vendor/symfony/validator/Resources/translations/validators.az.xlf index 59480874fd..b3e0999304 100644 --- a/vendor/symfony/validator/Resources/translations/validators.az.xlf +++ b/vendor/symfony/validator/Resources/translations/validators.az.xlf @@ -386,6 +386,22 @@ <source>This value is not a valid International Securities Identification Number (ISIN).</source> <target>Bu dəyər doğru bir Qiymətli Kağızın Beynəlxalq İdentifikasiya Kodu (ISIN) deyil.</target> </trans-unit> + <trans-unit id="100"> + <source>This value should be a valid expression.</source> + <target>Bu dəyər etibarlı ifadə olmalıdır.</target> + </trans-unit> + <trans-unit id="101"> + <source>This value is not a valid CSS color.</source> + <target>Bu dəyər etibarlı CSS rəngi deyil.</target> + </trans-unit> + <trans-unit id="102"> + <source>This value is not a valid CIDR notation.</source> + <target>Bu dəyər etibarlı CIDR notasiyası deyil.</target> + </trans-unit> + <trans-unit id="103"> + <source>The value of the netmask should be between {{ min }} and {{ max }}.</source> + <target>Şəbəkə maskasının dəyəri {{ min }} və {{ max }} arasında olmalıdır.</target> + </trans-unit> </body> </file> </xliff> diff --git a/vendor/symfony/validator/Resources/translations/validators.ur.xlf b/vendor/symfony/validator/Resources/translations/validators.ur.xlf new file mode 100644 index 0000000000..c2b1149429 --- /dev/null +++ b/vendor/symfony/validator/Resources/translations/validators.ur.xlf @@ -0,0 +1,407 @@ +<?xml version="1.0"?> +<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"> + <file source-language="ur" datatype="plaintext" original="file.ext"> + <body> + <trans-unit id="1"> + <source>This value should be false.</source> + <target>یہ ويليو غلط ہونی چاہیے</target> + </trans-unit> + <trans-unit id="2"> + <source>This value should be true.</source> + <target>یہ ويليو درست ہونی چاہیے</target> + </trans-unit> + <trans-unit id="3"> + <source>This value should be of type {{ type }}.</source> + <target>قسم کی ہونی چاہیے {{type}} يھ ويليو</target> + </trans-unit> + <trans-unit id="4"> + <source>This value should be blank.</source> + <target>یہ ويليو خالی ہونی چاہیے</target> + </trans-unit> + <trans-unit id="5"> + <source>The value you selected is not a valid choice.</source> + <target>آپ نے جو ويليو منتخب کی ہے وہ درست انتخاب نہیں ہے</target> + </trans-unit> + <trans-unit id="6"> + <source>You must select at least {{ limit }} choice.|You must select at least {{ limit }} choices.</source> + <target>کا انتخاب کرنا چاہیے {{limit}} کا انتخاب کرنا چاہیے ۔آّپ کو کم اذ کم {{limit}} آپ کو کم از کم</target> + </trans-unit> + <trans-unit id="7"> + <source>You must select at most {{ limit }} choice.|You must select at most {{ limit }} choices.</source> + <target>کا انتخاب کرنا چاہیے {{limit}} کا انتخاب کرنا چاہیے ۔آّپ کو ذيادھ سے ذيادھ {{limit}} آپ کو ذيادھ سے ذيادھ</target> + </trans-unit> + <trans-unit id="8"> + <source>One or more of the given values is invalid.</source> + <target>دی گئی ويليوذ میں سے ایک یا زیادھ ويليوذ غلط ہیں</target> + </trans-unit> + <trans-unit id="9"> + <source>This field was not expected.</source> + <target>اس فیلڈ کی توقع نہیں تھی</target> + </trans-unit> + <trans-unit id="10"> + <source>This field is missing.</source> + <target>یہ فیلڈ غائب ہے</target> + </trans-unit> + <trans-unit id="11"> + <source>This value is not a valid date.</source> + <target>یہ ويليو درست تاریخ نہیں ہے</target> + </trans-unit> + <trans-unit id="12"> + <source>This value is not a valid datetime.</source> + <target>یہ ويليو درست تاریخ وقت نہیں ہے</target> + </trans-unit> + <trans-unit id="13"> + <source>This value is not a valid email address.</source> + <target>یہ ويليو درست ای میل ایڈریس نہیں ہے</target> + </trans-unit> + <trans-unit id="14"> + <source>The file could not be found.</source> + <target>فائل نہیں مل سکی</target> + </trans-unit> + <trans-unit id="15"> + <source>The file is not readable.</source> + <target>فائل پڑھنے کے قابل نہیں ہے</target> + </trans-unit> + <trans-unit id="16"> + <source>The file is too large ({{ size }} {{ suffix }}). Allowed maximum size is {{ limit }} {{ suffix }}.</source> + <target>{{ suffix }} {{ limit }} زیادہ سے زیادہ سائز کی اجازت ہے {{ suffix }}) ({{ size }} فائل بہت بڑی ہے</target> + </trans-unit> + <trans-unit id="17"> + <source>The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.</source> + <target>ہیں {{ types }} مائیم کی قسمیں ({{ type }}) فائل کی ماۂيم قسم غلط ہے</target> + </trans-unit> + <trans-unit id="18"> + <source>This value should be {{ limit }} or less.</source> + <target>یا اس سے کم ہونی چاہیے {{ limit }} یہ ويليو</target> + </trans-unit> + <trans-unit id="19"> + <source>This value is too long. It should have {{ limit }} character or less.|This value is too long. It should have {{ limit }} characters or less.</source> + <target>حروف یا اس سے کم ہونے چاہئیں {{ limit }} حرف یا اس سے کم ہونا چاہیے۔|یہ ويليو بہت لمبی ہے۔ اس میں{{ limit }} یہ ويليو بہت لمبی ہے۔ اس میں</target> + </trans-unit> + <trans-unit id="20"> + <source>This value should be {{ limit }} or more.</source> + <target>یا اس سے زیادہ ہونی چاہیے {{ limit }} یہ ويليو</target> + </trans-unit> + <trans-unit id="21"> + <source>This value is too short. It should have {{ limit }} character or more.|This value is too short. It should have {{ limit }} characters or more.</source> + <target>حروف یا اس سے زیادہ ہونے چاہئیں {{ limit }} حرف یا اس سے زیادہ ہونا چاہیے۔|یہ ويليو بہت چھوٹی ہے۔ اس میں{{ limit }} یہ ويليو بہت مختصر ہے۔ اس میں</target> + </trans-unit> + <trans-unit id="22"> + <source>This value should not be blank.</source> + <target>یہ ويليو خالی نہیں ہونی چاہیے</target> + </trans-unit> + <trans-unit id="23"> + <source>This value should not be null.</source> + <target>یہ ويليو خالی نہیں ہونی چاہیے</target> + </trans-unit> + <trans-unit id="24"> + <source>This value should be null.</source> + <target>یہ ويليو خالی ہونی چاہیے</target> + </trans-unit> + <trans-unit id="25"> + <source>This value is not valid.</source> + <target>یہ ويليو درست نہیں ہے</target> + </trans-unit> + <trans-unit id="26"> + <source>This value is not a valid time.</source> + <target>یہ ويليو درست وقت نہیں ہے</target> + </trans-unit> + <trans-unit id="27"> + <source>This value is not a valid URL.</source> + <target>نہیں ہے URL یہ ويليو درست</target> + </trans-unit> + <trans-unit id="31"> + <source>The two values should be equal.</source> + <target>دونوں ويليوذ برابر ہونی چاہئیں</target> + </trans-unit> + <trans-unit id="32"> + <source>The file is too large. Allowed maximum size is {{ limit }} {{ suffix }}.</source> + <target>{{ suffix }} {{ limit }} فائل بہت بڑی ہے۔ زیادہ سے زیادہ سائز کی اجازت ہے</target> + </trans-unit> + <trans-unit id="33"> + <source>The file is too large.</source> + <target>فائل بہت بڑی ہے</target> + </trans-unit> + <trans-unit id="34"> + <source>The file could not be uploaded.</source> + <target>فائل اپ لوڈ نہیں ہو سکی</target> + </trans-unit> + <trans-unit id="35"> + <source>This value should be a valid number.</source> + <target>یہ ويليو ایک درست نمبر ہونی چاہیے</target> + </trans-unit> + <trans-unit id="36"> + <source>This file is not a valid image.</source> + <target>یہ فائل درست تصویر نہیں ہے</target> + </trans-unit> + <trans-unit id="37"> + <source>This is not a valid IP address.</source> + <target>ایڈریس نہیں ہے IP یہ ایک درست</target> + </trans-unit> + <trans-unit id="38"> + <source>This value is not a valid language.</source> + <target>یہ ويليو درست زبان نہیں ہے</target> + </trans-unit> + <trans-unit id="39"> + <source>This value is not a valid locale.</source> + <target>یہ ويليو درست مقام نہیں ہے</target> + </trans-unit> + <trans-unit id="40"> + <source>This value is not a valid country.</source> + <target>یہ ويليو ایک درست ملک نہیں ہے</target> + </trans-unit> + <trans-unit id="41"> + <source>This value is already used.</source> + <target>یہ ويليو پہلے ہی استعمال ہو چکی ہے</target> + </trans-unit> + <trans-unit id="42"> + <source>The size of the image could not be detected.</source> + <target>تصویر کے سائز کا پتہ نہیں چل سکا</target> + </trans-unit> + <trans-unit id="43"> + <source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source> + <target>ہے {{ max_width }}px اجازت دی گئی زیادہ سے زیاد چوڑائی ({{ width }}px) تصویر کی چوڑائی بہت بڑی ہے</target> + </trans-unit> + <trans-unit id="44"> + <source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source> + <target>ہے {{ min_width }}px کم از کم چوڑائی متوقع({{ width }}px) تصویر کی چوڑائی بہت چھوٹی ہے</target> + </trans-unit> + <trans-unit id="45"> + <source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source> + <target>ہے {{ max_height }}px اجازت دی گئی زیادہ سے زیاد اونچائی ({{ height }}px) تصویر کی اونچائی بہت بڑی ہے</target> + </trans-unit> + <trans-unit id="46"> + <source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source> + <target>ہے {{ min_height }}px متوقع کم از کم اونچائی ({{ height }}px) تصویر کی اونچائی بہت چھوٹی ہے</target> + </trans-unit> + <trans-unit id="47"> + <source>This value should be the user's current password.</source> + <target>یہ ويليو صارف کا موجودہ پاس ورڈ ہونا چاہیے</target> + </trans-unit> + <trans-unit id="48"> + <source>This value should have exactly {{ limit }} character.|This value should have exactly {{ limit }} characters.</source> + <target>حروف ہونے چاہئیں {{ limit }} حرف ہونا چاہیے۔|اس ويليو میں بالکل {{ limit }} اس ويليو میں بالکل</target> + </trans-unit> + <trans-unit id="49"> + <source>The file was only partially uploaded.</source> + <target>فائل صرف جزوی طور پر اپ لوڈ کی گئی تھی</target> + </trans-unit> + <trans-unit id="50"> + <source>No file was uploaded.</source> + <target>کوئی فائل اپ لوڈ نہیں کی گئی</target> + </trans-unit> + <trans-unit id="51"> + <source>No temporary folder was configured in php.ini.</source> + <target>میں کوئی عارضی فولڈر کنفیگر نہیں کیا گیا، یا کنفیگرڈ فولڈر موجود نہیں ہے php.ini</target> + </trans-unit> + <trans-unit id="52"> + <source>Cannot write temporary file to disk.</source> + <target>عارضی فائل کو ڈسک پر نہیں لکھا جا سکتا</target> + </trans-unit> + <trans-unit id="53"> + <source>A PHP extension caused the upload to fail.</source> + <target>پی ایچ پی کی توسیع کی وجہ سے اپ لوڈ ناکام ہو گیا</target> + </trans-unit> + <trans-unit id="54"> + <source>This collection should contain {{ limit }} element or more.|This collection should contain {{ limit }} elements or more.</source> + <target>عناصر یا اس سے زیادہ ہونا چاہیے {{ limit } عنصر یا اس سے زیادہ ہونا چاہیے۔|اس مجموعہ میں {{ limit }} اس مجموعہ میں</target> + </trans-unit> + <trans-unit id="55"> + <source>This collection should contain {{ limit }} element or less.|This collection should contain {{ limit }} elements or less.</source> + <target>عناصر یا اس سے کم ہونا چاہیے {{ limit } عنصر یا اس سے کم ہونا چاہیے۔|اس مجموعہ میں {{ limit }} اس مجموعہ میں</target> + </trans-unit> + <trans-unit id="56"> + <source>This collection should contain exactly {{ limit }} element.|This collection should contain exactly {{ limit }} elements.</source> + <target>عنصر ہونا چاہیے {{ limit }} عنصر ہونا چاہیے۔|اس مجموعے میں بالکل {{ limit }} اس مجموعہ میں بالکل</target> + </trans-unit> + <trans-unit id="57"> + <source>Invalid card number.</source> + <target>غلط کارڈ نمبر</target> + </trans-unit> + <trans-unit id="58"> + <source>Unsupported card type or invalid card number.</source> + <target>غیر تعاون یافتہ کارڈ کی قسم یا غلط کارڈ نمبر</target> + </trans-unit> + <trans-unit id="59"> + <source>This is not a valid International Bank Account Number (IBAN).</source> + <target>(IBAN)یہ ایک درست بین الاقوامی بینک اکاؤنٹ نمبر نہیں ہے</target> + </trans-unit> + <trans-unit id="60"> + <source>This value is not a valid ISBN-10.</source> + <target>نہیں ہے ISBN-10 یھ ويليو درست۔</target> + </trans-unit> + <trans-unit id="61"> + <source>This value is not a valid ISBN-13.</source> + <target>نہیں ہے ISBN-13 یھ ويليو درست۔</target> + </trans-unit> + <trans-unit id="62"> + <source>This value is neither a valid ISBN-10 nor a valid ISBN-13.</source> + <target>ISBN-13 ے اور نہ ہی درست ISBN-10 یہ ويليو نہ تو درست</target> + </trans-unit> + <trans-unit id="63"> + <source>This value is not a valid ISSN.</source> + <target>نہیں ہے ISSNیھ ويليو درست۔</target> + </trans-unit> + <trans-unit id="64"> + <source>This value is not a valid currency.</source> + <target>یہ ويليو درست کرنسی نہیں ہے</target> + </trans-unit> + <trans-unit id="65"> + <source>This value should be equal to {{ compared_value }}.</source> + <target>کے برابر ہونا چاہیے {{ compared_value }} یھ ويليو</target> + </trans-unit> + <trans-unit id="66"> + <source>This value should be greater than {{ compared_value }}.</source> + <target>سے بڈي ہوني چاہیے {{ compared_value }} یھ ويليو</target> + </trans-unit> + <trans-unit id="67"> + <source>This value should be greater than or equal to {{ compared_value }}.</source> + <target>سے بڈي یا برابر ہوني چاہیے {{ compared_value }} یھ ويليو</target> + </trans-unit> + <trans-unit id="68"> + <source>This value should be identical to {{ compared_value_type }} {{ compared_value }}.</source> + <target>{{ compared_value }} {{ compared_value_type }} یہ ويليو ایک جیسی ہونی چاہیے۔</target> + </trans-unit> + <trans-unit id="69"> + <source>This value should be less than {{ compared_value }}.</source> + <target>سے کم ہوني چاہیے {{ compared_value }} یھ ويليو</target> + </trans-unit> + <trans-unit id="70"> + <source>This value should be less than or equal to {{ compared_value }}.</source> + <target>سے کم یا برابر ہوني چاہیے {{ compared_value }} یھ ويليو</target> + </trans-unit> + <trans-unit id="71"> + <source>This value should not be equal to {{ compared_value }}.</source> + <target>کے برابر نھيں ہوني چاہیے {{ compared_value }} یھ ويليو</target> + </trans-unit> + <trans-unit id="72"> + <source>This value should not be identical to {{ compared_value_type }} {{ compared_value }}.</source> + <target>ایک جیسی نیيں ہونی چاہیے {{ compared_value }} {{ compared_value_type }} یہ ويليو</target> + </trans-unit> + <trans-unit id="73"> + <source>The image ratio is too big ({{ ratio }}). Allowed maximum ratio is {{ max_ratio }}.</source> + <target>ہے {{ max_ratio }} اجازت شدہ زیادہ سے زیادہ تناسب ({{ ratio }}) تصویر کا تناسب بہت بڑا ہے</target> + </trans-unit> + <trans-unit id="74"> + <source>The image ratio is too small ({{ ratio }}). Minimum ratio expected is {{ min_ratio }}.</source> + <target>ہے{{ min_ratio }} ratio متوقع کم از کم ({{ ratio }}) بہت چھوٹا ہے ratio تصویر کا</target> + </trans-unit> + <trans-unit id="75"> + <source>The image is square ({{ width }}x{{ height }}px). Square images are not allowed.</source> + <target>مربع تصاویر کی اجازت نہیں ہے (px{{ height }}x{{ width }}) تصویر مربع ہے</target> + </trans-unit> + <trans-unit id="76"> + <source>The image is landscape oriented ({{ width }}x{{ height }}px). Landscape oriented images are not allowed.</source> + <target>زمین کی تزئین پر مبنی تصاویر کی اجازت نہیں ہے ({{ width }}x{{ height }}px) تصویر زمین کی تزئین پر مبنی ہے</target> + </trans-unit> + <trans-unit id="77"> + <source>The image is portrait oriented ({{ width }}x{{ height }}px). Portrait oriented images are not allowed.</source> + <target>پورٹریٹ پر مبنی تصاویر کی اجازت نہیں ہے ({{ width }}x{{ height }}px) تصویر پورٹریٹ پر مبنی ہے</target> + </trans-unit> + <trans-unit id="78"> + <source>An empty file is not allowed.</source> + <target>خالی فائل کی اجازت نہیں ہے</target> + </trans-unit> + <trans-unit id="79"> + <source>The host could not be resolved.</source> + <target>میزبان حل نہیں ہو سکا</target> + </trans-unit> + <trans-unit id="80"> + <source>This value does not match the expected {{ charset }} charset.</source> + <target>کے جيسي نہیں ہے charset {{ charset }} یہ ويليو متوقع</target> + </trans-unit> + <trans-unit id="81"> + <source>This is not a valid Business Identifier Code (BIC).</source> + <target>(BIC)یہ ایک درست کاروباری شناخت کنندہ کوڈ نہیں ہے</target> + </trans-unit> + <trans-unit id="82"> + <source>Error</source> + <target>خرابی</target> + </trans-unit> + <trans-unit id="83"> + <source>This is not a valid UUID.</source> + <target>نہیں ہے UUID یہ درست</target> + </trans-unit> + <trans-unit id="84"> + <source>This value should be a multiple of {{ compared_value }}.</source> + <target>کا ضرب ہوني چاہیے {{ compared_value }} یہ ويليو </target> + </trans-unit> + <trans-unit id="85"> + <source>This Business Identifier Code (BIC) is not associated with IBAN {{ iban }}.</source> + <target>سے وابستہ نہیں ہے IBAN {{ iban }} (BIC) یہ کاروباری شناختی کوڈ</target> + </trans-unit> + <trans-unit id="86"> + <source>This value should be valid JSON.</source> + <target>ہونی چاہیے JSON یہ ويليو درست</target> + </trans-unit> + <trans-unit id="87"> + <source>This collection should contain only unique elements.</source> + <target>یہ مجموعہ صرف منفرد عناصر پر مشتمل ہونا چاہیے</target> + </trans-unit> + <trans-unit id="88"> + <source>This value should be positive.</source> + <target>یہ ويليو مثبت ہونی چاہیے</target> + </trans-unit> + <trans-unit id="89"> + <source>This value should be either positive or zero.</source> + <target>یہ ويليو یا تو مثبت یا صفر ہونی چاہیے</target> + </trans-unit> + <trans-unit id="90"> + <source>This value should be negative.</source> + <target>یہ ويليو منفی ہونی چاہیے</target> + </trans-unit> + <trans-unit id="91"> + <source>This value should be either negative or zero.</source> + <target>یہ ويليو یا تو منفی یا صفر ہونی چاہیے</target> + </trans-unit> + <trans-unit id="92"> + <source>This value is not a valid timezone.</source> + <target>یہ ويليو درست ٹائم زون نہیں ہے</target> + </trans-unit> + <trans-unit id="93"> + <source>This password has been leaked in a data breach, it must not be used. Please use another password.</source> + <target>یہ پاس ورڈ ڈیٹا کی خلاف ورزی میں لیک ہو گیا ہے، اسے استعمال نہیں کرنا چاہیے۔ براۓ کرم دوسرا پاس ورڈ استعمال کریں</target> + </trans-unit> + <trans-unit id="94"> + <source>This value should be between {{ min }} and {{ max }}.</source> + <target>کے درمیان ہونی چاہیے {{ max }} اور {{ min }} یہ ويليو</target> + </trans-unit> + <trans-unit id="95"> + <source>This value is not a valid hostname.</source> + <target>نہیں ہے hostname یہ ويليو درست</target> + </trans-unit> + <trans-unit id="96"> + <source>The number of elements in this collection should be a multiple of {{ compared_value }}.</source> + <target>کی ضرب ہونی چاہیے {{ compared_value }} اس مجموعہ میں عناصر کی تعداد</target> + </trans-unit> + <trans-unit id="97"> + <source>This value should satisfy at least one of the following constraints:</source> + <target>اس ويليو کو درج ذیل رکاوٹوں میں سے کم از کم ایک کو پورا کرنا چاہیے</target> + </trans-unit> + <trans-unit id="98"> + <source>Each element of this collection should satisfy its own set of constraints.</source> + <target>اس مجموعے کے ہر عنصر کو اپنی پابندیوں کے سیٹ کو پورا کرنا چاہیے</target> + </trans-unit> + <trans-unit id="99"> + <source>This value is not a valid International Securities Identification Number (ISIN).</source> + <target>نہیں ہے (ISIN) یہ ويليو درست بین الاقوامی سیکیورٹیز شناختی نمبر</target> + </trans-unit> + <trans-unit id="100"> + <source>This value should be a valid expression.</source> + <target>یہ ويليو ایک درست اظہار ہوني چاہیے</target> + </trans-unit> + <trans-unit id="101"> + <source>This value is not a valid CSS color.</source> + <target>رنگ نہیں ہے CSS یہ ويليو درست</target> + </trans-unit> + <trans-unit id="102"> + <source>This value is not a valid CIDR notation.</source> + <target>نوٹیشن نہیں ہے CIDR یہ ويليو ایک درست</target> + </trans-unit> + <trans-unit id="103"> + <source>The value of the netmask should be between {{ min }} and {{ max }}.</source> + <target>کے درمیان ہونی چاہیے {{ max }} اور {{ min }} نیٹ ماسک کی ويليو</target> + </trans-unit> + </body> + </file> +</xliff> diff --git a/web/modules/honeypot/config/optional/tour.tour.honeypot.yml b/web/modules/honeypot/config/optional/tour.tour.honeypot.yml index af082f4238..7bbfac881e 100644 --- a/web/modules/honeypot/config/optional/tour.tour.honeypot.yml +++ b/web/modules/honeypot/config/optional/tour.tour.honeypot.yml @@ -11,7 +11,7 @@ tips: label: Honeypot weight: -10 body: "Congratulations on installing Honeypot on your site! With just a few clicks, you can have your site well-protected against automated spam bots.\r\n\r\nClick Next to be guided through this configuration page." - location: top-start + position: top-start protect-all-forms: id: protect-all-forms plugin: text @@ -19,7 +19,7 @@ tips: weight: -9 selector: '#edit-protect-all-forms' body: "Protecting all the forms is the easiest way to quickly cut down on spam on your site, but doing this disables Drupal's caching for every page where a form is displayed.\r\n\r\nNote: If you have the honeypot time limit enabled, this option may cause issues with Drupal Commerce product forms or similarly-sparse forms that are able to be completed in a very short time." - location: bottom-start + position: bottom-start log-blocked-form-submissions: id: log-blocked-form-submissions plugin: text @@ -27,7 +27,7 @@ tips: weight: -8 selector: '#edit-log' body: 'Check this box to log every form submission using watchdog. If you have Database Logging enabled, you can view these log entries in the Recent log messages page under Reports.' - location: bottom-start + position: bottom-start honeypot-element-name: id: honeypot-element-name plugin: text @@ -35,7 +35,7 @@ tips: weight: -7 selector: '#edit-element-name' body: 'Spam bots typically fill out any field they believe will help get links back to their site, so tempting them with a field named something like ''url'', ''homepage'', or ''link'' makes it hard for them to resist filling in the field—and easy to catch them in the trap and reject their submissions!' - location: top-start + position: top-start honeypot-time-limit: id: honeypot-time-limit plugin: text @@ -43,7 +43,7 @@ tips: weight: -6 selector: '#edit-time-limit' body: 'If you enter a positive value, Honeypot will require that all protected forms take at least that many seconds long to fill out. Most forms take at least 5-10 seconds to complete (if you''re a human), so setting this to a value < 5 will help protect against spam bots. Set to 0 to disable.' - location: top-start + position: top-start honeypot-expire: id: honeypot-expire plugin: text @@ -51,7 +51,7 @@ tips: weight: -5 selector: '#edit-expire' body: 'If you enter a positive value, Honeypot will require that all protected forms take at least that many seconds long to fill out. Most forms take at least 5-10 seconds to complete (if you''re a human), so setting this to a value < 5 will help protect against spam bots. Set to 0 to disable.' - location: top-start + position: top-start honeypot-form-specific-settings: id: honeypot-form-specific-settings plugin: text @@ -59,4 +59,4 @@ tips: weight: -4 selector: '#edit-form-settings' body: 'If you would like to choose particular forms to be protected by Honeypot, check the forms you wish to protect in this section. Most common types of forms are available for protection.' - location: top-start + position: top-start diff --git a/web/modules/honeypot/honeypot.info.yml b/web/modules/honeypot/honeypot.info.yml index 287bff6fff..5fdf371519 100644 --- a/web/modules/honeypot/honeypot.info.yml +++ b/web/modules/honeypot/honeypot.info.yml @@ -8,7 +8,7 @@ test_dependencies: configure: honeypot.config -# Information added by Drupal.org packaging script on 2022-05-07 -version: '2.1.0' +# Information added by Drupal.org packaging script on 2022-10-01 +version: '2.1.2' project: 'honeypot' -datestamp: 1651894956 +datestamp: 1664658206 diff --git a/web/modules/honeypot/honeypot.install b/web/modules/honeypot/honeypot.install index edc958edc3..a21eebad09 100644 --- a/web/modules/honeypot/honeypot.install +++ b/web/modules/honeypot/honeypot.install @@ -46,6 +46,9 @@ function honeypot_schema() { */ function honeypot_install() { if (PHP_SAPI !== 'cli') { + // Rebuild so that routes defined in honeypot.routing.yml become available. + \Drupal::service("router.builder")->rebuild(); + // Prompt the user to configure Honeypot. \Drupal::messenger()->addMessage(t('Honeypot installed successfully. Please <a href=":url">configure Honeypot</a> to protect your forms from spam bots.', [ ':url' => Url::fromRoute('honeypot.config')->toString(), ])); diff --git a/web/modules/honeypot/honeypot.post_update.php b/web/modules/honeypot/honeypot.post_update.php new file mode 100644 index 0000000000..4e559aa864 --- /dev/null +++ b/web/modules/honeypot/honeypot.post_update.php @@ -0,0 +1,73 @@ +<?php + +/** + * @file + * Post update functions for Honeypot. + */ + +use Drupal\Core\Config\Entity\ConfigEntityUpdater; +use Drupal\tour\Entity\Tour; + +/** + * Convert deprecated Joyride 'location' properties to 'position' properties. + */ +function honeypot_post_update_joyride_location_to_position(array &$sandbox = NULL): void { + if (\Drupal::moduleHandler()->moduleExists('tour')) { + $config_entity_updater = \Drupal::classResolver(ConfigEntityUpdater::class); + $config_entity_updater->update($sandbox, 'tour', function (Tour $tour) { + return honeypot_tour_update_joyride($tour); + }); + } +} + +/** + * Updates 'honeypot' tour to correct use of the deprecated location property. + * + * @param \Drupal\tour\Entity\Tour $tour + * The tour to update. + * + * @return bool + * Whether or not the entity needs saving. + * + * @see honeypot_post_update_joyride_location_to_position() + * + * @internal + */ +function honeypot_tour_update_joyride(Tour $tour): bool { + $needs_save = FALSE; + + // Only change the 'honeypot' tour. + $id = $tour->get('id'); + if ($id === 'honeypot') { + $tips = $tour->get('tips'); + foreach ($tips as &$tip) { + // The tour module will automatically change a 'location' property to a + // position property in some circumstances. If the tour module does this, + // the value of the property will have an extra '-start' appended. + if (isset($tip['position'])) { + $tip['position'] = str_replace('-start-start', '-start', $tip['position']); + $needs_save = TRUE; + } + // If the tour module doesn't change the 'location' property, we have to + // do it ourselves. + if (isset($tip['location'])) { + $needs_save = TRUE; + $tip['position'] = $tip['location']; + unset($tip['location']); + } + } + + if ($needs_save) { + $tour->set('tips', $tips); + } + } + + return $needs_save; +} + +/** + * Rebuild the service container after adding new 'honeypot' service. + */ +function honeypot_post_update_rebuild_service_container(): void { + // An empty update will flush all caches. +} diff --git a/web/modules/honeypot/src/HoneypotService.php b/web/modules/honeypot/src/HoneypotService.php index c2b72dc0bd..600e477a4d 100644 --- a/web/modules/honeypot/src/HoneypotService.php +++ b/web/modules/honeypot/src/HoneypotService.php @@ -7,6 +7,7 @@ use Drupal\Core\Cache\CacheBackendInterface; use Drupal\Core\Config\ConfigFactory; use Drupal\Core\Database\Connection; +use Drupal\Core\DependencyInjection\DependencySerializationTrait; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\KeyValueStore\KeyValueExpirableFactory; @@ -21,6 +22,7 @@ * Provides a service to append Honeypot protection to forms. */ class HoneypotService implements HoneypotServiceInterface { + use DependencySerializationTrait; use StringTranslationTrait; /** @@ -66,11 +68,11 @@ class HoneypotService implements HoneypotServiceInterface { protected $connection; /** - * The Honeypot logger channel. + * The Honeypot logger channel factory. * - * @var \Drupal\Core\Logger\LoggerChannelInterface + * @var \Drupal\Core\Logger\LoggerChannelFactoryInterface */ - protected $logger; + protected $loggerFactory; /** * The datetime.time service. @@ -126,7 +128,7 @@ public function __construct(AccountProxyInterface $account, ModuleHandlerInterfa $this->keyValue = $key_value->get('honeypot_time_restriction'); $this->killSwitch = $kill_switch; $this->connection = $connection; - $this->logger = $logger_factory->get('honeypot'); + $this->loggerFactory = $logger_factory; $this->timeService = $time_service; $this->stringTranslation = $string_translation; $this->cacheBackend = $cache_backend; @@ -323,7 +325,7 @@ public function validateTimeRestriction(array &$element, FormStateInterface $for $triggering_element = $form_state->getTriggeringElement(); // Don't do anything if the triggering element is a preview button. - if ($triggering_element['#value'] == $this->t('Preview')) { + if ($triggering_element['#value'] == (string) $this->t('Preview')) { return; } @@ -361,7 +363,8 @@ protected function log(string $form_id, string $type): void { '%form' => $form_id, '@cause' => ($type == 'honeypot') ? $this->t('submission of a value in the honeypot field') : $this->t('submission of the form in less than minimum required time'), ]; - $this->logger->notice('Blocked submission of %form due to @cause.', $variables); + $this->loggerFactory->get('honeypot') + ->notice('Blocked submission of %form due to @cause.', $variables); } } diff --git a/web/modules/honeypot/tests/modules/honeypot_test/honeypot_test.info.yml b/web/modules/honeypot/tests/modules/honeypot_test/honeypot_test.info.yml index 68ba249c2c..d23e964089 100644 --- a/web/modules/honeypot/tests/modules/honeypot_test/honeypot_test.info.yml +++ b/web/modules/honeypot/tests/modules/honeypot_test/honeypot_test.info.yml @@ -3,7 +3,7 @@ type: module description: Support module for Honeypot internal testing purposes. package: Testing -# Information added by Drupal.org packaging script on 2022-05-07 -version: '2.1.0' +# Information added by Drupal.org packaging script on 2022-10-01 +version: '2.1.2' project: 'honeypot' -datestamp: 1651894956 +datestamp: 1664658206 diff --git a/web/modules/honeypot/tests/src/FunctionalJavascript/HoneypotFileFieldTest.php b/web/modules/honeypot/tests/src/FunctionalJavascript/HoneypotFileFieldTest.php new file mode 100644 index 0000000000..bd4a8577e3 --- /dev/null +++ b/web/modules/honeypot/tests/src/FunctionalJavascript/HoneypotFileFieldTest.php @@ -0,0 +1,42 @@ +<?php + +namespace Drupal\Tests\honeypot\FunctionalJavascript; + +use Drupal\Tests\file\FunctionalJavascript\FileFieldWidgetTest; + +/** + * Tests the file field widget with the Honeypot module enabled. + * + * @group honeypot + */ +class HoneypotFileFieldTest extends FileFieldWidgetTest { + + /** + * {@inheritdoc} + */ + protected static $modules = [ + 'honeypot', + 'node', + 'file', + 'file_module_test', + 'field_ui', + ]; + + /** + * {@inheritdoc} + */ + protected function setUp(): void { + parent::setUp(); + + // Set up required Honeypot configuration. + $honeypot_config = \Drupal::configFactory()->getEditable('honeypot.settings'); + $honeypot_config->set('element_name', 'url'); + // Disable time_limit protection. + $honeypot_config->set('time_limit', 0); + // Test protecting all forms. + $honeypot_config->set('protect_all_forms', TRUE); + $honeypot_config->set('log', FALSE); + $honeypot_config->save(); + } + +} -- GitLab