Merge branch '5.4' into 6.0

* 5.4:
  Fix CS
  Fix CS

Author: fabpot

Loader/Configurator/AbstractConfigurator.php

@@ -26,7 +26,7 @@ abstract class AbstractConfigurator
     public const FACTORY = 'unknown';
 
     /**
-     * @var callable(mixed, bool $allowService)|null
+     * @var callable(mixed, bool)|null
      */
     public static $valuePreProcessor;