Add Dependency Injection integration

composer.json

@@ -46,7 +46,9 @@
         "league/uri": "^6.4",
         "league/uri-components": "^2.2",
         "twig/twig": "^2.4 || ^3.0",
-        "php-http/discovery": "^1.19"
+        "php-http/discovery": "^1.19",
+        "psr/container": "^2.0",
+        "php-di/php-di": "^7.0"
     },
     "require-dev": {
         "ext-curl": "*",

src/Payum/Core/Action/PrependActionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Payum\Core\Action;
+
+interface PrependActionInterface
+{
+}

src/Payum/Core/DI/ContainerConfiguration.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Payum\Core\DI;
+
+use Payum\Core\Gateway;
+use Psr\Container\ContainerInterface;
+
+interface ContainerConfiguration
+{
+    /**
+     * @return array<string, mixed>
+     */
+    public function configureContainer(): array;
+
+    public function createGateway(ContainerInterface $container): Gateway;
+}

src/Payum/Core/Extension/PrependExtensionInterface.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Payum\Core\Extension;
+
+interface PrependExtensionInterface
+{
+}

src/Payum/Core/Gateway.php

@@ -17,9 +17,9 @@
 class Gateway implements GatewayInterface
 {
     /**
-     * @var Action\ActionInterface[]
+     * @var list<class-string<Action\ActionInterface>|Action\ActionInterface>
      */
-    protected $actions = [];
+    protected array $actions = [];
 
     /**
      * @var mixed[]
@@ -35,7 +35,7 @@ class Gateway implements GatewayInterface
     /**
      * @var Context[]
      */
-    protected $stack = [];
+    protected array $stack = [];
 
     public function __construct()
     {

src/Payum/Core/GatewayFactory.php

@@ -3,8 +3,9 @@
 namespace Payum\Core;
 
 use Payum\Core\Bridge\Spl\ArrayObject;
+use Payum\Core\DI\ContainerConfiguration;
 
-class GatewayFactory implements GatewayFactoryInterface
+class GatewayFactory implements GatewayFactoryInterface /*, ContainerConfiguration */ // This class will implement ContainerConfiguration from version 3.0, and will remove the GatewayFactoryInterface
 {
     /**
      * @var GatewayFactoryInterface

src/Payum/Core/GatewayFactoryConfigInterface.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Payum\Core;
+
+use Payum\Core\Action\ActionInterface;
+use Payum\Core\Extension\ExtensionInterface;
+use Psr\Container\ContainerInterface;
+
+interface GatewayFactoryConfigInterface
+{
+    public function createGateway(ContainerInterface $container): Gateway;
+
+    /**
+     * @return array<string, class-string<ActionInterface>>|list<class-string<ActionInterface>>
+     */
+    public function getActions(): array;
+
+    /**
+     * @return list<ExtensionInterface|class-string<ExtensionInterface>>
+     */
+    public function getExtensions(): array;
+}

src/Payum/Core/PayumBuilder.php

@@ -2,13 +2,15 @@
 
 namespace Payum\Core;
 
+use DI\ContainerBuilder;
 use LogicException;
 use Omnipay\Omnipay;
 use Payum\AuthorizeNet\Aim\AuthorizeNetAimGatewayFactory;
 use Payum\Be2Bill\Be2BillDirectGatewayFactory;
 use Payum\Be2Bill\Be2BillOffsiteGatewayFactory;
 use Payum\Core\Bridge\PlainPhp\Security\HttpRequestVerifier;
 use Payum\Core\Bridge\PlainPhp\Security\TokenFactory;
+use Payum\Core\DI\ContainerConfiguration;
 use Payum\Core\Exception\InvalidArgumentException;
 use Payum\Core\Extension\GenericTokenFactoryExtension;
 use Payum\Core\Extension\StorageExtension;
@@ -46,6 +48,7 @@
 use function in_array;
 use function strtolower;
 use function sys_get_temp_dir;
+use function trigger_error;
 
 class PayumBuilder
 {
@@ -315,10 +318,32 @@ public function getPayum(): Payum
         if ($this->gatewayConfigs) {
             $gateways = $this->gateways;
             foreach ($this->gatewayConfigs as $name => $gatewayConfig) {
+                $containerBuilder = new ContainerBuilder();
+
+                $containerBuilder->addDefinitions($gatewayConfig);
+                $containerBuilder->addDefinitions([
+                    'payum.security.token_storage' => fn () => $this->tokenStorage,
+                ]);
+
                 $gatewayFactory = $registry->getGatewayFactory($gatewayConfig['factory']);
                 unset($gatewayConfig['factory']);
 
-                $gateways[$name] = $gatewayFactory->create($gatewayConfig);
+                if ($gatewayFactory instanceof ContainerConfiguration) {
+                    $containerBuilder->addDefinitions($gatewayFactory->configureContainer());
+
+                    $gateways[$name] = $gatewayFactory->createGateway($containerBuilder->build());
+                } else {
+                    @trigger_error(
+                        sprintf(
+                            'Not implementing %s for gateway factory %s is deprecated since 2.0.',
+                            ContainerConfiguration::class,
+                            $gatewayFactory::class,
+                        ),
+                        E_USER_DEPRECATED
+                    );
+
+                    $gateways[$name] = $gatewayFactory->create($gatewayConfig);
+                }
             }
 
             $registry = $this->buildRegistry($gateways, $this->storages, $gatewayFactories);