Merge remote-tracking branch 'origin/name-generator' into name-generator

# Conflicts:
#	src/Name/Generator/CommandNameGenerator.php

Author: allflame

src/DependencyInjection/JaegerExtension.php

@@ -27,7 +27,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
 
         if ($this->isConfigEnabled($container, $config['name_generator'])) {
-            $container->setParameter('jaeger.name.max_length', (int)$config['name_generator']['max_length']);
+            $container->setParameter('jaeger.name.max_length', $config['name_generator']['max_length']);
             foreach ($config['name_generator']['request'] as $item => $customGeneratorId) {
                 $regexp = \sprintf('/%s/', $item);
                 $shortenedGeneratorId = \sprintf('jaeger.name.generator.%s', $customGeneratorId);

src/Name/Generator/ControllerNameGenerator.php

@@ -21,7 +21,7 @@ public static function getSubscribedEvents(): array
 
     public function onRequest(RequestEvent $event): void
     {
-        $this->controller = $event->getRequest()->attributes->get('_controller', '');
+        $this->controller = (string)$event->getRequest()->attributes->get('_controller', '');
     }
 
     public function onTerminate(): void

src/Name/Generator/ShortenGeneratorDecorator.php

@@ -15,7 +15,7 @@ public function __construct(NameGeneratorInterface $generator, int $maxLength)
 
     public function shorten(string $name)
     {
-        if ($this->maxLength >= strlen($name)) {
+        if ($this->maxLength >= \strlen($name)) {
             return $name;
         }