Merge branch '5.4' into 6.0

derrabus · derrabus · commit e212fd93165c · 2022-03-01T11:14:40.000+01:00
* 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
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -46,6 +46,7 @@ install:
     - echo extension=php_fileinfo.dll >> php.ini-max
     - echo extension=php_pdo_sqlite.dll >> php.ini-max
     - echo extension=php_curl.dll >> php.ini-max
+    - echo extension=php_sodium.dll >> php.ini-max
     - copy /Y php.ini-max php.ini
     - cd c:\projects\symfony
     - IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/2.0.0/composer.phar)
diff --git a/composer.json b/composer.json
@@ -131,7 +131,6 @@
         "masterminds/html5": "^2.6",
         "monolog/monolog": "^1.25.1|^2",
         "nyholm/psr7": "^1.0",
-        "paragonie/sodium_compat": "^1.8",
         "pda/pheanstalk": "^4.0",
         "php-http/httplug": "^1.0|^2.0",
         "phpstan/phpdoc-parser": "^1.0",
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Secrets/SodiumVaultTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Secrets/SodiumVaultTest.php
@@ -6,6 +6,9 @@
 use Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault;
 use Symfony\Component\Filesystem\Filesystem;
 
+/**
+ * @requires extension sodium
+ */
 class SodiumVaultTest extends TestCase
 {
     private $secretsDir;
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -64,7 +64,6 @@
         "symfony/property-info": "^5.4|^6.0",
         "symfony/web-link": "^5.4|^6.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-        "paragonie/sodium_compat": "^1.8",
         "twig/twig": "^2.10|^3.0",
         "symfony/phpunit-bridge": "^5.4|^6.0"
     },

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`use Symfony\Bundle\FrameworkBundle\Secrets\SodiumVault;`
`7`	`7`	`use Symfony\Component\Filesystem\Filesystem;`
`8`	`8`
	`9`	`+/**`
	`10`	`+ * @requires extension sodium`
	`11`	`+ */`
`9`	`12`	`class SodiumVaultTest extends TestCase`
`10`	`13`	`{`
`11`	`14`	`private $secretsDir;`