Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e212fd9

Browse filesBrowse files
committed
Merge branch '5.4' into 6.0
* 5.4: 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 b4b87d2 + 5af3392 commit e212fd9
Copy full SHA for e212fd9

File tree

4 files changed

+4
-2
lines changed
Filter options

4 files changed

+4
-2
lines changed

‎.appveyor.yml

Copy file name to clipboardExpand all lines: .appveyor.yml
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ install:
4646
- echo extension=php_fileinfo.dll >> php.ini-max
4747
- echo extension=php_pdo_sqlite.dll >> php.ini-max
4848
- echo extension=php_curl.dll >> php.ini-max
49+
- echo extension=php_sodium.dll >> php.ini-max
4950
- copy /Y php.ini-max php.ini
5051
- cd c:\projects\symfony
5152
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/2.0.0/composer.phar)

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@
131131
"masterminds/html5": "^2.6",
132132
"monolog/monolog": "^1.25.1|^2",
133133
"nyholm/psr7": "^1.0",
134-
"paragonie/sodium_compat": "^1.8",
135134
"pda/pheanstalk": "^4.0",
136135
"php-http/httplug": "^1.0|^2.0",
137136
"phpstan/phpdoc-parser": "^1.0",

‎src/Symfony/Bundle/FrameworkBundle/Tests/Secrets/SodiumVaultTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Secrets/SodiumVaultTest.php
+3Lines 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;

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/composer.json
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
"symfony/property-info": "^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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.