Require providers to specify a driver and simplify config parsing accordingly

Author: jeskew

docs/sync-provider.rst

@@ -8,14 +8,17 @@ of queue-based code paths.
 Configuration
 ^^^^^^^^^^^^^
 
-To use the sync queue, set the ``provider`` of a given queue to ``sync``. No further
+To designate a queue as synchronous, set the ``driver`` of its provider to ``sync``. No further
 configuration is necessary.
 
 .. code-block:: yaml
 
     #app/config_dev.yml
 
     uecode_qpush:
+        providers:
+            in_band:
+                driver: sync
         queues:
             my_queue_name:
-                provider: sync
+                provider: in_band

src/DependencyInjection/Configuration.php

@@ -63,28 +63,12 @@ private function getProvidersNode()
         ];
 
         $node
-            ->beforeNormalization()
-                ->always(function (array $providers) use ($requirements) {
-                    array_walk(
-                        $providers,
-                        function (&$provider, $name) use ($requirements) {
-                            if (
-                                empty($provider['driver']) &&
-                                array_key_exists($name, $requirements)
-                            ) {
-                                $provider['driver'] = $name;
-                            }
-                        }
-                    );
-
-                    return $providers;
-                })
-            ->end()
             ->useAttributeAsKey('name')
             ->prototype('array')
                 ->treatNullLike([])
                 ->children()
                     ->enumNode('driver')
+                        ->isRequired()
                         ->values(array_keys($requirements))
                     ->end()
                     // IronMQ

src/DependencyInjection/UecodeQPushExtension.php

@@ -60,11 +60,7 @@ public function load(array $configs, ContainerBuilder $container)
             $class      = null;
             $client     = null;
 
-            $driver = isset($config['providers'][$provider]['driver']) ?
-                $config['providers'][$provider]['driver']
-                : $provider;
-
-            switch ($driver) {
+            switch ($config['providers'][$provider]['driver']) {
                 case 'aws':
                     $class  = $container->getParameter('uecode_qpush.provider.aws');
                     $client = $this->createAwsClient(

tests/Fixtures/config_test.yml

@@ -3,6 +3,7 @@ uecode_qpush:
     logging_enabled: true
     providers:
         aws:
+            driver: aws
             key: 123
             secret: 123
             region: us-east-1
@@ -12,6 +13,7 @@ uecode_qpush:
             secret: 432
             region: eu-west-1
         ironmq:
+            driver: ironmq
             token: 123
             project_id: 123
         secondary_ironmq: