Skip to content

Commit 2072c3e

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Update VERSION for 5.3.16 Update CHANGELOG for 5.3.16 [Console] Revert StringInput bc break from #45088 [FrameworkBundle] require ext-sodium in tests [HttpClient] fix checking for unset property on PHP <= 7.1.4
2 parents 2f3f538 + ef5fe18 commit 2072c3e

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Tests/Secrets/SodiumVaultTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
use Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault;
77
use Symfony\Component\Filesystem\Filesystem;
88

9+
/**
10+
* @requires extension sodium
11+
*/
912
class SodiumVaultTest extends TestCase
1013
{
1114
private $secretsDir;

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
"symfony/uid": "^5.4|^6.0",
6565
"symfony/web-link": "^5.4|^6.0",
6666
"phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
67-
"paragonie/sodium_compat": "^1.8",
6867
"twig/twig": "^2.10|^3.0",
6968
"symfony/phpunit-bridge": "^5.4|^6.0"
7069
},

0 commit comments

Comments
 (0)