Merge pull request #169 from maxsky/master

Fixed public certificate no effect problem and test file content error.

Author: Success Go

src/AbstractAopGateway.php

@@ -194,6 +194,8 @@ public function getAlipayPublicCert()
      */
     public function setAlipayPublicCert($value)
     {
+        $this->setParameter('alipay_public_key', getPublicKey($value));
+
         return $this->setParameter('alipay_public_cert', $value);
     }
 
@@ -354,7 +356,12 @@ public function getAlipayPublicKey()
      */
     public function setAlipayPublicKey($value)
     {
-        return $this->setParameter('alipay_public_key', $value);
+        // prevent public key overlay when certificate exist
+        if (!$this->getAlipayPublicCert()) {
+            return $this->setParameter('alipay_public_key', $value);
+        }
+
+        return $this;
     }
 
 
@@ -407,7 +414,7 @@ public function setEnvironment($value)
     {
         $env = strtolower($value);
 
-        if (! isset($this->endpoints[$env])) {
+        if (!isset($this->endpoints[$env])) {
             throw new InvalidRequestException('The environment is invalid');
         }
 

src/Requests/AbstractAopRequest.php

@@ -22,8 +22,6 @@ abstract class AbstractAopRequest extends AbstractRequest
 
     protected $alipayRootCert;
 
-    protected $alipayPublicCert;
-
     protected $appCert;
 
     protected $checkAlipayPublicCert = true;
@@ -89,7 +87,6 @@ public function getCertSN()
             if (is_file($alipayRootCert) && is_file($appCert)) {
                 $this->setParameter('alipay_root_cert_sn', getRootCertSN($alipayRootCert));
                 $this->setParameter('app_cert_sn', getCertSN($appCert));
-                $this->setAlipayPublicKey(getPublicKey($this->getAlipayPublicCert()));
             }
         }
     }
@@ -203,28 +200,6 @@ public function setAlipayRootCert($value)
     }
 
 
-    /**
-     * @return mixed
-     */
-    public function getAlipayPublicCert()
-    {
-        return $this->alipayPublicCert;
-    }
-
-
-    /**
-     * @param $value
-     *
-     * @return $this
-     */
-    public function setAlipayPublicCert($value)
-    {
-        $this->alipayPublicCert = $value;
-
-        return $this;
-    }
-
-
     /**
      * @return mixed
      */

tests/AbstractGatewayTestCase.php

@@ -16,6 +16,8 @@ abstract class AbstractGatewayTestCase extends GatewayTestCase
 
     protected $appPrivateKey = ALIPAY_APP_PRIVATE_KEY;
 
+    protected $alipayPublicKey = ALIPAY_PUBLIC_KEY;
+
     protected $appEncryptKey = ALIPAY_APP_ENCRYPT_KEY;
 
 

tests/AopAppGatewayTest.php

@@ -26,7 +26,7 @@ public function setUp()
         $this->gateway = new AopAppGateway($this->getHttpClient(), $this->getHttpRequest());
         $this->gateway->setAppId($this->appId);
         $this->gateway->setPrivateKey(ALIPAY_AOP_PRIVATE_KEY);
-        //$this->gateway->setAlipayPublicKey(file_get_contents($this->appPrivateKey));
+        //$this->gateway->setAlipayPublicKey(file_get_contents($this->alipayPublicKey));
         //$this->gateway->setEncryptKey($this->appEncryptKey);
         //$this->gateway->setNotifyUrl('http://www.guoshuzc.com/api/pay/alipay_recharge_notify');
         //$this->gateway->setAlipaySdk('alipay_sdk');

tests/bootstrap.php

@@ -18,7 +18,7 @@
     define('ALIPAY_PARTNER', '2088011436420182');
     define('ALIPAY_KEY', '18x8lAi0a1520st1hvxcnt7m4w1whkbs');
     define('ALIPAY_SELLER_ID', '2088011436420182');
-    define('ALIPAY_PUBLIC_KEY', ALIPAY_ASSET_DIR . '/alipay_public_key.pem');
+    define('ALIPAY_PUBLIC_KEY', ALIPAY_ASSET_DIR . '/dist/aop/alipay_public_key.pem');
     define('ALIPAY_LEGACY_PRIVATE_KEY', ALIPAY_ASSET_DIR . '/dist/legacy/rsa_private_key.pem');
     define('ALIPAY_LEGACY_PUBLIC_KEY', ALIPAY_ASSET_DIR . '/dist/legacy/alipay_public_key.pem');
     define('ALIPAY_AOP_PUBLIC_KEY', ALIPAY_ASSET_DIR . '/dist/aop/alipay_public_key.pem');