🐛 修复某些参数无法设置的问题，fixed #23,#24

Abbotton · Sep 17, 2021 · 3125d24 · 3125d24
1 parent f28bf6f
commit 3125d24
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 103 deletions.
diff --git a/aop/AlipayAccessorTrait.php b/aop/AlipayAccessorTrait.php
@@ -2,31 +2,21 @@
 
 namespace Alipay;
 
-use Alipay\Exception\AlipayInvalidPropertyException;
-
 trait AlipayAccessorTrait
 {
     public function __get($name)
     {
         $getter = 'get'.$name;
         if (method_exists($this, $getter)) {
             return $this->$getter();
-        } elseif (method_exists($this, 'set'.$name)) {
-            throw new AlipayInvalidPropertyException('Getting write-only property', $name);
         }
-
-        throw new AlipayInvalidPropertyException('Getting unknown property', $name);
     }
 
     public function __set($name, $value)
     {
         $setter = 'set'.$name;
         if (method_exists($this, $setter)) {
             $this->$setter($value);
-        } elseif (method_exists($this, 'get'.$name)) {
-            throw new AlipayInvalidPropertyException('Setting read-only property', $name);
-        } else {
-            throw new AlipayInvalidPropertyException('Setting unknown property', $name);
         }
     }
 
@@ -45,8 +35,6 @@ public function __unset($name)
         $setter = 'set'.$name;
         if (method_exists($this, $setter)) {
             $this->$setter(null);
-        } elseif (method_exists($this, 'get'.$name)) {
-            throw new AlipayInvalidPropertyException('Unsetting read-only property', $name);
         }
     }
 }
diff --git a/aop/AlipayRequestFactory.php b/aop/AlipayRequestFactory.php
@@ -2,8 +2,6 @@
 
 namespace Alipay;
 
-use Alipay\Exception\AlipayInvalidPropertyException;
-use Alipay\Exception\AlipayInvalidRequestException;
 use Alipay\Request\AlipayRequest;
 
 class AlipayRequestFactory
@@ -25,24 +23,17 @@ public static function create($apiName, $config = [])
      * 通过 `API 名称` 创建请求类实例.
      *
      * @param $apiName
-     * @param array $config
-     *
-     * @throws AlipayInvalidRequestException
-     *
+     * @param  array  $config
      * @return AlipayRequest
      */
     private function createByApi($apiName, $config = [])
     {
         $config = array_merge($config, ['api_method_name' => $apiName]);
         $request = new AlipayRequest();
 
-        try {
-            foreach ($config as $key => $value) {
-                $property = AlipayHelper::studlyCase($key, '_');
-                $request->$property = $value;
-            }
-        } catch (AlipayInvalidPropertyException $ex) {
-            throw new AlipayInvalidRequestException($ex->getMessage().': '.$key);
+        foreach ($config as $key => $value) {
+            $property = AlipayHelper::studlyCase($key, '_');
+            $request->$property = $value;
         }
 
         return $request;

diff --git a/aop/AlipayResponse.php b/aop/AlipayResponse.php
@@ -138,11 +138,7 @@ public function getError($assoc = true)
         if ($this->isSuccess()) {
             return null;
         }
-        if (isset($this->parsed[static::ERROR_NODE])) {
-            $result = $this->parsed[static::ERROR_NODE];
-        } else {
-            $result = $this->getFirstElement();
-        }
+        $result = $this->parsed[static::ERROR_NODE] ?? $this->getFirstElement();
         if ($assoc == false) {
             $result = (object) ($result);
         }

diff --git a/aop/Exception/AlipayInvalidPropertyException.php b/aop/Exception/AlipayInvalidPropertyException.php
diff --git a/aop/Exception/AlipayInvalidRequestException.php b/aop/Exception/AlipayInvalidRequestException.php
diff --git a/tests/default/RequestFactoryTest.php b/tests/default/RequestFactoryTest.php
@@ -20,22 +20,4 @@ public function testCreateByApi()
         $ins = AlipayRequestFactory::create($this->apiName);
         $this->assertInstanceOf(AlipayRequest::className(), $ins);
     }
-
-    public function testInvalidConfig()
-    {
-        $this->setExpectedException('Alipay\Exception\AlipayInvalidRequestException');
-
-        AlipayRequestFactory::create('foo.bar', [
-            'foo' => 'this config does not exist',
-        ]);
-    }
-
-    public function testUnwritableConfig()
-    {
-        $this->setExpectedException('Alipay\Exception\AlipayInvalidRequestException');
-
-        AlipayRequestFactory::create($this->apiName, [
-            'foo' => 'bar',
-        ]);
-    }
 }
diff --git a/tests/default/RequestsTest.php b/tests/default/RequestsTest.php
@@ -17,28 +17,6 @@ public function testGetterSetter()
         $this->assertEquals($url, $ins->getNotifyUrl());
     }
 
-    public function testSetUnknownProperty()
-    {
-        $this->setExpectedException('Alipay\Exception\AlipayInvalidPropertyException');
-
-        $ins = AlipayRequestFactory::create($this->apiName);
-        $ins->foo;
-    }
-
-    public function testGetUnknownProperty()
-    {
-        $this->setExpectedException('Alipay\Exception\AlipayInvalidPropertyException');
-        $ins = AlipayRequestFactory::create($this->apiName);
-
-        try {
-            $ins->foo;
-        } catch (Alipay\Exception\AlipayInvalidPropertyException $ex) {
-            $this->assertEquals('foo', $ex->getProperty());
-
-            throw $ex;
-        }
-    }
-
     public function testTimestamp()
     {
         $ins = AlipayRequestFactory::create($this->apiName);