feat: fix namespace of new added test-Classes

add ContainerAwareInterface and ContainerAwareTrait to support symfony 7
Payum · Apr 8, 2024 · 5d74dc6 · 5d74dc6
1 parent 37b5508
commit 5d74dc6
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 15 deletions.
diff --git a/Builder/CoreGatewayFactoryBuilder.php b/Builder/CoreGatewayFactoryBuilder.php
@@ -3,9 +3,9 @@
 namespace Payum\Bundle\PayumBundle\Builder;
 
 use Payum\Bundle\PayumBundle\ContainerAwareCoreGatewayFactory;
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareInterface;
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareTrait;
 use Payum\Core\GatewayFactoryInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
 class CoreGatewayFactoryBuilder implements ContainerAwareInterface
 {

diff --git a/ContainerAwareCoreGatewayFactory.php b/ContainerAwareCoreGatewayFactory.php
@@ -2,10 +2,10 @@
 
 namespace Payum\Bundle\PayumBundle;
 
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareInterface;
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareTrait;
 use Payum\Core\Bridge\Spl\ArrayObject;
 use Payum\Core\CoreGatewayFactory;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
 class ContainerAwareCoreGatewayFactory extends CoreGatewayFactory implements ContainerAwareInterface
 {

diff --git a/ContainerAwareRegistry.php b/ContainerAwareRegistry.php
@@ -2,9 +2,9 @@
 
 namespace Payum\Bundle\PayumBundle;
 
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareInterface;
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareTrait;
 use Payum\Core\Registry\AbstractRegistry;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
 /**
  * @template T of object

diff --git a/DependencyInjection/ContainerAwareInterface.php b/DependencyInjection/ContainerAwareInterface.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Payum\Bundle\PayumBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+interface ContainerAwareInterface {
+
+  public function setContainer(?ContainerInterface $container);
+
+}
diff --git a/DependencyInjection/ContainerAwareTrait.php b/DependencyInjection/ContainerAwareTrait.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Payum\Bundle\PayumBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+trait ContainerAwareTrait {
+
+  protected ?ContainerInterface $container;
+
+  public function setContainer(?ContainerInterface $container): void {
+    $this->container = $container;
+  }
+
+}
diff --git a/Tests/Builder/CoreGatewayFactoryBuilderTest.php b/Tests/Builder/CoreGatewayFactoryBuilderTest.php
@@ -4,10 +4,10 @@
 
 use Payum\Bundle\PayumBundle\Builder\CoreGatewayFactoryBuilder;
 use Payum\Bundle\PayumBundle\ContainerAwareCoreGatewayFactory;
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareInterface;
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 
 class CoreGatewayFactoryBuilderTest extends TestCase
 {

diff --git a/Tests/ContainerAwareCoreGatewayFactoryTest.php b/Tests/ContainerAwareCoreGatewayFactoryTest.php
@@ -10,7 +10,7 @@
 use ReflectionClass;
 use stdClass;
 use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareInterface;
 
 class ContainerAwareCoreGatewayFactoryTest extends TestCase
 {

diff --git a/Tests/ContainerAwareRegistryTest.php b/Tests/ContainerAwareRegistryTest.php
@@ -11,7 +11,7 @@
 use ReflectionClass;
 use stdClass;
 use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareInterface;
 
 class ContainerAwareRegistryTest extends TestCase
 {

diff --git a/Tests/Functional/Command/CreateCaptureTokenCommandTest.php b/Tests/Functional/Command/CreateCaptureTokenCommandTest.php
@@ -2,12 +2,12 @@
 namespace Payum\Bundle\PayumBundle\Tests\Functional\Command;
 
 use Payum\Bundle\PayumBundle\Command\CreateCaptureTokenCommand;
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareInterface;
 use Payum\Bundle\PayumBundle\Tests\Functional\WebTestCase;
 use Payum\Core\Registry\RegistryInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 
 class CreateCaptureTokenCommandTest extends WebTestCase
 {

diff --git a/Tests/Functional/Command/CreateNotifyTokenCommandTest.php b/Tests/Functional/Command/CreateNotifyTokenCommandTest.php
@@ -2,12 +2,12 @@
 namespace Payum\Bundle\PayumBundle\Tests\Functional\Command;
 
 use Payum\Bundle\PayumBundle\Command\CreateNotifyTokenCommand;
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareInterface;
 use Payum\Bundle\PayumBundle\Tests\Functional\WebTestCase;
 use Payum\Core\Registry\RegistryInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 
 class CreateNotifyTokenCommandTest extends WebTestCase
 {

diff --git a/Tests/Functional/Command/DebugGatewayCommandTest.php b/Tests/Functional/Command/DebugGatewayCommandTest.php
@@ -2,12 +2,12 @@
 namespace Payum\Bundle\PayumBundle\Tests\Functional\Command;
 
 use Payum\Bundle\PayumBundle\Command\DebugGatewayCommand;
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareInterface;
 use Payum\Bundle\PayumBundle\Tests\Functional\WebTestCase;
 use Payum\Core\Registry\RegistryInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 
 class DebugGatewayCommandTest extends WebTestCase
 {

diff --git a/Tests/Functional/Command/StatusCommandTest.php b/Tests/Functional/Command/StatusCommandTest.php
@@ -2,12 +2,12 @@
 namespace Payum\Bundle\PayumBundle\Tests\Functional\Command;
 
 use Payum\Bundle\PayumBundle\Command\StatusCommand;
+use Payum\Bundle\PayumBundle\DependencyInjection\ContainerAwareInterface;
 use Payum\Bundle\PayumBundle\Tests\Functional\WebTestCase;
 use Payum\Core\Registry\RegistryInterface;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Tester\CommandTester;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 
 class StatusCommandTest extends WebTestCase
 {

diff --git a/composer.json b/composer.json
@@ -43,12 +43,12 @@
         "symfony/form": "^4.4.20 || ^5.4 || ^6.0 || ^7.0",
         "symfony/validator": "^4.4 || ^5.4 || ^6.0 || ^7.0",
         "symfony/security-csrf": "^4.4 || ^5.4 || ^6.0 || ^7.0",
-        "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.4",
+        "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.4 || ^7.0",
         "symfony/polyfill-php80": "^1.26"
     },
     "require-dev": {
         "defuse/php-encryption": "^2",
-        "doctrine/orm": "^2.8 || 3.0",
+        "doctrine/orm": "^2.8 || ^3.0",
         "omnipay/common": "^3@dev",
         "omnipay/dummy": "^3@alpha",
         "omnipay/paypal": "^3@dev",