Skip to content

Commit b41d4c4

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: (47 commits) 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 clean up code for doctrine/persistence 2.x Generate missing translations using Gemini fix(property-info): make sure that SerializerExtractor returns null for invalid class metadata add translations for the Slug constraint [RemoteEvent][Webhook] fix SendgridRequestParser & SendgridPayloadConverter in case of missing sg_message_id [Messenger] Fix `TransportMessageIdStamp` not always added [DoctrineBridge] Fix compatibility to Doctrine persistence 2.5 in Doctrine Bridge 6.4 to avoid Projects stuck on 6.3 [PropertyInfo] Fix add missing composer conflict [ErrorHandler] Don't trigger "internal" deprecations for anonymous LazyClosure instances [VarDumper] Fix displaying closure's "this" from anonymous classes [Doctrine][Messenger] Prevents multiple TransportMessageIdStamp being stored in envelope [HttpKernel] Don't override existing LoggerInterface autowiring alias in LoggerPass reject inline notations followed by invalid content Fix predis command error checking [Security] Fix triggering session tracking from ContextListener ...
2 parents ee43df6 + a7c2f5a commit b41d4c4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Caster/CutStub.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function __construct(mixed $value)
2727
switch (\gettype($value)) {
2828
case 'object':
2929
$this->type = self::TYPE_OBJECT;
30-
$this->class = $value::class;
30+
$this->class = get_debug_type($value);
3131

3232
if ($value instanceof \Closure) {
3333
ReflectionCaster::castClosure($value, [], $this, true, Caster::EXCLUDE_VERBOSE);

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)