Skip to content

Commit 75f2e6e

Browse files
Merge branch '5.4' into 6.2
* 5.4: [Serializer] Fix CsvEncoder decode on empty data [Tests] Migrate data providers to static ones stop using assertObjectHasAttribute()/assertObjectHasNotAttribute() [Dotenv] Fix phpdoc Dotenv [Config] Fix phpdoc nullable Fix some typos
2 parents 81cb894 + 3824c0f commit 75f2e6e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Tests/Form/DoctrineOrmTypeGuesserTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function testTypeGuesser(string $type, $expected)
3535
$this->assertEquals($expected, $this->getGuesser($classMetadata)->guessType('TestEntity', 'field'));
3636
}
3737

38-
public function requiredType()
38+
public static function requiredType()
3939
{
4040
yield [Types::DATE_IMMUTABLE, new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', ['input' => 'datetime_immutable'], Guess::HIGH_CONFIDENCE)];
4141
yield [Types::DATE_MUTABLE, new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', [], Guess::HIGH_CONFIDENCE)];

Tests/ManagerRegistryTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public function testResetService()
4444
$registry->resetManager();
4545

4646
$this->assertSame($foo, $container->get('foo'));
47-
$this->assertObjectNotHasAttribute('bar', $foo);
47+
$this->assertInstanceOf(\stdClass::class, $foo);
48+
$this->assertFalse(property_exists($foo, 'bar'));
4849
}
4950

5051
/**

0 commit comments

Comments
 (0)