Merge pull request #1190 from magento-tsg/2.0-pr20

[TSG] Preparing 2.0.15 (pr20) (2.0)

Author: wert2all

app/code/Magento/Paypal/Model/AbstractIpn.php

@@ -82,7 +82,7 @@ protected function _postBack()
     {
         $httpAdapter = $this->_curlFactory->create();
         $postbackQuery = http_build_query($this->getRequestData()) . '&cmd=_notify-validate';
-        $postbackUrl = $this->_config->getPaypalUrl();
+        $postbackUrl = $this->_config->getPayPalIpnUrl();
         $this->_addDebugData('postback_to', $postbackUrl);
 
         $httpAdapter->setConfig(['verifypeer' => $this->_config->getValue('verifyPeer')]);

app/code/Magento/Paypal/Model/Config.php

@@ -11,7 +11,7 @@
 /**
  * Config model that is aware of all \Magento\Paypal payment methods
  * Works with PayPal-specific system configuration
- * @SuppressWarnings(PHPMD.ExcesivePublicCount)
+ * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
 class Config extends AbstractConfig
@@ -918,6 +918,19 @@ public function getPaypalUrl(array $params = [])
         );
     }
 
+    /**
+     * PayPal web URL for IPN
+     *
+     * @return string
+     */
+    public function getPayPalIpnUrl()
+    {
+        return sprintf(
+            'https://ipnpb.%spaypal.com/cgi-bin/webscr',
+            $this->getValue('sandboxFlag') ? 'sandbox.' : ''
+        );
+    }
+
     /**
      * Whether Express Checkout button should be rendered dynamically
      *

app/code/Magento/Paypal/Test/Unit/Model/IpnTest.php

@@ -78,8 +78,8 @@ protected function setUp()
         $configMock->expects($this->any())->method('isMethodActive')->will($this->returnValue(true));
         $configMock->expects($this->any())->method('isMethodAvailable')->will($this->returnValue(true));
         $configMock->expects($this->any())->method('getValue')->will($this->returnValue(null));
-        $configMock->expects($this->any())->method('getPaypalUrl')
-            ->will($this->returnValue('http://paypal_url'));
+        $configMock->expects($this->any())->method('getPayPalIpnUrl')
+            ->will($this->returnValue('https://ipnpb_paypal_url'));
 
         $this->curlFactory = $this->getMock(
             'Magento\Framework\HTTP\Adapter\CurlFactory',

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2ce",
     "description": "Magento 2 (Community Edition)",
     "type": "project",
-    "version": "2.0.14",
+    "version": "2.0.15",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

composer.lock

@@ -17,7 +17,7 @@ interface AppInterface
     /**
      * Magento version
      */
-    const VERSION = '2.0.14';
+    const VERSION = '2.0.15';
 
     /**
      * Launch application