Skip to content

Commit 4509255

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: Remove comment about AppVeyor in `phpunit` [Webhook][RemoteEvent] fix SendgridPayloadConverter category support Update old Appveyor skip conditions sync the Dutch translation file with changes from the 7.2 branch [Yaml] fix inline notation with inline comment fix(property-info): make sure that SerializerExtractor returns null for invalid class metadata [RemoteEvent][Webhook] fix SendgridRequestParser & SendgridPayloadConverter in case of missing sg_message_id fix_50486 - memory leak
2 parents ac18f1f + 75480ee commit 4509255

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Tests/Dumper/ServerDumperTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public function testDumpForwardsToWrappedDumperWhenServerIsUnavailable()
3939

4040
public function testDump()
4141
{
42-
if ('True' === getenv('APPVEYOR')) {
43-
$this->markTestSkipped('Skip transient test on AppVeyor');
42+
if ('\\' === \DIRECTORY_SEPARATOR) {
43+
$this->markTestSkipped('Skip transient test on Windows');
4444
}
4545

4646
$wrappedDumper = $this->createMock(DataDumperInterface::class);

Tests/Server/ConnectionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class ConnectionTest extends TestCase
2424

2525
public function testDump()
2626
{
27-
if ('True' === getenv('APPVEYOR')) {
28-
$this->markTestSkipped('Skip transient test on AppVeyor');
27+
if ('\\' === \DIRECTORY_SEPARATOR) {
28+
$this->markTestSkipped('Skip transient test on Windows');
2929
}
3030

3131
$cloner = new VarCloner();

0 commit comments

Comments
 (0)