[FrameworkBundle] Allow to pass signals to StopWorkerOnSignalsListener in XML config and as plain strings

alexandre-daubois · alexandre-daubois · commit c892fc73c327 · 2023-03-22T13:30:29.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1531,7 +1531,30 @@ function ($a) {
                         ->arrayNode('stop_worker_on_signals')
                             ->defaultValue([])
                             ->info('A list of signals that should stop the worker; defaults to SIGTERM and SIGINT.')
-                            ->integerPrototype()->end()
+                            ->beforeNormalization()
+                                ->always()
+                                ->then(function ($v) {
+                                    return array_map(static function ($element): int {
+                                        $element = \is_array($element) ? $element['signal'] : $element;
+                                        if (\is_string($element)) {
+                                            try {
+                                                $signal = \constant($element);
+                                            } catch (\Error) {
+                                                $signal = null;
+                                            }
+
+                                            if (null === $signal || !str_starts_with($element, 'SIG') || !\array_key_exists($element, get_defined_constants(true)['pcntl'])) {
+                                                throw new \InvalidArgumentException(sprintf('"%s" is not a valid signal constant and can\'t be used with the "stop_worker_on_signals" option.', $element));
+                                            }
+
+                                            return $signal;
+                                        }
+
+                                        return $element;
+                                    }, $v);
+                                })
+                            ->end()
+                            ->variablePrototype()->end()
                         ->end()
                         ->scalarNode('default_bus')->defaultNull()->end()
                         ->arrayNode('buses')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd b/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
@@ -543,6 +543,7 @@
             <xsd:element name="routing" type="messenger_routing" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="transport" type="messenger_transport" minOccurs="0" maxOccurs="unbounded" />
             <xsd:element name="bus" type="messenger_bus" minOccurs="0" maxOccurs="unbounded" />
+            <xsd:element name="stop-worker-on-signals" type="messenger_stop_worker_on_signal" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
         <xsd:attribute name="default-bus" type="xsd:string" />
         <xsd:attribute name="enabled" type="xsd:boolean" />
@@ -611,6 +612,10 @@
         <xsd:attribute name="id" type="xsd:string" use="required"/>
     </xsd:complexType>
 
+    <xsd:complexType name="messenger_stop_worker_on_signal">
+        <xsd:attribute name="signal" type="xsd:string" use="required" />
+    </xsd:complexType>
+
     <xsd:complexType name="http_client">
         <xsd:sequence>
             <xsd:element name="default-options" type="http_client_default_options" minOccurs="0" />
