Merge pull request #5 from Intrepidity/master

Fixes issue #4
snowcap · Mar 27, 2014 · 302941f · 302941f
2 parents 399ff87 + eabde34
commit 302941f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/FormGenerator/SimpleFormGenerator.php b/FormGenerator/SimpleFormGenerator.php
@@ -14,11 +14,12 @@
 
 use Ogone\FormGenerator\FormGenerator;
 use Ogone\PaymentRequest;
+use Ogone\Ecommerce\EcommercePaymentRequest;
 
 class SimpleFormGenerator implements FormGenerator
 {
     /**
-     * @var PaymentRequest
+     * @var EcommercePaymentRequest
      */
     private $paymentRequest;
 
@@ -52,11 +53,11 @@ public function __construct(Twig_Environment $environment, $rootDir)
     }
 
     /**
-     * @param PaymentRequest $paymentRequest
+     * @param EcommercePaymentRequest $paymentRequest
      *
      * @return string
      */
-    public function render(PaymentRequest $paymentRequest)
+    public function render(EcommercePaymentRequest $paymentRequest)
     {
         $this->paymentRequest = $paymentRequest;
 

diff --git a/OgoneManager.php b/OgoneManager.php
@@ -19,6 +19,8 @@
 use Ogone\ParameterFilter\ShaInParameterFilter;
 use Ogone\ParameterFilter\ShaOutParameterFilter;
 use Ogone\FormGenerator\FormGenerator;
+use Ogone\Ecommerce\EcommercePaymentRequest,
+    Ogone\Ecommerce\EcommercePaymentResponse;
 
 use Snowcap\OgoneBundle\Event\OgoneEvent;
 
@@ -127,14 +129,14 @@ public function getRequestForm($locale, $orderId, $customerName, $amount, $curre
         $shaComposer = new AllParametersShaComposer($passphrase);
         $shaComposer->addParameterFilter(new ShaInParameterFilter); //optional
 
-        $paymentRequest = new PaymentRequest($shaComposer);
+        $paymentRequest = new EcommercePaymentRequest($shaComposer);
 
         switch ($this->environment) {
             case 'prod':
-                $paymentRequest->setOgoneUri(PaymentRequest::PRODUCTION);
+                $paymentRequest->setOgoneUri(EcommercePaymentRequest::PRODUCTION);
                 break;
             default:
-                $paymentRequest->setOgoneUri(PaymentRequest::TEST);
+                $paymentRequest->setOgoneUri(EcommercePaymentRequest::TEST);
                 break;
         }
 
@@ -168,7 +170,7 @@ public function getRequestForm($locale, $orderId, $customerName, $amount, $curre
      */
     public function paymentResponse(array $parameters)
     {
-        $paymentResponse = new PaymentResponse($parameters);
+        $paymentResponse = new EcommercePaymentResponse($parameters);
 
         $passphrase = $this->shaOut;
         $shaComposer = new AllParametersShaComposer($passphrase);

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "php": ">=5.3.2",
         "symfony/framework-bundle": ">=2.2",
         "symfony/monolog-bundle": ">=2.2",
-        "marlon-be/marlon-ogone": "dev-master#a7560e3e446cf93fe9439915a43da202f7bbc01d"
+        "marlon-be/marlon-ogone": "dev-master"
     },
     "autoload": {
         "psr-0": { "Snowcap\\OgoneBundle": "" }