Merge branch '5.4' into 6.0

* 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
  ...

Author: nicolas-grekas

Dumper/PhpDumper.php

@@ -324,7 +324,7 @@ class %s extends {$options['class']}
 }
 
 require $autoloadFile;
-(require __DIR__.'/Container{$hash}/{$options['class']}.php')->set(\\Container{$hash}\\{$options['class']}::class, null);
+(require __DIR__.'/{$options['class']}.php')->set(\\Container{$hash}\\{$options['class']}::class, null);
 $preloadedFiles
 \$classes = [];
 
@@ -1472,7 +1472,7 @@ private function addInlineRequires(bool $hasProxyClasses): string
         }
 
         if ($hasProxyClasses) {
-            $code .= "\n            include __DIR__.'/proxy-classes.php';";
+            $code .= "\n            include_once __DIR__.'/proxy-classes.php';";
         }
 
         return $code ? sprintf("\n        \$this->privates['service_container'] = function () {%s\n        };\n", $code) : '';

Tests/ContainerBuilderTest.php

@@ -242,7 +242,6 @@ public function testGetServiceIds()
     {
         $builder = new ContainerBuilder();
         $builder->register('foo', 'stdClass');
-        $builder->bar = $bar = new \stdClass();
         $builder->register('bar', 'stdClass');
         $this->assertEquals(
             [

Tests/Fixtures/StdClassDecorator.php

@@ -4,6 +4,8 @@
 
 final class StdClassDecorator
 {
+    public $foo;
+
     public function __construct(\stdClass $foo)
     {
         $this->foo = $foo;

Tests/Fixtures/includes/classes.php

@@ -142,6 +142,8 @@ public static function create($config)
 
 class FoobarCircular
 {
+    public $foo;
+
     public function __construct(FooCircular $foo)
     {
         $this->foo = $foo;
@@ -150,6 +152,8 @@ public function __construct(FooCircular $foo)
 
 class FooCircular
 {
+    public $bar;
+
     public function __construct(BarCircular $bar)
     {
         $this->bar = $bar;
@@ -158,6 +162,8 @@ public function __construct(BarCircular $bar)
 
 class BarCircular
 {
+    public $foobar;
+
     public function addFoobar(FoobarCircular $foobar)
     {
         $this->foobar = $foobar;

Tests/Fixtures/php/services10_as_files.txt

@@ -131,7 +131,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
 }
 
 require dirname(__DIR__, %d).'%svendor/autoload.php';
-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
 require __DIR__.'/Container%s/getClosureService.php';
 
 $classes = [];

Tests/Fixtures/php/services9_as_files.txt

@@ -897,7 +897,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
 }
 
 require dirname(__DIR__, %d).'%svendor/autoload.php';
-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
 require __DIR__.'/Container%s/getThrowingOneService.php';
 require __DIR__.'/Container%s/getTaggedIteratorService.php';
 require __DIR__.'/Container%s/getServiceFromStaticMethodService.php';

Tests/Fixtures/php/services9_inlined_factories.txt

@@ -552,7 +552,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
 }
 
 require dirname(__DIR__, %d).'%svendor/autoload.php';
-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
 
 $classes = [];
 $classes[] = 'Bar\FooClass';

Tests/Fixtures/php/services9_lazy_inlined_factories.txt

@@ -51,7 +51,7 @@ class ProjectServiceContainer extends Container
         $this->aliases = [];
 
         $this->privates['service_container'] = function () {
-            include __DIR__.'/proxy-classes.php';
+            include_once __DIR__.'/proxy-classes.php';
         };
     }
 
@@ -169,7 +169,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
 }
 
 require dirname(__DIR__, %d).'%svendor/autoload.php';
-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
 
 $classes = [];
 $classes[] = 'Bar\FooClass';

Tests/Fixtures/php/services_non_shared_lazy_as_files.txt

@@ -130,7 +130,7 @@ if (in_array(PHP_SAPI, ['cli', 'phpdbg'], true)) {
 }
 
 require dirname(__DIR__, %d).'%svendor/autoload.php';
-(require __DIR__.'/Container%s/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
+(require __DIR__.'/ProjectServiceContainer.php')->set(\Container%s\ProjectServiceContainer::class, null);
 require __DIR__.'/Container%s/proxy.php';
 require __DIR__.'/Container%s/getNonSharedFooService.php';