add strictObjectName option.

Author: huiguangjun

src/OSS/OssClient.php

@@ -178,8 +178,21 @@ private function __initNewClient($config = array())
         $this->region = isset($config['region']) ? $config['region'] : '';
         $this->cloudBoxId = isset($config['cloudBoxId']) ? $config['cloudBoxId'] : '';
 
-        $signatureVersion = isset($config['signatureVersion']) ? $config['signatureVersion'] : self::OSS_SIGNATURE_VERSION_V1;
+        // $enableStrictObjName
+        $this->enableStrictObjName = true;
+        if (isset($config['strictObjectName'])) {
+            if ($config['strictObjectName'] === false) {
+                $this->enableStrictObjName = false;
+            }
+        }
+
+        // sign version
+        $signatureVersion = self::OSS_SIGNATURE_VERSION_V1;
+        if (isset($config['signatureVersion']) && $config['signatureVersion'] === self::OSS_SIGNATURE_VERSION_V4) {
+            $signatureVersion = self::OSS_SIGNATURE_VERSION_V4;
+        }
         if ($signatureVersion === self::OSS_SIGNATURE_VERSION_V4) {
+            $this->enableStrictObjName = false;
             $this->signer = new SignerV4();
         } else {
             $this->signer = new SignerV1();
@@ -3267,17 +3280,6 @@ public function getMaxRetries()
      */
     public function setSignStsInUrl($enable)
     {
-        $this->enableStsInUrl = $enable;
-    }
-
-    /**
-     * Enable/disable strict object name.
-     *
-     * @param boolean $enable
-     */
-    public function setStrictObjectName($enable)
-    {
-        $this->enableStrictObjName = $enable;
     }
 
     /**
@@ -3743,7 +3745,7 @@ public function setConnectTimeout($connectTimeout)
      */
     private $provider;
     private $hostname;
-    private $enableStrictObjName = true;
+    private $enableStrictObjName;
     private $timeout = 0;
     private $connectTimeout = 0;
     private $cloudBoxId = null;

tests/OSS/Tests/OssClientSignatureTest.php

@@ -107,18 +107,37 @@ public function testSignedUrlWithException()
             }
         }
 
+        // Set StrictObjectName false
         $object = "?a.file";
         $timeout = 3600;
         $options = array('Content-Type' => 'txt');
+        $config = array(
+            'strictObjectName' => false
+        );
+        $ossClient = Common::getOssClient($config);
         try {
-            $this->ossClient->setStrictObjectName(false);
-            $signedUrl = $this->ossClient->signUrl($this->bucket, $object, $timeout, "PUT", $options);
+            $signedUrl = $ossClient->signUrl($this->bucket, $object, $timeout, "PUT", $options);
             $this->assertTrue(true);
         } catch (OssException $e) {
             print_r($e->getMessage());
             $this->assertFalse(true);
         }
 
+        // V4
+        $object = "?a.file";
+        $timeout = 3600;
+        $options = array('Content-Type' => 'txt');
+        $config = array(
+            'signatureVersion' => OssClient::OSS_SIGNATURE_VERSION_V4
+        );
+        $ossClient = Common::getOssClient($config);
+        try {
+            $signedUrl = $ossClient->signUrl($this->bucket, $object, $timeout, "PUT", $options);
+            $this->assertTrue(true);
+        } catch (OssException $e) {
+            print_r($e->getMessage());
+            $this->assertFalse(true);
+        }
     }
 
     function testGetgenPreSignedUrlForGettingObject()