From 08f692404648f66e557493d488b2a9a201e2ab43 Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Fri, 24 Nov 2017 09:19:07 +0100
Subject: [PATCH] move storage factory init from PayumBundle::build to
 PayumExtension::load

---
 DependencyInjection/PayumExtension.php | 11 +++++++++++
 PayumBundle.php                        | 15 ---------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/DependencyInjection/PayumExtension.php b/DependencyInjection/PayumExtension.php
index f997b6a8..18438d65 100644
--- a/DependencyInjection/PayumExtension.php
+++ b/DependencyInjection/PayumExtension.php
@@ -20,6 +20,11 @@
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Config\FileLocator;
+use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\CustomStorageFactory;
+use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\Propel1StorageFactory;
+use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\Propel2StorageFactory;
+use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\DoctrineStorageFactory;
+use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\FilesystemStorageFactory;
 
 class PayumExtension extends Extension implements PrependExtensionInterface
 {
@@ -37,6 +42,12 @@ public function load(array $configs, ContainerBuilder $container)
 
         $config = $this->processConfiguration($mainConfig, $configs);
 
+        $this->addStorageFactory(new FilesystemStorageFactory);
+        $this->addStorageFactory(new DoctrineStorageFactory);
+        $this->addStorageFactory(new CustomStorageFactory);
+        $this->addStorageFactory(new Propel1StorageFactory);
+        $this->addStorageFactory(new Propel2StorageFactory);
+
         // load services
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('payum.xml');
diff --git a/PayumBundle.php b/PayumBundle.php
index e49ad44e..6552e8b7 100644
--- a/PayumBundle.php
+++ b/PayumBundle.php
@@ -6,12 +6,6 @@
 use Payum\Bundle\PayumBundle\DependencyInjection\Compiler\BuildGatewayFactoriesPass;
 use Payum\Bundle\PayumBundle\DependencyInjection\Compiler\BuildGatewaysPass;
 use Payum\Bundle\PayumBundle\DependencyInjection\Compiler\BuildStoragesPass;
-use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\CustomStorageFactory;
-use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\Propel1StorageFactory;
-use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\Propel2StorageFactory;
-use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\DoctrineStorageFactory;
-use Payum\Bundle\PayumBundle\DependencyInjection\Factory\Storage\FilesystemStorageFactory;
-use Payum\Bundle\PayumBundle\DependencyInjection\PayumExtension;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -21,15 +15,6 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
-        /** @var $extension PayumExtension */
-        $extension = $container->getExtension('payum');
-
-        $extension->addStorageFactory(new FilesystemStorageFactory);
-        $extension->addStorageFactory(new DoctrineStorageFactory);
-        $extension->addStorageFactory(new CustomStorageFactory);
-        $extension->addStorageFactory(new Propel1StorageFactory);
-        $extension->addStorageFactory(new Propel2StorageFactory);
-
         $container->addCompilerPass(new BuildConfigsPass());
         $container->addCompilerPass(new BuildGatewaysPass);
         $container->addCompilerPass(new BuildStoragesPass);