Merge branch '7.4' into 8.0

nicolas-grekas · nicolas-grekas · commit b3c6df5b68cd · 2025-10-23T19:15:34.000+02:00
* 7.4:
  [DependencyInjection] Fix FC with Config v8
  Use standard MONGODB_URI for test configuration
diff --git a/Tests/Store/MongoDbStoreTest.php b/Tests/Store/MongoDbStoreTest.php
@@ -50,7 +50,7 @@ public static function setUpBeforeClass(): void
 
     private static function getMongoManager(): Manager
     {
-        return new Manager('mongodb://'.getenv('MONGODB_HOST'));
+        return new Manager(getenv('MONGODB_URI'));
     }
 
     protected function getClockDelay(): int
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -13,7 +13,7 @@
         <ini name="error_reporting" value="-1" />
         <env name="REDIS_HOST" value="localhost" />
         <env name="MEMCACHED_HOST" value="localhost" />
-        <env name="MONGODB_HOST" value="localhost" />
+        <env name="MONGODB_URI" value="mongodb://localhost:27017" />
         <env name="ZOOKEEPER_HOST" value="localhost" />
     </php>
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static function setUpBeforeClass(): void`
`50`	`50`
`51`	`51`	`private static function getMongoManager(): Manager`
`52`	`52`	`{`
`53`		`- return new Manager('mongodb://'.getenv('MONGODB_HOST'));`
	`53`	`+ return new Manager(getenv('MONGODB_URI'));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`protected function getClockDelay(): int`