From dddb7ed988f72d486dcb60de2b01bb245be2ae02 Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Thu, 7 May 2020 12:41:05 -0500 Subject: [PATCH 1/4] magento/security-package#206: PHP 7.4 support --- ReCaptchaAdminUi/composer.json | 2 +- ReCaptchaCheckout/composer.json | 2 +- ReCaptchaContact/composer.json | 2 +- ReCaptchaCustomer/composer.json | 2 +- ReCaptchaFrontendUi/composer.json | 2 +- ReCaptchaMigration/composer.json | 2 +- ReCaptchaNewsletter/composer.json | 2 +- ReCaptchaPaypal/composer.json | 2 +- ReCaptchaReview/composer.json | 2 +- ReCaptchaSendFriend/composer.json | 2 +- ReCaptchaUi/composer.json | 2 +- ReCaptchaUser/composer.json | 2 +- ReCaptchaValidation/composer.json | 2 +- ReCaptchaValidationApi/composer.json | 2 +- ReCaptchaVersion2Checkbox/composer.json | 2 +- ReCaptchaVersion2Invisible/composer.json | 2 +- ReCaptchaVersion3Invisible/composer.json | 2 +- Securitytxt/composer.json | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ReCaptchaAdminUi/composer.json b/ReCaptchaAdminUi/composer.json index 005a9b9a..7e089c0b 100644 --- a/ReCaptchaAdminUi/composer.json +++ b/ReCaptchaAdminUi/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-admin-ui", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*" }, diff --git a/ReCaptchaCheckout/composer.json b/ReCaptchaCheckout/composer.json index 33c10ffc..1b394307 100644 --- a/ReCaptchaCheckout/composer.json +++ b/ReCaptchaCheckout/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-checkout", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-checkout": "*", "magento/module-re-captcha-ui": "*" diff --git a/ReCaptchaContact/composer.json b/ReCaptchaContact/composer.json index 1e25f817..0abcf099 100644 --- a/ReCaptchaContact/composer.json +++ b/ReCaptchaContact/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-contact", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*" }, diff --git a/ReCaptchaCustomer/composer.json b/ReCaptchaCustomer/composer.json index c7df22e4..c189e6e3 100644 --- a/ReCaptchaCustomer/composer.json +++ b/ReCaptchaCustomer/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-customer", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-customer": "*", "magento/module-re-captcha-ui": "*", diff --git a/ReCaptchaFrontendUi/composer.json b/ReCaptchaFrontendUi/composer.json index 102a88c2..32c73d88 100644 --- a/ReCaptchaFrontendUi/composer.json +++ b/ReCaptchaFrontendUi/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-frontend-ui", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-store": "*", "magento/module-re-captcha-ui": "*" diff --git a/ReCaptchaMigration/composer.json b/ReCaptchaMigration/composer.json index 40b3277a..9c122161 100644 --- a/ReCaptchaMigration/composer.json +++ b/ReCaptchaMigration/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-migration", "description": "Google reCAPTCHA config migration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-config": "*" }, diff --git a/ReCaptchaNewsletter/composer.json b/ReCaptchaNewsletter/composer.json index c70c2f0a..108ad049 100644 --- a/ReCaptchaNewsletter/composer.json +++ b/ReCaptchaNewsletter/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-newsletter", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*" }, diff --git a/ReCaptchaPaypal/composer.json b/ReCaptchaPaypal/composer.json index 4429c6ed..640a2b93 100644 --- a/ReCaptchaPaypal/composer.json +++ b/ReCaptchaPaypal/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-paypal", "description": "Google reCaptcha integration for Magento2 PayPal PayflowPro payment form", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*", "magento/module-re-captcha-validation-api": "*", diff --git a/ReCaptchaReview/composer.json b/ReCaptchaReview/composer.json index 73d8795c..be9bc922 100644 --- a/ReCaptchaReview/composer.json +++ b/ReCaptchaReview/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-review", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*" }, diff --git a/ReCaptchaSendFriend/composer.json b/ReCaptchaSendFriend/composer.json index 68f59315..fa7a0eb4 100644 --- a/ReCaptchaSendFriend/composer.json +++ b/ReCaptchaSendFriend/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-send-friend", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*" }, diff --git a/ReCaptchaUi/composer.json b/ReCaptchaUi/composer.json index 3ad26a8c..2f0e4b81 100644 --- a/ReCaptchaUi/composer.json +++ b/ReCaptchaUi/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-ui", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-validation-api": "*" }, diff --git a/ReCaptchaUser/composer.json b/ReCaptchaUser/composer.json index 8dfff32b..4225a716 100644 --- a/ReCaptchaUser/composer.json +++ b/ReCaptchaUser/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-user", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-ui": "*", "magento/module-re-captcha-validation-api": "*" diff --git a/ReCaptchaValidation/composer.json b/ReCaptchaValidation/composer.json index 3a76b6c9..27557ec4 100644 --- a/ReCaptchaValidation/composer.json +++ b/ReCaptchaValidation/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-validation", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-re-captcha-validation-api": "*", "google/recaptcha": "^1.2" diff --git a/ReCaptchaValidationApi/composer.json b/ReCaptchaValidationApi/composer.json index c06f316c..137541b4 100644 --- a/ReCaptchaValidationApi/composer.json +++ b/ReCaptchaValidationApi/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-validation-api", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*" }, "type": "magento2-module", diff --git a/ReCaptchaVersion2Checkbox/composer.json b/ReCaptchaVersion2Checkbox/composer.json index 8acd468d..a565558c 100644 --- a/ReCaptchaVersion2Checkbox/composer.json +++ b/ReCaptchaVersion2Checkbox/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-version-2-checkbox", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-store": "*", "magento/module-re-captcha-ui": "*", diff --git a/ReCaptchaVersion2Invisible/composer.json b/ReCaptchaVersion2Invisible/composer.json index 5f95f3b5..b3089652 100644 --- a/ReCaptchaVersion2Invisible/composer.json +++ b/ReCaptchaVersion2Invisible/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-version-2-invisible", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-store": "*", "magento/module-re-captcha-ui": "*", diff --git a/ReCaptchaVersion3Invisible/composer.json b/ReCaptchaVersion3Invisible/composer.json index 3a39ea00..204d10fd 100644 --- a/ReCaptchaVersion3Invisible/composer.json +++ b/ReCaptchaVersion3Invisible/composer.json @@ -2,7 +2,7 @@ "name": "magento/module-re-captcha-version-3-invisible", "description": "Google reCAPTCHA integration for Magento2", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-store": "*", "magento/module-re-captcha-ui": "*", diff --git a/Securitytxt/composer.json b/Securitytxt/composer.json index 4a22e423..a0761449 100644 --- a/Securitytxt/composer.json +++ b/Securitytxt/composer.json @@ -3,7 +3,7 @@ "description": "Security.txt file for Magento 2 websites", "type": "magento2-module", "require": { - "php": "~7.1.3||~7.2.0||~7.3.0", + "php": "~7.3.0||~7.4.0", "magento/framework": "*", "magento/module-config": "*", "magento/module-store": "*" From ed6acec5de71abe5c14ee900583de7af1e14000b Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Thu, 7 May 2020 16:31:26 -0500 Subject: [PATCH 2/4] magento/security-package#206: PHP 7.4 support - integration test fix --- ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php b/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php index 3eef2a76..448622ca 100644 --- a/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php +++ b/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php @@ -54,7 +54,7 @@ class NewsletterFormTest extends AbstractController /** * @inheritDoc */ - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->mutableScopeConfig = $this->_objectManager->get(MutableScopeConfig::class); From a5189cab4b88b7a6f6598ac08082aee197b77652 Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Thu, 7 May 2020 17:37:43 -0500 Subject: [PATCH 3/4] magento/security-package#206: PHP 7.4 support - integration test fixes --- ReCaptchaContact/Test/Integration/ContactFormTest.php | 6 +++--- ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php | 4 ++-- .../Test/Integration/CreateCustomerFormTest.php | 4 ++-- .../Test/Integration/ForgotPasswordFormTest.php | 4 ++-- ReCaptchaCustomer/Test/Integration/LoginFromTest.php | 4 ++-- ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php | 6 +++--- ReCaptchaReview/Test/Integration/ReviewFormTest.php | 6 +++--- ReCaptchaSendFriend/Test/Integration/SendFriendFormTest.php | 6 +++--- ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php | 4 ++-- ReCaptchaUser/Test/Integration/LoginFormTest.php | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/ReCaptchaContact/Test/Integration/ContactFormTest.php b/ReCaptchaContact/Test/Integration/ContactFormTest.php index ffa6b2fc..9e963fc8 100644 --- a/ReCaptchaContact/Test/Integration/ContactFormTest.php +++ b/ReCaptchaContact/Test/Integration/ContactFormTest.php @@ -178,8 +178,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo self::assertNotEmpty($content); $shouldContainReCaptcha - ? self::assertContains('field-recaptcha', $content) - : self::assertNotContains('field-recaptcha', $content); + ? self::assertStringContainsString('field-recaptcha', $content) + : self::assertStringNotContainsString('field-recaptcha', $content); self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR)); } @@ -193,7 +193,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void $this->makePostRequest($postValues); $this->assertSessionMessages( - self::contains( + self::containsEqual( "Thanks for contacting us with your comments and questions. We'll respond to you very soon." ), MessageInterface::TYPE_SUCCESS diff --git a/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php b/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php index 79e97200..9cacdacd 100644 --- a/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php +++ b/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php @@ -188,8 +188,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo self::assertNotEmpty($content); $shouldContainReCaptcha - ? $this->assertContains('recaptcha-popup-login', $content) - : $this->assertNotContains('recaptcha-popup-login', $content); + ? $this->assertStringContainsString('recaptcha-popup-login', $content) + : $this->assertStringNotContainsString('recaptcha-popup-login', $content); self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR)); } diff --git a/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php b/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php index 3155ca6e..ec24114c 100644 --- a/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php +++ b/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php @@ -201,8 +201,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo self::assertNotEmpty($content); $shouldContainReCaptcha - ? $this->assertContains('field-recaptcha', $content) - : $this->assertNotContains('field-recaptcha', $content); + ? $this->assertStringContainsString('field-recaptcha', $content) + : $this->assertStringNotContainsString('field-recaptcha', $content); self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR)); } diff --git a/ReCaptchaCustomer/Test/Integration/ForgotPasswordFormTest.php b/ReCaptchaCustomer/Test/Integration/ForgotPasswordFormTest.php index 55d40b15..59265f51 100644 --- a/ReCaptchaCustomer/Test/Integration/ForgotPasswordFormTest.php +++ b/ReCaptchaCustomer/Test/Integration/ForgotPasswordFormTest.php @@ -195,8 +195,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo self::assertNotEmpty($content); $shouldContainReCaptcha - ? $this->assertContains('field-recaptcha', $content) - : $this->assertNotContains('field-recaptcha', $content); + ? $this->assertStringContainsString('field-recaptcha', $content) + : $this->assertStringNotContainsString('field-recaptcha', $content); self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR)); } diff --git a/ReCaptchaCustomer/Test/Integration/LoginFromTest.php b/ReCaptchaCustomer/Test/Integration/LoginFromTest.php index 5f31ed30..e5a61344 100644 --- a/ReCaptchaCustomer/Test/Integration/LoginFromTest.php +++ b/ReCaptchaCustomer/Test/Integration/LoginFromTest.php @@ -195,8 +195,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo self::assertNotEmpty($content); $shouldContainReCaptcha - ? $this->assertContains('field-recaptcha', $content) - : $this->assertNotContains('field-recaptcha', $content); + ? $this->assertStringContainsString('field-recaptcha', $content) + : $this->assertStringNotContainsString('field-recaptcha', $content); self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR)); } diff --git a/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php b/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php index 448622ca..ad496c47 100644 --- a/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php +++ b/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php @@ -192,8 +192,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo self::assertNotEmpty($content); $shouldContainReCaptcha - ? self::assertContains('field-recaptcha', $content) - : self::assertNotContains('field-recaptcha', $content); + ? self::assertStringContainsString('field-recaptcha', $content) + : self::assertStringNotContainsString('field-recaptcha', $content); self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR)); } @@ -207,7 +207,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void $this->makePostRequest($postValues); $this->assertSessionMessages( - self::contains( + self::containsEqual( 'Thank you for your subscription.' ), MessageInterface::TYPE_SUCCESS diff --git a/ReCaptchaReview/Test/Integration/ReviewFormTest.php b/ReCaptchaReview/Test/Integration/ReviewFormTest.php index 0eb4c2a1..a7cbe8e3 100644 --- a/ReCaptchaReview/Test/Integration/ReviewFormTest.php +++ b/ReCaptchaReview/Test/Integration/ReviewFormTest.php @@ -188,8 +188,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo self::assertNotEmpty($content); $shouldContainReCaptcha - ? self::assertContains('field-recaptcha', $content) - : self::assertNotContains('field-recaptcha', $content); + ? self::assertStringContainsString('field-recaptcha', $content) + : self::assertStringNotContainsString('field-recaptcha', $content); self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR)); } @@ -203,7 +203,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void $this->makePostRequest($postValues); $this->assertSessionMessages( - self::contains( + self::containsEqual( 'You submitted your review for moderation.' ), MessageInterface::TYPE_SUCCESS diff --git a/ReCaptchaSendFriend/Test/Integration/SendFriendFormTest.php b/ReCaptchaSendFriend/Test/Integration/SendFriendFormTest.php index adab3eab..e87f9faf 100644 --- a/ReCaptchaSendFriend/Test/Integration/SendFriendFormTest.php +++ b/ReCaptchaSendFriend/Test/Integration/SendFriendFormTest.php @@ -211,8 +211,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo self::assertNotEmpty($content); $shouldContainReCaptcha - ? self::assertContains('field-recaptcha', $content) - : self::assertNotContains('field-recaptcha', $content); + ? self::assertStringContainsString('field-recaptcha', $content) + : self::assertStringNotContainsString('field-recaptcha', $content); self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR)); } @@ -226,7 +226,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void $this->makePostRequest($postValues); $this->assertSessionMessages( - self::contains( + self::containsEqual( 'The link to a friend was sent.' ), MessageInterface::TYPE_SUCCESS diff --git a/ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php b/ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php index d7af7752..3ae29679 100644 --- a/ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php +++ b/ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php @@ -172,8 +172,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo self::assertNotEmpty($content); $shouldContainReCaptcha - ? $this->assertContains('admin-recaptcha', $content) - : $this->assertNotContains('admin-recaptcha', $content); + ? $this->assertStringContainsString('admin-recaptcha', $content) + : $this->assertStringNotContainsString('admin-recaptcha', $content); self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR)); } diff --git a/ReCaptchaUser/Test/Integration/LoginFormTest.php b/ReCaptchaUser/Test/Integration/LoginFormTest.php index bc136d96..8595c861 100644 --- a/ReCaptchaUser/Test/Integration/LoginFormTest.php +++ b/ReCaptchaUser/Test/Integration/LoginFormTest.php @@ -184,8 +184,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo self::assertNotEmpty($content); $shouldContainReCaptcha - ? $this->assertContains('admin-recaptcha', $content) - : $this->assertNotContains('admin-recaptcha', $content); + ? $this->assertStringContainsString('admin-recaptcha', $content) + : $this->assertStringNotContainsString('admin-recaptcha', $content); self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR)); } From 373c7ab110a04bbed42ef9d5a26d7e6f270a98ad Mon Sep 17 00:00:00 2001 From: Lena Orobei Date: Fri, 8 May 2020 11:04:51 -0500 Subject: [PATCH 4/4] magento/security-package#206: PHP 7.4 support --- ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php | 2 +- ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php b/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php index 9cacdacd..7a65d351 100644 --- a/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php +++ b/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php @@ -18,7 +18,7 @@ use Magento\TestFramework\App\MutableScopeConfig; use Magento\TestFramework\TestCase\AbstractController; use PHPUnit\Framework\MockObject\MockObject; -use Zend\Http\Headers; +use Laminas\Http\Headers; /** * @magentoDataFixture Magento/Customer/_files/customer.php diff --git a/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php b/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php index ec24114c..d453cd16 100644 --- a/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php +++ b/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php @@ -25,6 +25,7 @@ /** * @magentoAppArea frontend * @magentoAppIsolation enabled + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ class CreateCustomerFormTest extends AbstractController {