Merge branch '6.1' into 6.2

* 6.1:
  [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

Controller/ArgumentResolver/NotTaggedControllerValueResolver.php

@@ -72,8 +72,10 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
             $controller = ltrim($controller, '\\');
         }
 
-        if (!$this->container->has($controller) && false !== $i = strrpos($controller, ':')) {
-            $controller = substr($controller, 0, $i).strtolower(substr($controller, $i));
+        if (!$this->container->has($controller)) {
+            $controller = (false !== $i = strrpos($controller, ':'))
+                ? substr($controller, 0, $i).strtolower(substr($controller, $i))
+                : $controller.'::__invoke';
         }
 
         if ($this->container->has($controller)) {

Tests/Controller/ArgumentResolver/NotTaggedControllerValueResolverTest.php

@@ -108,6 +108,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('/');