Merge branch '5.4' into 6.0

* 5.4:
  [Notifier][SMSBiuras] Fix CS
  Fix SmsBiurasTransportTest::testTestMode
  [Notifier][SmsBiuras] Simplify test and data provider
  [Notifier] [SMSBiuras] `true`/`false` mismatch for `test_mode` option
  [HttpKernel] Fix message for unresovable arguments of invokable controllers
  ignore const expressions read by phpdocumentor
  [DependencyInjection] Process bindings in ServiceLocatorTagPass

Author: fabpot

src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php

@@ -40,6 +40,10 @@ protected function processValue(mixed $value, bool $isRoot = false): mixed
             return self::register($this->container, $value->getValues());
         }
 
+        if ($value instanceof Definition) {
+            $value->setBindings(parent::processValue($value->getBindings()));
+        }
+
         if (!$value instanceof Definition || !$value->hasTag('container.service_locator')) {
             return parent::processValue($value, $isRoot);
         }

src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php

@@ -214,6 +214,18 @@ public function testDefinitionOrderIsTheSame()
 
         static::assertSame(['service-2', 'service-1'], array_keys($factories));
     }
+
+    public function testBindingsAreProcessed()
+    {
+        $container = new ContainerBuilder();
+
+        $definition = $container->register('foo')
+            ->setBindings(['foo' => new ServiceLocatorArgument()]);
+
+        (new ServiceLocatorTagPass())->process($container);
+
+        $this->assertInstanceOf(Reference::class, $definition->getBindings()['foo']->getValues()[0]);
+    }
 }
 
 class Locator

src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php

@@ -69,8 +69,9 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
         }
 
         if (!$this->container->has($controller)) {
-            $i = strrpos($controller, ':');
-            $controller = substr($controller, 0, $i).strtolower(substr($controller, $i));
+            $controller = (false !== $i = strrpos($controller, ':'))
+                ? substr($controller, 0, $i).strtolower(substr($controller, $i))
+                : $controller.'::__invoke';
         }
 
         $what = sprintf('argument $%s of "%s()"', $argument->getName(), $controller);

src/Symfony/Component/HttpKernel/Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php

@@ -98,6 +98,17 @@ public function testControllerNameIsAnArray()
         $resolver->resolve($request, $argument);
     }
 
+    public function testInvokableController()
+    {
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Could not resolve argument $dummy of "App\Controller\Mine::__invoke()", maybe you forgot to register the controller as a service or missed tagging it with the "controller.service_arguments"?');
+        $resolver = new NotTaggedControllerValueResolver(new ServiceLocator([]));
+        $argument = new ArgumentMetadata('dummy', \stdClass::class, false, false, null);
+        $request = $this->requestWithAttributes(['_controller' => 'App\Controller\Mine']);
+        $this->assertTrue($resolver->supports($request, $argument));
+        $resolver->resolve($request, $argument);
+    }
+
     private function requestWithAttributes(array $attributes)
     {
         $request = Request::create('/');

src/Symfony/Component/Notifier/Bridge/SmsBiuras/SmsBiurasTransport.php

@@ -85,7 +85,7 @@ protected function doSend(MessageInterface $message): SentMessage
                 'apikey' => $this->apiKey,
                 'message' => $message->getSubject(),
                 'from' => $this->from,
-                'test' => $this->testMode ? 0 : 1,
+                'test' => $this->testMode ? 1 : 0,
                 'to' => $message->getPhone(),
             ],
         ]);

src/Symfony/Component/Notifier/Bridge/SmsBiuras/Tests/SmsBiurasTransportTest.php

@@ -11,12 +11,14 @@
 
 namespace Symfony\Component\Notifier\Bridge\SmsBiuras\Tests;
 
+use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\Notifier\Bridge\SmsBiuras\SmsBiurasTransport;
 use Symfony\Component\Notifier\Message\ChatMessage;
 use Symfony\Component\Notifier\Message\MessageInterface;
 use Symfony\Component\Notifier\Message\SmsMessage;
 use Symfony\Component\Notifier\Test\TransportTestCase;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Symfony\Contracts\HttpClient\ResponseInterface;
 
 final class SmsBiurasTransportTest extends TransportTestCase
 {
@@ -40,4 +42,48 @@ public function unsupportedMessagesProvider(): iterable
         yield [new ChatMessage('Hello!')];
         yield [$this->createMock(MessageInterface::class)];
     }
+
+    /**
+     * @dataProvider provideTestMode()
+     */
+    public function testTestMode(int $expected, bool $testMode)
+    {
+        $message = new SmsMessage('+37012345678', 'Hello World!');
+
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects($this->atLeast(1))
+            ->method('getStatusCode')
+            ->willReturn(200);
+        $response->expects($this->atLeast(1))
+            ->method('getContent')
+            ->willReturn('OK: 519545');
+
+        $client = new MockHttpClient(function (string $method, string $url, array $options = []) use ($response, $message, $expected): ResponseInterface {
+            $this->assertSame('GET', $method);
+            $this->assertSame(sprintf(
+                'https://savitarna.smsbiuras.lt/api?uid=uid&apikey=api_key&message=%s&from=from&test=%s&to=%s',
+                rawurlencode($message->getSubject()),
+                $expected,
+                rawurlencode($message->getPhone())
+            ), $url);
+            $this->assertSame($expected, $options['query']['test']);
+
+            $this->assertSame(200, $response->getStatusCode());
+            $this->assertSame('OK: 519545', $response->getContent());
+
+            return $response;
+        });
+
+        $transport = new SmsBiurasTransport('uid', 'api_key', 'from', $testMode, $client);
+
+        $sentMessage = $transport->send($message);
+
+        $this->assertSame('519545', $sentMessage->getMessageId());
+    }
+
+    public static function provideTestMode(): iterable
+    {
+        yield [1, true];
+        yield [0, false];
+    }
 }

src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\PropertyInfo\Util;
 
+use phpDocumentor\Reflection\PseudoTypes\ConstExpression;
 use phpDocumentor\Reflection\PseudoTypes\List_;
 use phpDocumentor\Reflection\Type as DocType;
 use phpDocumentor\Reflection\Types\Array_;
@@ -39,6 +40,11 @@ final class PhpDocTypeHelper
      */
     public function getTypes(DocType $varType): array
     {
+        if ($varType instanceof ConstExpression) {
+            // It's safer to fall back to other extractors here, as resolving const types correctly is not easy at the moment
+            return [];
+        }
+
         $types = [];
         $nullable = false;
 
@@ -64,6 +70,11 @@ public function getTypes(DocType $varType): array
         for ($typeIndex = 0; $varType->has($typeIndex); ++$typeIndex) {
             $type = $varType->get($typeIndex);
 
+            if ($type instanceof ConstExpression) {
+                // It's safer to fall back to other extractors here, as resolving const types correctly is not easy at the moment
+                return [];
+            }
+
             // If null is present, all types are nullable
             if ($type instanceof Null_) {
                 $nullable = true;