Skip to content

Commit 0955a14

Browse files
Merge branch '6.2' into 6.3
* 6.2: minor #49253 [PHPUnit 10] Use `TestCase` suffix for abstract tests in `/Tests/` (OskarStark) [Intl] Generate all emoji short name returned by slack api [Serializer] Fix CsvEncoder decode on empty data [Tests] Migrate data providers to static ones stop using assertObjectHasAttribute()/assertObjectHasNotAttribute() [Cache] Fix Redis proxies [Dotenv] Fix phpdoc Dotenv [Config] Fix phpdoc nullable Replace deprecated/removed way to configure enabled_locales fix typo Fix some typos
2 parents 96392fb + 9d25855 commit 0955a14

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
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
@@ -46,7 +46,8 @@ public function testResetService()
4646
$registry->resetManager();
4747

4848
$this->assertSame($foo, $container->get('foo'));
49-
$this->assertObjectNotHasAttribute('bar', $foo);
49+
$this->assertInstanceOf(\stdClass::class, $foo);
50+
$this->assertFalse(property_exists($foo, 'bar'));
5051
}
5152

5253
/**

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"symfony/cache": "^5.4|^6.0",
3030
"symfony/config": "^5.4|^6.0",
3131
"symfony/dependency-injection": "^6.2",
32-
"symfony/form": "^6.3",
32+
"symfony/form": "^5.4.21|^6.2.7",
3333
"symfony/http-kernel": "^6.2",
3434
"symfony/messenger": "^5.4|^6.0",
3535
"symfony/doctrine-messenger": "^5.4|^6.0",
@@ -57,7 +57,7 @@
5757
"phpunit/phpunit": "<5.4.3",
5858
"symfony/cache": "<5.4",
5959
"symfony/dependency-injection": "<6.2",
60-
"symfony/form": "<6.3",
60+
"symfony/form": "<5.4.21|>=6,<6.2.7",
6161
"symfony/http-foundation": "<6.3",
6262
"symfony/http-kernel": "<6.2",
6363
"symfony/messenger": "<5.4",

0 commit comments

Comments
 (0)