Merge pull request #551 from Payum/builder-factory

Payum · Aug 16, 2023 · a10faf1 · a10faf1
2 parents 9e1765a + 48349d1
commit a10faf1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/Resources/config/payum.xml b/Resources/config/payum.xml
@@ -18,7 +18,7 @@
 
         <defaults public="true" />
 
-        <service id="payum.builder" class="Payum\Core\PayumBuilder">
+        <service id="payum.builder" class="Payum\Core\PayumBuilder" public="false">
             <call method="setMainRegistry">
                 <argument type="service" id="payum.static_registry" />
             </call>
@@ -46,7 +46,7 @@
             </call>
         </service>
 
-        <service id="payum" class="Payum\Core\Payum">
+        <service id="payum" class="Payum\Core\Payum" lazy="true">
             <factory service="payum.builder" method="getPayum" />
         </service>
 

diff --git a/Tests/Functional/app/AppKernelShared.php b/Tests/Functional/app/AppKernelShared.php
@@ -4,6 +4,8 @@
 use Payum;
 use Symfony;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernelShared extends Kernel
@@ -19,6 +21,21 @@ public function registerBundles(): array
         return $bundles;
     }
 
+    protected function build(ContainerBuilder $container)
+    {
+        parent::build($container);
+
+        if (Kernel::MAJOR_VERSION === 4) {
+            $container->addCompilerPass(new class() implements CompilerPassInterface {
+                public function process(ContainerBuilder $container)
+                {
+                    $container->getDefinition('payum.builder')
+                        ->setPublic(true);
+                }
+            });
+        }
+    }
+
     public function getCacheDir(): string
     {
         return sys_get_temp_dir() . '/PayumBundle/cache';