Merge branch '6.4' into 7.0

fabpot · fabpot · commit 7ea560f29c7b · 2023-10-21T12:31:54.000+02:00
* 6.4:
  synchronize require-dev and conflict sections
  [AssetMapper] Normalizing path in test to fix / \ comparison in Windows
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -90,6 +90,7 @@
         "symfony/mime": "<6.4",
         "symfony/property-info": "<6.4",
         "symfony/property-access": "<6.4",
+        "symfony/scheduler": "<6.4",
         "symfony/serializer": "<6.4",
         "symfony/security-csrf": "<6.4",
         "symfony/security-core": "<6.4",
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -62,8 +62,11 @@
         "symfony/browser-kit": "<6.4",
         "symfony/console": "<6.4",
         "symfony/framework-bundle": "<6.4",
+        "symfony/http-client": "<6.4",
         "symfony/ldap": "<6.4",
-        "symfony/twig-bundle": "<6.4"
+        "symfony/serializer": "<6.4",
+        "symfony/twig-bundle": "<6.4",
+        "symfony/validator": "<6.4"
     },
     "autoload": {
         "psr-4": { "Symfony\\Bundle\\SecurityBundle\\": "" },
diff --git a/src/Symfony/Component/AssetMapper/Tests/CompiledAssetMapperConfigReaderTest.php b/src/Symfony/Component/AssetMapper/Tests/CompiledAssetMapperConfigReaderTest.php
@@ -54,7 +54,7 @@ public function testLoadConfig()
     public function testSaveConfig()
     {
         $reader = new CompiledAssetMapperConfigReader($this->writableRoot);
-        $this->assertEquals($this->writableRoot.'/foo.json', $reader->saveConfig('foo.json', ['foo' => 'bar']));
+        $this->assertEquals($this->writableRoot.\DIRECTORY_SEPARATOR.'foo.json', realpath($reader->saveConfig('foo.json', ['foo' => 'bar'])));
         $this->assertEquals(['foo' => 'bar'], json_decode(file_get_contents($this->writableRoot.'/foo.json'), true));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function testLoadConfig()`
`54`	`54`	`public function testSaveConfig()`
`55`	`55`	`{`
`56`	`56`	`$reader = new CompiledAssetMapperConfigReader($this->writableRoot);`
`57`		`- $this->assertEquals($this->writableRoot.'/foo.json', $reader->saveConfig('foo.json', ['foo' => 'bar']));`
	`57`	`+ $this->assertEquals($this->writableRoot.\DIRECTORY_SEPARATOR.'foo.json', realpath($reader->saveConfig('foo.json', ['foo' => 'bar'])));`
`58`	`58`	`$this->assertEquals(['foo' => 'bar'], json_decode(file_get_contents($this->writableRoot.'/foo.json'), true));`
`59`	`59`	`}`
`60`	`60`