Merge pull request #2 from parti-renaissance/sf-6

Support for Symfony 6
parti-renaissance · Jul 30, 2024 · 72df161 · 72df161
2 parents 466a08c + 68c90b0
commit 72df161
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 17 deletions.
diff --git a/Controller/SampleController.php b/Controller/SampleController.php
@@ -24,7 +24,7 @@ class SampleController extends AbstractController
      */
     public function indexAction()
     {
-        $paybox = $this->get('lexik_paybox.request_handler');
+        $paybox = $this->container->get('lexik_paybox.request_handler');
         $paybox->setParameters(array(
             'PBX_CMD'          => 'CMD'.time(),
             'PBX_DEVISE'       => '978',

diff --git a/DependencyInjection/LexikPayboxExtension.php b/DependencyInjection/LexikPayboxExtension.php
@@ -2,10 +2,10 @@
 
 namespace Lexik\Bundle\PayboxBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 /**
  * This is the class that loads and manages your bundle configuration

diff --git a/Paybox/System/Base/Request.php b/Paybox/System/Base/Request.php
@@ -4,9 +4,8 @@
 
 use Lexik\Bundle\PayboxBundle\Paybox\AbstractRequest;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
-use Symfony\Component\Form\Form;
 use Symfony\Component\Form\FormFactoryInterface;
-use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Form\FormInterface;
 
 /**
  * Class Request
@@ -141,7 +140,7 @@ public function getParameters()
      *
      * @param  array $options
      *
-     * @return Form
+     * @return FormInterface
      */
     public function getForm($options = array())
     {

diff --git a/README.md b/README.md
@@ -100,7 +100,7 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 /**
  * Sample action to call a payment.
- * It create the form to submit with all parameters.
+ * It creates the form to submit with all parameters.
  */
 public function callAction()
 {
@@ -131,8 +131,8 @@ public function callAction()
 ...
 /**
  * Sample action of a confirmation payment page on witch the user is sent
- * after he seizes his payment informations on the Paybox's platform.
- * This action must only containts presentation logic.
+ * after he seizes his payment information on the Paybox's platform.
+ * This action must only contain presentation logic.
  */
 public function responseAction($status)
 {
@@ -159,7 +159,6 @@ The bundle contains a listener example that simply create a file on each ipn cal
 namespace Lexik\Bundle\PayboxBundle\Listener;
 
 use Symfony\Component\Filesystem\Filesystem;
-
 use Lexik\Bundle\PayboxBundle\Event\PayboxResponseEvent;
 
 /**

diff --git a/Tests/Paybox/System/Base/ParameterResolverTest.php b/Tests/Paybox/System/Base/ParameterResolverTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Lexik\Bundle\PayboxBundle\Tests\Paybox\System;
+namespace Lexik\Bundle\PayboxBundle\Tests\Paybox\System\Base;
 
 use Lexik\Bundle\PayboxBundle\Paybox\System\Base\ParameterResolver;
 use PHPUnit\Framework\TestCase;

diff --git a/Tests/Paybox/System/Base/RequestTest.php b/Tests/Paybox/System/Base/RequestTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Lexik\Bundle\PayboxBundle\Tests\Paybox\System;
+namespace Lexik\Bundle\PayboxBundle\Tests\Paybox\System\Base;
 
 use Lexik\Bundle\PayboxBundle\Paybox\System\Base\Request;
 use PHPUnit\Framework\TestCase;

diff --git a/Tests/Paybox/System/Base/ResponseTest.php b/Tests/Paybox/System/Base/ResponseTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Lexik\Bundle\PayboxBundle\Tests\Paybox\System;
+namespace Lexik\Bundle\PayboxBundle\Tests\Paybox\System\Base;
 
 use Lexik\Bundle\PayboxBundle\Paybox\System\Base\Response;
 use PHPUnit\Framework\MockObject\MockObject;

diff --git a/Tests/Transport/AbstractTransportTest.php b/Tests/Transport/AbstractTransportTest.php
@@ -4,7 +4,6 @@
 
 use Lexik\Bundle\PayboxBundle\Paybox\RequestInterface;
 use Lexik\Bundle\PayboxBundle\Transport\AbstractTransport;
-use PHPUnit\Framework\Test;
 use PHPUnit\Framework\TestCase;
 
 /**

diff --git a/composer.json b/composer.json
@@ -11,12 +11,13 @@
     ],
     "require": {
         "php": ">=7.4",
+        "ext-dom": "*",
         "psr/log": "~1.0",
         "lib-curl": ">=7.10.0",
         "lib-openssl": ">=0.9.6",
-        "symfony/framework-bundle": "~4.0|^5.0",
-        "symfony/form": "~4.0|^5.0",
-        "symfony/options-resolver": "~4.0|^5.0",
+        "symfony/framework-bundle": "~4.0|^5.0|^6.0",
+        "symfony/form": "~4.0|^5.0|^6.0",
+        "symfony/options-resolver": "~4.0|^5.0|^6.0",
         "kriswallsmith/buzz": "~0.15"
     },
     "require-dev": {