Skip to content

Commit d303a23

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 73db41c + e550ed0 commit d303a23

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Tests/Extension/PasswordHasher/Type/PasswordTypePasswordHasherExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function testPasswordHashSuccess()
7777
$this->assertSame($user->getPassword(), $hashedPassword);
7878
}
7979

80-
public function testPasswordHashSuccessWitnEmptyData()
80+
public function testPasswordHashSuccessWithEmptyData()
8181
{
8282
$user = new User();
8383

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@
4747
"phpunit/phpunit": "<5.4.3",
4848
"symfony/console": "<5.4",
4949
"symfony/dependency-injection": "<5.4",
50-
"symfony/doctrine-bridge": "<6.3",
50+
"symfony/doctrine-bridge": "<5.4.21|>=6,<6.2.7",
5151
"symfony/error-handler": "<5.4",
5252
"symfony/framework-bundle": "<5.4",
5353
"symfony/http-kernel": "<5.4",
5454
"symfony/translation": "<5.4",
5555
"symfony/translation-contracts": "<2.5",
56-
"symfony/twig-bridge": "<6.3"
56+
"symfony/twig-bridge": "<5.4.21|>=6,<6.2.7"
5757
},
5858
"suggest": {
5959
"symfony/validator": "For form validation.",

0 commit comments

Comments
 (0)