Adds normalizer class for consistently normalizing database driver values.

Author: aaronj-ep

DependencyInjection/Configuration.php

@@ -110,6 +110,8 @@ private function addGeneralSection(ArrayNodeDefinition $node)
      */
    private function addDbalSection(ArrayNodeDefinition $node)
     {
+        $dNormalizer = new DriverNormalizer();
+        $dClosure = function($v) use ($dNormalizer) { return $dNormalizer->normalize($v); };
         $node
             ->children()
             ->arrayNode('dbal')
@@ -122,7 +124,7 @@ private function addDbalSection(ArrayNodeDefinition $node)
                     ->scalarNode('driver')
                         ->beforeNormalization()
                             ->always()
-                            ->then(function($v) { return str_replace('pdo_', '', $v); })
+                            ->then($dClosure)
                         ->end()
                         ->defaultValue('mysql')
                     ->end()
@@ -131,7 +133,7 @@ private function addDbalSection(ArrayNodeDefinition $node)
                     ->scalarNode('dsn')
                         ->beforeNormalization()
                             ->always()
-                            ->then(function($v) { return str_replace('pdo_', '', $v); })
+                            ->then($dClosure)
                         ->end()
                         ->defaultValue('')
                     ->end()
@@ -162,7 +164,7 @@ private function addDbalSection(ArrayNodeDefinition $node)
                     ->end()
                 ->end()
                 ->fixXmlConfig('connection')
-                ->append($this->getDbalConnectionsNode())
+                ->append($this->getDbalConnectionsNode($dNormalizer))
             ->end()
         ;
     }
@@ -183,8 +185,10 @@ private function addDbalSection(ArrayNodeDefinition $node)
      *
      * @return ArrayNodeDefinition|NodeDefinition The tree builder
      */
-    private function getDbalConnectionsNode()
+    private function getDbalConnectionsNode(DriverNormalizer $normalizer)
     {
+        $closure = function($v) use ($normalizer) { return $normalizer->normalize($v); };
+
         if (Kernel::MAJOR_VERSION > 4 || Kernel::MAJOR_VERSION === 4 && Kernel::MINOR_VERSION >= 2)
         {
             $treeBuilder = new TreeBuilder('connections');
@@ -204,7 +208,7 @@ private function getDbalConnectionsNode()
                     ->scalarNode('driver')
                         ->beforeNormalization()
                             ->always()
-                            ->then(function($v) { return str_replace('pdo_', '', $v); })
+                            ->then($closure)
                         ->end()
                         ->defaultValue('mysql')
                     ->end()
@@ -213,7 +217,7 @@ private function getDbalConnectionsNode()
                     ->scalarNode('dsn')
                         ->beforeNormalization()
                             ->always()
-                            ->then(function($v) { return str_replace('pdo_', '', $v); })
+                            ->then($closure)
                         ->end()
                         ->defaultValue('')
                     ->end()
@@ -225,7 +229,7 @@ private function getDbalConnectionsNode()
                                 ->scalarNode('driver')
                                     ->beforeNormalization()
                                         ->always()
-                                        ->then(function($v) { return str_replace('pdo_', '', $v); })
+                                        ->then($closure)
                                     ->end()
                                     ->defaultValue('mysql')
                                 ->end()
@@ -234,7 +238,7 @@ private function getDbalConnectionsNode()
                                 ->scalarNode('dsn')
                                     ->beforeNormalization()
                                         ->always()
-                                        ->then(function($v) { return str_replace('pdo_', '', $v); })
+                                        ->then($closure)
                                     ->end()
                                     ->defaultValue('')
                                 ->end()

DependencyInjection/DriverNormalizer.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Propel\Bundle\PropelBundle\DependencyInjection;
+
+/**
+ * Provides normalization for Database Driver values.
+ *
+ * Class DriverNormalizer
+ * @package Propel\Bundle\PropelBundle\DependencyInjection
+ */
+class DriverNormalizer
+{
+    /**
+     * Normalizes the database driver related keys in a Propel datasource configuration, specifically the 'adapter'
+     * value & the dsn value of the connection configuration.
+     *
+     * @param array $datasource
+     *
+     * @return array
+     */
+    public function normalizeDatasource($datasource)
+    {
+        if ($adapter = $datasource['adapter'] ?? null)
+        {
+            $datasource['adapter'] = $this->normalize($adapter);
+        }
+
+        if ($dsn = $datasource['connection']['dsn'] ?? null)
+        {
+            $datasource['connection']['dsn'] = $this->normalize($dsn);
+        }
+
+        return $datasource;
+    }
+
+    /**
+     * Removes the 'pdo_' prefix found in some database driver strings.
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    public function normalize($value)
+    {
+        return str_replace('pdo_', '', $value);
+    }
+}