Skip to content

Commit a5189ca

Browse files
lenaorobeilenaorobei
committed
#206: PHP 7.4 support
- integration test fixes
1 parent ed6acec commit a5189ca

File tree

10 files changed

+24
-24
lines changed

10 files changed

+24
-24
lines changed

‎ReCaptchaContact/Test/Integration/ContactFormTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
178178
self::assertNotEmpty($content);
179179

180180
$shouldContainReCaptcha
181-
? self::assertContains('field-recaptcha', $content)
182-
: self::assertNotContains('field-recaptcha', $content);
181+
? self::assertStringContainsString('field-recaptcha', $content)
182+
: self::assertStringNotContainsString('field-recaptcha', $content);
183183

184184
self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
185185
}
@@ -193,7 +193,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void
193193
$this->makePostRequest($postValues);
194194

195195
$this->assertSessionMessages(
196-
self::contains(
196+
self::containsEqual(
197197
"Thanks for contacting us with your comments and questions. We'll respond to you very soon."
198198
),
199199
MessageInterface::TYPE_SUCCESS

‎ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
188188
self::assertNotEmpty($content);
189189

190190
$shouldContainReCaptcha
191-
? $this->assertContains('recaptcha-popup-login', $content)
192-
: $this->assertNotContains('recaptcha-popup-login', $content);
191+
? $this->assertStringContainsString('recaptcha-popup-login', $content)
192+
: $this->assertStringNotContainsString('recaptcha-popup-login', $content);
193193

194194
self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
195195
}

‎ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
201201
self::assertNotEmpty($content);
202202

203203
$shouldContainReCaptcha
204-
? $this->assertContains('field-recaptcha', $content)
205-
: $this->assertNotContains('field-recaptcha', $content);
204+
? $this->assertStringContainsString('field-recaptcha', $content)
205+
: $this->assertStringNotContainsString('field-recaptcha', $content);
206206

207207
self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
208208
}

‎ReCaptchaCustomer/Test/Integration/ForgotPasswordFormTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
195195
self::assertNotEmpty($content);
196196

197197
$shouldContainReCaptcha
198-
? $this->assertContains('field-recaptcha', $content)
199-
: $this->assertNotContains('field-recaptcha', $content);
198+
? $this->assertStringContainsString('field-recaptcha', $content)
199+
: $this->assertStringNotContainsString('field-recaptcha', $content);
200200

201201
self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
202202
}

‎ReCaptchaCustomer/Test/Integration/LoginFromTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
195195
self::assertNotEmpty($content);
196196

197197
$shouldContainReCaptcha
198-
? $this->assertContains('field-recaptcha', $content)
199-
: $this->assertNotContains('field-recaptcha', $content);
198+
? $this->assertStringContainsString('field-recaptcha', $content)
199+
: $this->assertStringNotContainsString('field-recaptcha', $content);
200200

201201
self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
202202
}

‎ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
192192
self::assertNotEmpty($content);
193193

194194
$shouldContainReCaptcha
195-
? self::assertContains('field-recaptcha', $content)
196-
: self::assertNotContains('field-recaptcha', $content);
195+
? self::assertStringContainsString('field-recaptcha', $content)
196+
: self::assertStringNotContainsString('field-recaptcha', $content);
197197

198198
self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
199199
}
@@ -207,7 +207,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void
207207
$this->makePostRequest($postValues);
208208

209209
$this->assertSessionMessages(
210-
self::contains(
210+
self::containsEqual(
211211
'Thank you for your subscription.'
212212
),
213213
MessageInterface::TYPE_SUCCESS

‎ReCaptchaReview/Test/Integration/ReviewFormTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
188188
self::assertNotEmpty($content);
189189

190190
$shouldContainReCaptcha
191-
? self::assertContains('field-recaptcha', $content)
192-
: self::assertNotContains('field-recaptcha', $content);
191+
? self::assertStringContainsString('field-recaptcha', $content)
192+
: self::assertStringNotContainsString('field-recaptcha', $content);
193193

194194
self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
195195
}
@@ -203,7 +203,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void
203203
$this->makePostRequest($postValues);
204204

205205
$this->assertSessionMessages(
206-
self::contains(
206+
self::containsEqual(
207207
'You submitted your review for moderation.'
208208
),
209209
MessageInterface::TYPE_SUCCESS

‎ReCaptchaSendFriend/Test/Integration/SendFriendFormTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
211211
self::assertNotEmpty($content);
212212

213213
$shouldContainReCaptcha
214-
? self::assertContains('field-recaptcha', $content)
215-
: self::assertNotContains('field-recaptcha', $content);
214+
? self::assertStringContainsString('field-recaptcha', $content)
215+
: self::assertStringNotContainsString('field-recaptcha', $content);
216216

217217
self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
218218
}
@@ -226,7 +226,7 @@ private function checkSuccessfulPostResponse(array $postValues = []): void
226226
$this->makePostRequest($postValues);
227227

228228
$this->assertSessionMessages(
229-
self::contains(
229+
self::containsEqual(
230230
'The link to a friend was sent.'
231231
),
232232
MessageInterface::TYPE_SUCCESS

‎ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
172172
self::assertNotEmpty($content);
173173

174174
$shouldContainReCaptcha
175-
? $this->assertContains('admin-recaptcha', $content)
176-
: $this->assertNotContains('admin-recaptcha', $content);
175+
? $this->assertStringContainsString('admin-recaptcha', $content)
176+
: $this->assertStringNotContainsString('admin-recaptcha', $content);
177177

178178
self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
179179
}

‎ReCaptchaUser/Test/Integration/LoginFormTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
184184
self::assertNotEmpty($content);
185185

186186
$shouldContainReCaptcha
187-
? $this->assertContains('admin-recaptcha', $content)
188-
: $this->assertNotContains('admin-recaptcha', $content);
187+
? $this->assertStringContainsString('admin-recaptcha', $content)
188+
: $this->assertStringNotContainsString('admin-recaptcha', $content);
189189

190190
self::assertEmpty($this->getSessionMessages(MessageInterface::TYPE_ERROR));
191191
}

0 commit comments

Comments
 (0)