Merge branch '4.4' into 5.0

* 4.4:
  [appveyor] bump cache
  [Twig][Mime] Removed extra quotes in missing package exception message
  [DI] µfix
  Allowing empty secrets to be set
  [DI] add missing property declarations in InlineServiceConfigurator
  [DI] fix detecting short service syntax in yaml
  Supress error from fread when reading a unix pipe
  [HttpClient] Fix scoped client without query option configuration
  [Workflow] Use a strict comparison when retrieving raw marking in MarkingStore
  [Workflow] Use a strict comparison when retrieving raw markin in MarkingStore

Author: nicolas-grekas

Command/SecretsSetCommand.php

@@ -96,6 +96,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $value = strtr(substr(base64_encode(random_bytes($random)), 0, $random), '+/', '-_');
         } elseif (!$file = $input->getArgument('file')) {
             $value = $io->askHidden('Please type the secret value');
+
+            if (null === $value) {
+                $io->warning('No value provided: using empty string');
+                $value = '';
+            }
         } elseif ('-' === $file) {
             $value = file_get_contents('php://stdin');
         } elseif (is_file($file) && is_readable($file)) {
@@ -106,12 +111,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             throw new \InvalidArgumentException(sprintf('File is not readable: "%s".', $file));
         }
 
-        if (null === $value) {
-            $io->warning('No value provided, aborting.');
-
-            return 1;
-        }
-
         if ($vault->generateKeys()) {
             $io->success($vault->getLastMessage());
 

DependencyInjection/Configuration.php

@@ -1345,7 +1345,7 @@ private function addHttpClientSection(ArrayNodeDefinition $rootNode)
                                     ->thenInvalid('Either "scope" or "base_uri" should be defined.')
                                 ->end()
                                 ->validate()
-                                    ->ifTrue(function ($v) { return isset($v['query']) && !isset($v['base_uri']); })
+                                    ->ifTrue(function ($v) { return !empty($v['query']) && !isset($v['base_uri']); })
                                     ->thenInvalid('"query" applies to "base_uri" but no base URI is defined.')
                                 ->end()
                                 ->children()

Tests/DependencyInjection/Fixtures/php/http_client_scoped_without_query_option.php

@@ -0,0 +1,11 @@
+<?php
+
+$container->loadFromExtension('framework', [
+    'http_client' => [
+        'scoped_clients' => [
+            'foo' => [
+                'scope' => '.*',
+            ],
+        ],
+    ],
+]);

Tests/DependencyInjection/Fixtures/xml/http_client_scoped_without_query_option.xml

@@ -0,0 +1,16 @@
+<?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 http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+    <framework:config>
+        <framework:http-client>
+            <framework:scoped-client
+                name="foo"
+                scope=".*"
+            />
+        </framework:http-client>
+    </framework:config>
+</container>

Tests/DependencyInjection/Fixtures/yml/http_client_scoped_without_query_option.yml

@@ -0,0 +1,5 @@
+framework:
+    http_client:
+        scoped_clients:
+            foo:
+                scope: '.*'

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -1346,6 +1346,14 @@ public function testHttpClientDefaultOptions()
         $this->assertSame(ScopingHttpClient::class, $container->getDefinition('foo')->getClass());
     }
 
+    public function testScopedHttpClientWithoutQueryOption()
+    {
+        $container = $this->createContainerFromFile('http_client_scoped_without_query_option');
+
+        $this->assertTrue($container->hasDefinition('foo'), 'should have the "foo" service.');
+        $this->assertSame(ScopingHttpClient::class, $container->getDefinition('foo')->getClass());
+    }
+
     public function testHttpClientOverrideDefaultOptions()
     {
         $container = $this->createContainerFromFile('http_client_override_default_options');