Refactoring

README.md

@@ -331,7 +331,7 @@ Suppose you have set IPN URL to **http://example.com/ipn/notify/** in PayPal. To
     'ipn/notify'
     ```
 
-* Then in the controller where you are handling IPN, do the following:
+* Then in the controller where you are handling IPN, write the following:
 
     ```
     // Put this above controller definition
@@ -341,7 +341,7 @@ Suppose you have set IPN URL to **http://example.com/ipn/notify/** in PayPal. To
     use PayPalIPN;
     ```
 
-* The above step saves the PayPal IPN response as **ipn** in session. Following is the code you can change to your own requirements for handling IPN:    
+* Write the following code in the function where you will parse IPN response:    
 
     ```php
     /**
@@ -353,7 +353,9 @@ Suppose you have set IPN URL to **http://example.com/ipn/notify/** in PayPal. To
     {
         $response = $this->parsePayPalIPN($request);
 
-        // Parse IPN response accordingly to your requirements.                      
+        if ($response === 'VERIFIED') {                      
+            // Your code goes here ...
+        }                            
     }        
     ```
 

src/Services/AdaptivePayments.php

@@ -230,9 +230,8 @@ private function doPayPalRequest($method, $params)
             ]);
 
             $response = $request->getBody(true);
-            $response = \GuzzleHttp\json_decode($response, true);
 
-            return $response;
+            return \GuzzleHttp\json_decode($response, true);
         } catch (ClientException $e) {
             throw new \Exception($e->getRequest().' '.$e->getResponse());
         } catch (ServerException $e) {

src/Traits/PayPalRequest.php

@@ -284,9 +284,8 @@ private function doPayPalRequest($method, $params)
             ]);
 
             $response = $request->getBody(true);
-            $response = $this->retrieveData($response);
 
-            return $response;
+            return ($method == 'verifyipn') ? $response : $this->retrieveData($response);
         } catch (ClientException $e) {
             throw new \Exception($e->getRequest().' '.$e->getResponse());
         } catch (ServerException $e) {
@@ -306,18 +305,13 @@ private function doPayPalRequest($method, $params)
     /**
      * Parse PayPal NVP Response.
      *
-     * @param string|\GuzzleHttp\Psr7\Request $request
+     * @param string $request
+     * @param array  $response
      *
      * @return array
      */
-    private function retrieveData($request)
+    private function retrieveData($request, array $response = null)
     {
-        $response = [];
-
-        if ($request instanceof \GuzzleHttp\Psr7\Request) {
-            $request = \GuzzleHttp\Psr7\Str($request);
-        }
-
         parse_str($request, $response);
 
         return $response;