recover deprecated (#138)

Author: 宋神宗

src/Credentials/Providers/Provider.php

@@ -15,16 +15,19 @@ class Provider
      * For TSC Duration Seconds
      */
     const DURATION_SECONDS = 3600;
+
     /**
      * @var array
      */
     protected static $credentialsCache = [];
+
     /**
      * Expiration time slot for temporary security credentials.
      *
      * @var int
      */
     protected $expirationSlot = 180;
+
     /**
      * @var Client
      */

src/DefaultAcsClient.php

@@ -2,24 +2,54 @@
 
 namespace AlibabaCloud\Client;
 
-use RuntimeException;
+use AlibabaCloud\Client\Result\Result;
+use AlibabaCloud\Client\Clients\Client;
+use AlibabaCloud\Client\Request\Request;
+use AlibabaCloud\Client\Exception\ClientException;
+use AlibabaCloud\Client\Exception\ServerException;
 
 /**
  * Class DefaultAcsClient
  *
  * @package    AlibabaCloud
  *
- * @deprecated
+ * @deprecated deprecated since version 2.0, Use AlibabaCloud instead.
  * @codeCoverageIgnore
  */
 class DefaultAcsClient
 {
 
+    /**
+     * @var string
+     */
+    public $randClientName;
+
     /**
      * DefaultAcsClient constructor.
+     *
+     * @param Client $client
+     *
+     * @throws ClientException
      */
-    public function __construct()
+    public function __construct(Client $client)
     {
-        throw new RuntimeException('deprecated since 2.0, Use AlibabaCloud instead.');
+        $this->randClientName = \uniqid('', true);
+        $client->name($this->randClientName);
+    }
+
+    /**
+     * @param Request|Result $request
+     *
+     * @return Result|string
+     * @throws ClientException
+     * @throws ServerException
+     */
+    public function getAcsResponse($request)
+    {
+        if ($request instanceof Result) {
+            return $request;
+        }
+
+        return $request->client($this->randClientName)->request();
     }
 }

src/Exception/AlibabaCloudException.php

@@ -2,14 +2,15 @@
 
 namespace AlibabaCloud\Client\Exception;
 
+use Exception;
 use RuntimeException;
 
 /**
  * Class AlibabaCloudException
  *
  * @package   AlibabaCloud\Client\Exception
  */
-abstract class AlibabaCloudException extends \Exception
+abstract class AlibabaCloudException extends Exception
 {
 
     /**
@@ -49,11 +50,14 @@ public function getErrorMessage()
 
     /**
      * @codeCoverageIgnore
+     *
+     * @param $errorMessage
+     *
      * @deprecated
      */
-    public function setErrorMessage()
+    public function setErrorMessage($errorMessage)
     {
-        throw new RuntimeException('deprecated since 2.0.');
+        $this->errorMessage = $errorMessage;
     }
 
     /**
@@ -62,6 +66,5 @@ public function setErrorMessage()
      */
     public function setErrorType()
     {
-        throw new RuntimeException('deprecated since 2.0.');
     }
 }

src/Exception/ClientException.php

@@ -33,6 +33,6 @@ public function __construct($errorMessage, $errorCode, $previous = null)
      */
     public function getErrorType()
     {
-        throw new RuntimeException('deprecated since 2.0.');
+        return 'Client';
     }
 }

src/Exception/ServerException.php

@@ -144,7 +144,7 @@ public function getRequestId()
      */
     public function getErrorType()
     {
-        throw new RuntimeException('deprecated since 2.0.');
+        return 'Server';
     }
 
     /**
@@ -153,6 +153,6 @@ public function getErrorType()
      */
     public function getHttpStatus()
     {
-        throw new RuntimeException('deprecated since 2.0, Use getResult()->getResponse()->getStatusCode() instead.');
+        return $this->getResult()->getResponse()->getStatusCode();
     }
 }

src/Profile/DefaultProfile.php

@@ -2,35 +2,73 @@
 
 namespace AlibabaCloud\Client\Profile;
 
-use RuntimeException;
+use AlibabaCloud\Client\AlibabaCloud;
+use AlibabaCloud\Client\Clients\Client;
+use AlibabaCloud\Client\Exception\ClientException;
 
 /**
  * Class DefaultProfile
  *
  * @package    AlibabaCloud\Client\Profile
- *
- * @deprecated
  * @codeCoverageIgnore
+ * @deprecated deprecated since version 2.0, Use AlibabaCloud instead.
  */
 class DefaultProfile
 {
-    public static function getProfile()
+
+    /**
+     * @param string $regionId
+     * @param string $accessKeyId
+     * @param string $accessKeySecret
+     *
+     * @return Client
+     * @throws ClientException
+     */
+    public static function getProfile($regionId, $accessKeyId, $accessKeySecret)
     {
-        throw new RuntimeException('deprecated since 2.0, Use AlibabaCloud::accessKeyClient() instead.');
+        return AlibabaCloud::accessKeyClient($accessKeyId, $accessKeySecret)
+                           ->regionId($regionId);
     }
 
-    public static function getRamRoleArnProfile()
+    /**
+     * @param string $regionId
+     * @param string $accessKeyId
+     * @param string $accessKeySecret
+     * @param string $roleArn
+     * @param string $roleSessionName
+     *
+     * @return Client
+     * @throws ClientException
+     */
+    public static function getRamRoleArnProfile($regionId, $accessKeyId, $accessKeySecret, $roleArn, $roleSessionName)
     {
-        throw new RuntimeException('deprecated since 2.0, Use AlibabaCloud::ramRoleArnClient() instead.');
+        return AlibabaCloud::ramRoleArnClient($accessKeyId, $accessKeySecret, $roleArn, $roleSessionName)
+                           ->regionId($regionId);
     }
 
-    public static function getEcsRamRoleProfile()
+    /**
+     * @param string $regionId
+     * @param string $roleName
+     *
+     * @return Client
+     * @throws ClientException
+     */
+    public static function getEcsRamRoleProfile($regionId, $roleName)
     {
-        throw new RuntimeException('deprecated since 2.0, Use AlibabaCloud::ecsRamRoleClient() instead.');
+        return AlibabaCloud::ecsRamRoleClient($roleName)
+                           ->regionId($regionId);
     }
 
-    public static function getBearerTokenProfile()
+    /**
+     * @param string $regionId
+     * @param string $bearerToken
+     *
+     * @return Client
+     * @throws ClientException
+     */
+    public static function getBearerTokenProfile($regionId, $bearerToken)
     {
-        throw new RuntimeException('deprecated since 2.0, Use AlibabaCloud::bearerTokenClient() instead.');
+        return AlibabaCloud::bearerTokenClient($bearerToken)
+                           ->regionId($regionId);
     }
 }

src/Regions/EndpointProvider.php

@@ -2,31 +2,17 @@
 
 namespace AlibabaCloud\Client\Regions;
 
-use RuntimeException;
+use AlibabaCloud\Client\Traits\EndpointTrait;
 
 /**
  * Class EndpointProvider
  *
  * @package    AlibabaCloud\Client\Regions
  *
- * @deprecated
+ * @deprecated deprecated since version 2.0, Use AlibabaCloud instead.
  * @codeCoverageIgnore
  */
 class EndpointProvider
 {
-    /**
-     * @deprecated
-     */
-    public static function findProductDomain()
-    {
-        throw new RuntimeException('deprecated since 2.0, Use AlibabaCloud::resolveHost() instead.');
-    }
-
-    /**
-     * @deprecated
-     */
-    public static function addEndpoint()
-    {
-        throw new RuntimeException('deprecated since 2.0, Use AlibabaCloud::addHost() instead.');
-    }
+    use EndpointTrait;
 }

src/Regions/LocationService.php

@@ -46,23 +46,35 @@ private function __construct(Request $request)
     }
 
     /**
+     * @param Request $request
+     * @param string  $domain
+     *
+     * @return string
+     * @throws ClientException
+     * @throws ServerException
      * @deprecated
      * @codeCoverageIgnore
      */
-    public static function findProductDomain()
+    public static function findProductDomain(Request $request, $domain = 'location.aliyuncs.com')
     {
-        throw new RuntimeException('deprecated since 2.0, Use resolveHost() instead.');
+        return self::resolveHost($request, $domain);
     }
 
     /**
+     * @param $regionId
+     * @param $product
+     * @param $domain
+     *
+     * @throws ClientException
      * @deprecated
      * @codeCoverageIgnore
      */
-    public static function addEndPoint()
+    public static function addEndPoint($regionId, $product, $domain)
     {
-        throw new RuntimeException('deprecated since 2.0, Use addHost() instead.');
+        self::addHost($product, $domain, $regionId);
     }
 
+
     /**
      * @param Request $request
      * @param string  $domain

src/Request/Traits/DeprecatedRoaTrait.php

@@ -2,47 +2,54 @@
 
 namespace AlibabaCloud\Client\Request\Traits;
 
-use RuntimeException;
-
 /**
  * @package    AlibabaCloud\Client\Request\Traits
  * @codeCoverageIgnore
  */
 trait DeprecatedRoaTrait
 {
     /**
+     * @param $name
+     * @param $value
+     *
+     * @return $this
      * @deprecated
      * @codeCoverageIgnore
      */
-    public function putPathParameter()
+    public function putPathParameter($name, $value)
     {
-        throw new RuntimeException('deprecated since 2.0, Use pathParameter() instead.');
+        return $this->pathParameter($name, $value);
     }
 
     /**
+     * @param $pathPattern
+     *
+     * @return $this
      * @deprecated
      * @codeCoverageIgnore
      */
-    public function setUriPattern()
+    public function setUriPattern($pathPattern)
     {
-        throw new RuntimeException('deprecated since 2.0, Use pathPattern() instead.');
+        return $this->pathPattern($pathPattern);
     }
 
     /**
+     * @return string
      * @deprecated
      * @codeCoverageIgnore
      */
     public function getUriPattern()
     {
-        throw new RuntimeException('deprecated since 2.0, Use pathPattern instead.');
+        return $this->pathPattern;
     }
 
     /**
+     * @return array
      * @deprecated
      * @codeCoverageIgnore
      */
     public function getPathParameters()
     {
-        throw new RuntimeException('deprecated since 2.0, Use pathParameters instead.');
+        return $this->pathParameters;
     }
 }