Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit cc59bc797b77 · 2020-01-21T09:40:24.000+01:00
* 4.4:
  [DI] Fix EnvVar not loaded when Loader requires an env var
  Fixed #34713 Move new messages to intl domain when possible
  [FrameworkBundle] Fix small typo in output comment
  chown and chgrp should also accept int as owner and group
  Revert "Fixed translations file dumper behavior"
  Fix RememberMe with null password
  [Validator] Fix plurals for sr_Latn (Serbian language written in latin script) validation messages
  Set booted flag to false when test kernel is unset
  [FrameworkBundle] remove messenger cache if not enabled
  [PhpUnitBridge][SymfonyTestsListenerTrait] Remove some unneeded code
  [HttpClient] Fix strict parsing of response status codes
  fix PHP const mapping keys using the inline notation
  [SecurityBundle] Drop duplicated code
  [FrameworkBundle] Make sure one can use fragments.hinclude_default_template
  Fix that no-cache requires positive validation with the origin, even for fresh responses
  Improve upgrading instructions for deprecated router options
  [DI] Suggest typed argument when binding fails with untyped argument
diff --git a/Command/SecretsListCommand.php b/Command/SecretsListCommand.php
@@ -101,7 +101,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         (new SymfonyStyle($input, $output))
             ->table(['Secret', 'Value'] + (null !== $localSecrets ? [2 => 'Local Value'] : []), $rows);
 
-        $io->comment("Local values override secret values.\nUse <info>secrets:set --local</info> to defined them.");
+        $io->comment("Local values override secret values.\nUse <info>secrets:set --local</info> to define them.");
 
         return 0;
     }
diff --git a/Command/TranslationUpdateCommand.php b/Command/TranslationUpdateCommand.php
@@ -23,6 +23,7 @@
 use Symfony\Component\Translation\Catalogue\TargetOperation;
 use Symfony\Component\Translation\Extractor\ExtractorInterface;
 use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Translation\MessageCatalogueInterface;
 use Symfony\Component\Translation\Reader\TranslationReaderInterface;
 use Symfony\Component\Translation\Writer\TranslationWriterInterface;
 
@@ -216,6 +217,24 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $resultMessage = 'Translation files were successfully updated';
 
+        // move new messages to intl domain when possible
+        if (class_exists(\MessageFormatter::class)) {
+            foreach ($operation->getDomains() as $domain) {
+                $intlDomain = $domain.MessageCatalogueInterface::INTL_DOMAIN_SUFFIX;
+                $newMessages = $operation->getNewMessages($domain);
+
+                if ([] === $newMessages || ([] === $currentCatalogue->all($intlDomain) && [] !== $currentCatalogue->all($domain))) {
+                    continue;
+                }
+
+                $result = $operation->getResult();
+                $allIntlMessages = $result->all($intlDomain);
+                $currentMessages = array_diff_key($newMessages, $result->all($domain));
+                $result->replace($currentMessages, $domain);
+                $result->replace($allIntlMessages + $newMessages, $intlDomain);
+            }
+        }
+
         // show compiled list of messages
         if (true === $input->getOption('dump-messages')) {
             $extractedMessagesCount = 0;
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -311,6 +311,7 @@ public function load(array $configs, ContainerBuilder $container)
             $container->removeDefinition('console.command.messenger_failed_messages_retry');
             $container->removeDefinition('console.command.messenger_failed_messages_show');
             $container->removeDefinition('console.command.messenger_failed_messages_remove');
+            $container->removeDefinition('cache.messenger.restart_workers_signal');
         }
 
         if ($this->httpClientConfigEnabled = $this->isConfigEnabled($container, $config['http_client'])) {
diff --git a/Resources/config/schema/symfony-1.0.xsd b/Resources/config/schema/symfony-1.0.xsd
@@ -412,6 +412,7 @@
             <xsd:element name="bus" type="messenger_bus" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="default-bus" type="xsd:string" />
+        <xsd:attribute name="enabled" type="xsd:boolean" />
     </xsd:complexType>
 
     <xsd:complexType name="messenger_serializer">
diff --git a/Test/KernelTestCase.php b/Test/KernelTestCase.php
@@ -43,6 +43,7 @@ protected function tearDown(): void
     {
         static::ensureKernelShutdown();
         static::$kernel = null;
+        static::$booted = false;
     }
 
     /**
diff --git a/Tests/DependencyInjection/Fixtures/php/fragments_and_hinclude.php b/Tests/DependencyInjection/Fixtures/php/fragments_and_hinclude.php
@@ -0,0 +1,8 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'fragments' => [
+        'enabled' => true,
+        'hinclude_default_template' => 'global_hinclude_template',
+    ],
+]);
diff --git a/Tests/DependencyInjection/Fixtures/php/messenger_disabled.php b/Tests/DependencyInjection/Fixtures/php/messenger_disabled.php
@@ -0,0 +1,5 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'messenger' => false,
+]);
diff --git a/Tests/DependencyInjection/Fixtures/xml/fragments_and_hinclude.xml b/Tests/DependencyInjection/Fixtures/xml/fragments_and_hinclude.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:fragments enabled="true" hinclude-default-template="global_hinclude_template"/>
+    </framework:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/messenger_disabled.xml b/Tests/DependencyInjection/Fixtures/xml/messenger_disabled.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:framework="http://symfony.com/schema/dic/symfony"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:messenger enabled="false" />
+    </framework:config>
+</container>
diff --git a/Tests/DependencyInjection/Fixtures/yml/fragments_and_hinclude.yml b/Tests/DependencyInjection/Fixtures/yml/fragments_and_hinclude.yml
@@ -0,0 +1,4 @@
+framework:
+    fragments:
+        enabled: true
+        hinclude_default_template: global_hinclude_template
diff --git a/Tests/DependencyInjection/Fixtures/yml/messenger_disabled.yml b/Tests/DependencyInjection/Fixtures/yml/messenger_disabled.yml
@@ -0,0 +1,2 @@
+framework:
+    messenger: false
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -159,6 +159,13 @@ public function testEsiDisabled()
         $this->assertFalse($container->hasDefinition('esi'));
     }
 
+    public function testFragmentsAndHinclude()
+    {
+        $container = $this->createContainerFromFile('fragments_and_hinclude');
+        $this->assertTrue($container->hasParameter('fragment.renderer.hinclude.global_template'));
+        $this->assertEquals('global_hinclude_template', $container->getParameter('fragment.renderer.hinclude.global_template'));
+    }
+
     public function testSsi()
     {
         $container = $this->createContainerFromFile('full');
@@ -565,9 +572,23 @@ public function testWebLink()
         $this->assertTrue($container->hasDefinition('web_link.add_link_header_listener'));
     }
 
+    public function testMessengerServicesRemovedWhenDisabled()
+    {
+        $container = $this->createContainerFromFile('messenger_disabled');
+        $this->assertFalse($container->hasDefinition('console.command.messenger_consume_messages'));
+        $this->assertFalse($container->hasDefinition('console.command.messenger_debug'));
+        $this->assertFalse($container->hasDefinition('console.command.messenger_stop_workers'));
+        $this->assertFalse($container->hasDefinition('console.command.messenger_setup_transports'));
+        $this->assertFalse($container->hasDefinition('console.command.messenger_failed_messages_retry'));
+        $this->assertFalse($container->hasDefinition('console.command.messenger_failed_messages_show'));
+        $this->assertFalse($container->hasDefinition('console.command.messenger_failed_messages_remove'));
+        $this->assertFalse($container->hasDefinition('cache.messenger.restart_workers_signal'));
+    }
+
     public function testMessenger()
     {
         $container = $this->createContainerFromFile('messenger');
+        $this->assertTrue($container->hasDefinition('console.command.messenger_consume_messages'));
         $this->assertTrue($container->hasAlias('messenger.default_bus'));
         $this->assertTrue($container->getAlias('messenger.default_bus')->isPublic());
         $this->assertTrue($container->hasDefinition('messenger.transport.amqp.factory'));

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`101`	`101`	`(new SymfonyStyle($input, $output))`
`102`	`102`	`->table(['Secret', 'Value'] + (null !== $localSecrets ? [2 => 'Local Value'] : []), $rows);`
`103`	`103`
`104`		`- $io->comment("Local values override secret values.\nUse <info>secrets:set --local</info> to defined them.");`
	`104`	`+ $io->comment("Local values override secret values.\nUse <info>secrets:set --local</info> to define them.");`
`105`	`105`
`106`	`106`	`return 0;`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,7 @@ public function load(array $configs, ContainerBuilder $container)`
`311`	`311`	`$container->removeDefinition('console.command.messenger_failed_messages_retry');`
`312`	`312`	`$container->removeDefinition('console.command.messenger_failed_messages_show');`
`313`	`313`	`$container->removeDefinition('console.command.messenger_failed_messages_remove');`
	`314`	`+ $container->removeDefinition('cache.messenger.restart_workers_signal');`
`314`	`315`	`}`
`315`	`316`
`316`	`317`	`if ($this->httpClientConfigEnabled = $this->isConfigEnabled($container, $config['http_client'])) {`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ protected function tearDown(): void`
`43`	`43`	`{`
`44`	`44`	`static::ensureKernelShutdown();`
`45`	`45`	`static::$kernel = null;`
	`46`	`+ static::$booted = false;`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`/**`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +<?php
++
 +$container->loadFromExtension('framework', [
 +    'messenger' => false,
 +]);