summergeorge / Aliyun-oss-storage

src/AliOssAdapter.php

Spacing +33 added lines, -33 removed lines

@@ -148,10 +148,10 @@ 
         $object = $this->applyPathPrefix($path);
         $options = $this->getOptions($this->options, $config);
 
-        if (! isset($options[OssClient::OSS_LENGTH])) {
+        if (!isset($options[OssClient::OSS_LENGTH])) {
             $options[OssClient::OSS_LENGTH] = Util::contentSize($contents);
         }
-        if (! isset($options[OssClient::OSS_CONTENT_TYPE])) {
+        if (!isset($options[OssClient::OSS_CONTENT_TYPE])) {
             $options[OssClient::OSS_CONTENT_TYPE] = Util::guessMimeType($path, $contents);
         }
         try {
@@ -180,13 +180,13 @@ 
         return $this->write($path, $contents, $config);
     }
 
-    public function writeFile($path, $filePath, Config $config){
+    public function writeFile($path, $filePath, Config $config) {
         $object = $this->applyPathPrefix($path);
         $options = $this->getOptions($this->options, $config);
 
         $options[OssClient::OSS_CHECK_MD5] = true;
 
-        if (! isset($options[OssClient::OSS_CONTENT_TYPE])) {
+        if (!isset($options[OssClient::OSS_CONTENT_TYPE])) {
             $options[OssClient::OSS_CONTENT_TYPE] = Util::guessMimeType($path, '');
         }
         try {
@@ -209,7 +209,7 @@ 
      */
     public function update($path, $contents, Config $config)
     {
-        if (! $config->has('visibility') && ! $config->has('ACL')) {
+        if (!$config->has('visibility') && !$config->has('ACL')) {
             $config->set(static::$metaMap['ACL'], $this->getObjectACL($path));
         }
         // $this->delete($path);
@@ -236,7 +236,7 @@ 
      */
     public function rename($path, $newpath)
     {
-        if (! $this->copy($path, $newpath)){
+        if (!$this->copy($path, $newpath)) {
             return false;
         }
 
@@ -250,7 +250,7 @@ 
     {
         $object = $this->applyPathPrefix($path);
         $newObject = $this->applyPathPrefix($newpath);
-        try{
+        try {
             $this->client->copyObject($this->bucket, $object, $this->bucket, $newObject);
         } catch (OssException $e) {
             $this->logErr(__FUNCTION__, $e);
@@ -268,14 +268,14 @@ 
         $bucket = $this->bucket;
         $object = $this->applyPathPrefix($path);
 
-        try{
+        try {
             $this->client->deleteObject($bucket, $object);
-        }catch (OssException $e) {
+        } catch (OssException $e) {
             $this->logErr(__FUNCTION__, $e);
             return false;
         }
 
-        return ! $this->has($path);
+        return !$this->has($path);
     }
 
     /**
@@ -286,9 +286,9 @@ 
         $dirname = rtrim($this->applyPathPrefix($dirname), '/').'/';
         $dirObjects = $this->listDirObjects($dirname, true);
 
-        if(count($dirObjects['objects']) > 0 ){
+        if (count($dirObjects['objects']) > 0) {
 
-            foreach($dirObjects['objects'] as $object)
+            foreach ($dirObjects['objects'] as $object)
             {
                 $objects[] = $object['Key'];
             }
@@ -319,7 +319,7 @@ 
      * @return mixed
      * @throws OssException
      */
-    public function listDirObjects($dirname = '', $recursive =  false)
+    public function listDirObjects($dirname = '', $recursive = false)
     {
         $delimiter = '/';
         $nextMarker = '';
@@ -328,7 +328,7 @@ 
         //存储结果
         $result = [];
 
-        while(true){
+        while (true) {
             $options = [
                 'delimiter' => $delimiter,
                 'prefix'    => $dirname,
@@ -361,7 +361,7 @@ 
 
                     $result['objects'][] = $object;
                 }
-            }else{
+            } else {
                 $result["objects"] = [];
             }
 
@@ -369,14 +369,14 @@ 
                 foreach ($prefixList as $prefixInfo) {
                     $result['prefix'][] = $prefixInfo->getPrefix();
                 }
-            }else{
+            } else {
                 $result['prefix'] = [];
             }
 
             //递归查询子目录所有文件
-            if($recursive){
-                foreach( $result['prefix'] as $pfix){
-                    $next  =  $this->listDirObjects($pfix , $recursive);
+            if ($recursive) {
+                foreach ($result['prefix'] as $pfix) {
+                    $next = $this->listDirObjects($pfix, $recursive);
                     $result["objects"] = array_merge($result['objects'], $next["objects"]);
                 }
             }
@@ -414,7 +414,7 @@ 
     public function setVisibility($path, $visibility)
     {
         $object = $this->applyPathPrefix($path);
-        $acl = ( $visibility === AdapterInterface::VISIBILITY_PUBLIC ) ? OssClient::OSS_ACL_TYPE_PUBLIC_READ : OssClient::OSS_ACL_TYPE_PRIVATE;
+        $acl = ($visibility === AdapterInterface::VISIBILITY_PUBLIC) ? OssClient::OSS_ACL_TYPE_PUBLIC_READ : OssClient::OSS_ACL_TYPE_PRIVATE;
 
         $this->client->putObjectAcl($this->bucket, $object, $acl);
 
@@ -437,7 +437,7 @@ 
     public function read($path)
     {
         $result = $this->readObject($path);
-        $result['contents'] = (string) $result['raw_contents'];
+        $result['contents'] = (string)$result['raw_contents'];
         unset($result['raw_contents']);
         return $result;
     }
@@ -486,7 +486,7 @@ 
         $contents = $dirObjects["objects"];
 
         $result = array_map([$this, 'normalizeResponse'], $contents);
-        $result = array_filter($result, function ($value) {
+        $result = array_filter($result, function($value) {
             return $value['path'] !== false;
         });
 
@@ -525,7 +525,7 @@ 
      */
     public function getMimetype($path)
     {
-        if( $object = $this->getMetadata($path))
+        if ($object = $this->getMetadata($path))
             $object['mimetype'] = $object['content-type'];
         return $object;
     }
@@ -535,8 +535,8 @@ 
      */
     public function getTimestamp($path)
     {
-        if( $object = $this->getMetadata($path))
-            $object['timestamp'] = strtotime( $object['last-modified'] );
+        if ($object = $this->getMetadata($path))
+            $object['timestamp'] = strtotime($object['last-modified']);
         return $object;
     }
 
@@ -553,9 +553,9 @@ 
             return false;
         }
 
-        if ($acl == OssClient::OSS_ACL_TYPE_PUBLIC_READ ){
+        if ($acl == OssClient::OSS_ACL_TYPE_PUBLIC_READ) {
             $res['visibility'] = AdapterInterface::VISIBILITY_PUBLIC;
-        }else{
+        } else {
             $res['visibility'] = AdapterInterface::VISIBILITY_PRIVATE;
         }
 
@@ -568,10 +568,10 @@ 
      *
      * @return string
      */
-    public function getUrl( $path )
+    public function getUrl($path)
     {
         if (!$this->has($path)) throw new FileNotFoundException($path.' not found');
-        return ( $this->ssl ? 'https://' : 'http://' ) . ( $this->isCname ? ( $this->cdnDomain == '' ? $this->endPoint : $this->cdnDomain ) : $this->bucket . '.' . $this->endPoint ) . '/' . ltrim($path, '/');
+        return ($this->ssl ? 'https://' : 'http://').($this->isCname ? ($this->cdnDomain == '' ? $this->endPoint : $this->cdnDomain) : $this->bucket.'.'.$this->endPoint).'/'.ltrim($path, '/');
     }
     
     
@@ -674,7 +674,7 @@ 
         $options = [];
 
         foreach (static::$metaOptions as $option) {
-            if (! $config->has($option)) {
+            if (!$config->has($option)) {
                 continue;
             }
             $options[static::$metaMap[$option]] = $config->get($option);
@@ -701,9 +701,9 @@ 
      * @param $fun string function name : __FUNCTION__
      * @param $e
      */
-    protected function logErr($fun, $e){
-        if( $this->debug ){
-            Log::error($fun . ": FAILED");
+    protected function logErr($fun, $e) {
+        if ($this->debug) {
+            Log::error($fun.": FAILED");
             Log::error($e->getMessage());
         }
     }

Braces +16 added lines, -11 removed lines

@@ -270,7 +270,7 @@ 
 
         try{
             $this->client->deleteObject($bucket, $object);
-        }catch (OssException $e) {
+        } catch (OssException $e) {
             $this->logErr(__FUNCTION__, $e);
             return false;
         }
@@ -361,7 +361,7 @@ 
 
                     $result['objects'][] = $object;
                 }
-            }else{
+            } else{
                 $result["objects"] = [];
             }
 
@@ -369,7 +369,7 @@ 
                 foreach ($prefixList as $prefixInfo) {
                     $result['prefix'][] = $prefixInfo->getPrefix();
                 }
-            }else{
+            } else{
                 $result['prefix'] = [];
             }
 
@@ -525,8 +525,9 @@ 
      */
     public function getMimetype($path)
     {
-        if( $object = $this->getMetadata($path))
-            $object['mimetype'] = $object['content-type'];
+        if( $object = $this->getMetadata($path)) {
+                    $object['mimetype'] = $object['content-type'];
+        }
         return $object;
     }
 
@@ -535,8 +536,9 @@ 
      */
     public function getTimestamp($path)
     {
-        if( $object = $this->getMetadata($path))
-            $object['timestamp'] = strtotime( $object['last-modified'] );
+        if( $object = $this->getMetadata($path)) {
+                    $object['timestamp'] = strtotime( $object['last-modified'] );
+        }
         return $object;
     }
 
@@ -555,7 +557,7 @@ 
 
         if ($acl == OssClient::OSS_ACL_TYPE_PUBLIC_READ ){
             $res['visibility'] = AdapterInterface::VISIBILITY_PUBLIC;
-        }else{
+        } else{
             $res['visibility'] = AdapterInterface::VISIBILITY_PRIVATE;
         }
 
@@ -570,7 +572,9 @@ 
      */
     public function getUrl( $path )
     {
-        if (!$this->has($path)) throw new FileNotFoundException($path.' not found');
+        if (!$this->has($path)) {
+            throw new FileNotFoundException($path.' not found');
+        }
         return ( $this->ssl ? 'https://' : 'http://' ) . ( $this->isCname ? ( $this->cdnDomain == '' ? $this->endPoint : $this->cdnDomain ) : $this->bucket . '.' . $this->endPoint ) . '/' . ltrim($path, '/');
     }
     
@@ -584,8 +588,9 @@ 
      * @throws OssException
      */
     public function getTemporaryUrl($path, $expire, $options) {
-        if (!$this->has($path))
-            throw new FileNotFoundException($path.' not found');
+        if (!$this->has($path)) {
+                    throw new FileNotFoundException($path.' not found');
+        }
         $method = OssClient::OSS_HTTP_GET;
         if (Arr::has($options, OssClient::OSS_METHOD)) {
             $method = $options['method'];