Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 1e5340da1562 · 2021-11-17T13:23:22.000+01:00
* 5.4: (22 commits)
  fix cs
  Update validators.lv.xlf
  Fix API gateway service name
  Improve recommendation message for "composer req"
  Fix CS in composer.json
  [DependencyInjection] fix preloading
  Update validators.uz.xlf
  AddMake ExpressionVoter Cacheable
  Add framework config for DBAL cache adapter
  [ExpressionLanguage] Fix LexerTest number types
  [Process] intersect with getenv() to populate default envs
  Improve CI script a bit
  Fix deprecation message placeholders
  [Cache] Fix calculate ttl in couchbase sdk 3.0
  Fix Loco Provider
  [Cache] fix dbindex Redis
  Fix typos in a test message
  [Cache] fix releasing not acquired locks
  [DependencyInjection] fix creating 2nd container instances
  Never rely on dynamic properties
  ...
diff --git a/Tests/Fixtures/KernelForTest.php b/Tests/Fixtures/KernelForTest.php
@@ -27,7 +27,7 @@ public function __construct(string $environment, bool $debug, bool $fakeContaine
 
     public function getBundleMap()
     {
-        return $this->bundleMap;
+        return [];
     }
 
     public function registerBundles(): iterable

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function __construct(string $environment, bool $debug, bool $fakeContaine`
`27`	`27`
`28`	`28`	`public function getBundleMap()`
`29`	`29`	`{`
`30`		`- return $this->bundleMap;`
	`30`	`+ return [];`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public function registerBundles(): iterable`