Skip to content

PHP 7.4 support #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 8, 2020
Merged

PHP 7.4 support #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dddb7ed
magento/security-package#206: PHP 7.4 support
lenaorobei May 7, 2020
ed6acec
magento/security-package#206: PHP 7.4 support
lenaorobei May 7, 2020
a5189ca
magento/security-package#206: PHP 7.4 support
lenaorobei May 7, 2020
373c7ab
magento/security-package#206: PHP 7.4 support
lenaorobei May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ReCaptchaAdminUi/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
},
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaCheckout/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
Expand Down
6 changes: 3 additions & 3 deletions ReCaptchaContact/Test/Integration/ContactFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaContact/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
},
Expand Down
6 changes: 3 additions & 3 deletions ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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));
}
Expand Down
5 changes: 3 additions & 2 deletions ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
/**
* @magentoAppArea frontend
* @magentoAppIsolation enabled
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class CreateCustomerFormTest extends AbstractController
{
Expand Down Expand Up @@ -201,8 +202,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));
}
Expand Down
4 changes: 2 additions & 2 deletions ReCaptchaCustomer/Test/Integration/ForgotPasswordFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
4 changes: 2 additions & 2 deletions ReCaptchaCustomer/Test/Integration/LoginFromTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaCustomer/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaFrontendUi/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaMigration/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
},
Expand Down
8 changes: 4 additions & 4 deletions ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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));
}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaNewsletter/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
},
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaPaypal/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
6 changes: 3 additions & 3 deletions ReCaptchaReview/Test/Integration/ReviewFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaReview/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
},
Expand Down
6 changes: 3 additions & 3 deletions ReCaptchaSendFriend/Test/Integration/SendFriendFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaSendFriend/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
},
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaUi/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
},
Expand Down
4 changes: 2 additions & 2 deletions ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
4 changes: 2 additions & 2 deletions ReCaptchaUser/Test/Integration/LoginFormTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaUser/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaValidation/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaValidationApi/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaVersion2Checkbox/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaVersion2Invisible/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
2 changes: 1 addition & 1 deletion ReCaptchaVersion3Invisible/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand Down
2 changes: 1 addition & 1 deletion Securitytxt/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*"
Expand Down