some backports from master

Author: nicolas-grekas

Console/Descriptor/Descriptor.php

@@ -206,11 +206,9 @@ protected function formatParameter($value): string
     }
 
     /**
-     * @param string $serviceId
-     *
      * @return mixed
      */
-    protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceId)
+    protected function resolveServiceDefinition(ContainerBuilder $builder, string $serviceId)
     {
         if ($builder->hasDefinition($serviceId)) {
             return $builder->getDefinition($serviceId);
@@ -229,10 +227,7 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
         return $builder->get($serviceId);
     }
 
-    /**
-     * @param bool $showHidden
-     */
-    protected function findDefinitionsByTag(ContainerBuilder $builder, $showHidden): array
+    protected function findDefinitionsByTag(ContainerBuilder $builder, bool $showHidden): array
     {
         $definitions = [];
         $tags = $builder->findTags();