Merge branch '7.3' into 7.4

* 7.3:
  Use unique identifier for RequestContextProvider
  [Validator] Add Japanese translation for Twig template validator
  fix doc url
  [FrameworkBundle] Fix `lint:container --resolve-env-vars`

Author: xabbuh

src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php

@@ -24,6 +24,8 @@
 use Symfony\Component\DependencyInjection\Compiler\CheckTypeDeclarationsPass;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\DependencyInjection\Compiler\ResolveFactoryClassPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveParameterPlaceHoldersPass;
+use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
@@ -48,8 +50,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $io = new SymfonyStyle($input, $output);
         $errorIo = $io->getErrorStyle();
 
+        $resolveEnvVars = $input->getOption('resolve-env-vars');
+
         try {
-            $container = $this->getContainerBuilder();
+            $container = $this->getContainerBuilder($resolveEnvVars);
         } catch (RuntimeException $e) {
             $errorIo->error($e->getMessage());
 
@@ -59,7 +63,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $container->setParameter('container.build_time', time());
 
         try {
-            $container->compile((bool) $input->getOption('resolve-env-vars'));
+            $container->compile($resolveEnvVars);
         } catch (InvalidArgumentException $e) {
             $errorIo->error($e->getMessage());
 
@@ -71,7 +75,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    private function getContainerBuilder(): ContainerBuilder
+    private function getContainerBuilder(bool $resolveEnvVars): ContainerBuilder
     {
         if (isset($this->container)) {
             return $this->container;
@@ -103,17 +107,23 @@ private function getContainerBuilder(): ContainerBuilder
                 throw new RuntimeException(\sprintf('This command does not support the application container: "%s" is not a "%s".', get_debug_type($container), ContainerBuilder::class));
             }
 
-            $parameterBag = $container->getParameterBag();
-            $refl = new \ReflectionProperty($parameterBag, 'resolved');
-            $refl->setValue($parameterBag, true);
+            if ($resolveEnvVars) {
+                $container->getCompilerPassConfig()->setOptimizationPasses([new ResolveParameterPlaceHoldersPass(), new ResolveFactoryClassPass()]);
+            } else {
+                $parameterBag = $container->getParameterBag();
+                $refl = new \ReflectionProperty($parameterBag, 'resolved');
+                $refl->setValue($parameterBag, true);
+
+                $container->getCompilerPassConfig()->setOptimizationPasses([new ResolveFactoryClassPass()]);
+            }
 
             $container->getCompilerPassConfig()->setBeforeOptimizationPasses([]);
-            $container->getCompilerPassConfig()->setOptimizationPasses([new ResolveFactoryClassPass()]);
             $container->getCompilerPassConfig()->setBeforeRemovingPasses([]);
         }
 
         $container->setParameter('container.build_hash', 'lint_container');
         $container->setParameter('container.build_id', 'lint_container');
+        $container->setParameter('container.runtime_mode', 'web=0');
 
         $container->addCompilerPass(new CheckAliasValidityPass(), PassConfig::TYPE_BEFORE_REMOVING, -100);
         $container->addCompilerPass(new CheckTypeDeclarationsPass(true), PassConfig::TYPE_AFTER_REMOVING, -100);

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerLintCommandTest.php

@@ -24,27 +24,28 @@ class ContainerLintCommandTest extends AbstractWebTestCase
     /**
      * @dataProvider containerLintProvider
      */
-    public function testLintContainer(string $configFile, string $expectedOutput)
+    public function testLintContainer(string $configFile, bool $resolveEnvVars, int $expectedExitCode, string $expectedOutput)
     {
         $kernel = static::createKernel([
-            'test_case' => 'ContainerDebug',
+            'test_case' => 'ContainerLint',
             'root_config' => $configFile,
             'debug' => true,
         ]);
         $this->application = new Application($kernel);
 
         $tester = $this->createCommandTester();
-        $exitCode = $tester->execute([]);
+        $exitCode = $tester->execute(['--resolve-env-vars' => $resolveEnvVars]);
 
-        $this->assertSame(0, $exitCode);
+        $this->assertSame($expectedExitCode, $exitCode);
         $this->assertStringContainsString($expectedOutput, $tester->getDisplay());
     }
 
     public static function containerLintProvider(): array
     {
         return [
-            'default container' => ['config.yml', 'The container was linted successfully'],
-            'missing dump file' => ['no_dump.yml', 'The container was linted successfully'],
+            ['escaped_percent.yml', false, 0, 'The container was linted successfully'],
+            ['missing_env_var.yml', false, 0, 'The container was linted successfully'],
+            ['missing_env_var.yml', true, 1, 'Environment variable not found: "BAR"'],
         ];
     }
 

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerLint/bundles.php

@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\TestBundle;
+
+return [
+    new FrameworkBundle(),
+    new TestBundle(),
+];

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerLint/escaped_percent.yml

@@ -0,0 +1,5 @@
+imports:
+    - { resource: ../config/default.yml }
+
+parameters:
+    percent: '%%foo%%'

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerLint/missing_env_var.yml

@@ -0,0 +1,5 @@
+imports:
+    - { resource: ../config/default.yml }
+
+parameters:
+    foo: '%env(BAR)%'

src/Symfony/Component/JsonPath/README.md

@@ -35,7 +35,7 @@ $result = $crawler->find("$.store.book[?(@.category == 'fiction')].title");
 Resources
 ---------
 
- * [Documentation](https://symfony.com/doc/current/components/dom_crawler.html)
+ * [Documentation](https://symfony.com/doc/current/components/json_path.html)
  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
  * [Report issues](https://github.com/symfony/symfony/issues) and
    [send Pull Requests](https://github.com/symfony/symfony/pulls)