From 5957b5586f3382bc657c5d9be3c4bcab06978b00 Mon Sep 17 00:00:00 2001 From: SLINIcraftet204 <nils@ttt-games.de> Date: Wed, 16 Oct 2024 21:12:41 +0200 Subject: [PATCH] Revert changes from main-test and updated Addon to newer Version --- .gitignore | 4 ++++ composer.json | 5 ++++- src/Resources/snippet/storefront.de-DE.json | 2 +- src/Storefront/Framework/Captcha/CloudFlareTurnstile.php | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9fc3f6e --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +composer.phar/ +/composer.phar +.idea + diff --git a/composer.json b/composer.json index df44615..3f82808 100644 --- a/composer.json +++ b/composer.json @@ -7,10 +7,13 @@ "authors": [ { "name": "Melvin Achterhuis" + }, + { + "name": "Nils Gerhardt | SLINIcraftet204" } ], "require": { - "shopware/core": "6.4.*", + "shopware/core": "6.5.*", "ext-curl": "*" }, "autoload": { diff --git a/src/Resources/snippet/storefront.de-DE.json b/src/Resources/snippet/storefront.de-DE.json index a585d78..74215dc 100644 --- a/src/Resources/snippet/storefront.de-DE.json +++ b/src/Resources/snippet/storefront.de-DE.json @@ -1,7 +1,7 @@ { "captcha": { "cloudFlareTurnstile": { - "dataProtectionInformation": "This site is protected by Turnstile and the CloudFlare <a href=\"https://www.cloudflare.com/en-gb/privacypolicy/\">Privacy Policy</a> and <a href=\"https://www.cloudflare.com/en-gb/website-terms/\">Terms of Service</a> apply." + "dataProtectionInformation": "Dieser Shop wird durch CloudFlare Turnstile geschützt <a href=\"https://www.cloudflare.com/en-gb/privacypolicy/\">Privacy Policy</a> and <a href=\"https://www.cloudflare.com/en-gb/website-terms/\">Terms of Service</a> apply." } } } \ No newline at end of file diff --git a/src/Storefront/Framework/Captcha/CloudFlareTurnstile.php b/src/Storefront/Framework/Captcha/CloudFlareTurnstile.php index f1bbb02..c93653a 100644 --- a/src/Storefront/Framework/Captcha/CloudFlareTurnstile.php +++ b/src/Storefront/Framework/Captcha/CloudFlareTurnstile.php @@ -28,7 +28,7 @@ class CloudFlareTurnstile extends AbstractCaptcha /** * {@inheritdoc} */ - public function isValid(Request $request /* , array $captchaConfig */): bool + public function isValid(Request $request , array $captchaConfig): bool { if (\func_num_args() < 2 || !\is_array(func_get_arg(1))) { Feature::triggerDeprecationOrThrow(