Merge pull request #1 from rodolfoberrios/master

Deprecated ArrayHelper, fixed getters
obregonco · Mar 29, 2019 · 57d3c3d · 57d3c3d
2 parents 247fec9 + 3585940
commit 57d3c3d
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -9,7 +9,6 @@
 use Illuminate\Cache\CacheManager;
 use Illuminate\Container\Container;
 use Illuminate\Filesystem\Filesystem;
-use yii\helpers\ArrayHelper;
 
 class Client
 {
@@ -542,8 +541,8 @@ protected function getFileIdFromBucketAndFileName($bucketName, $fileName)
         ]);
 
         foreach ($files as $file) {
-            if ($file->getName() === $fileName) {
-                return $file->getId();
+            if ($file->getFileName() === $fileName) {
+                return $file->getFileId();
             }
         }
 
@@ -758,7 +757,7 @@ protected function request($method, $uri = null, array $options = [], $asJson =
             $headers['Authorization'] = $this->authToken;
         }
 
-        $options = ArrayHelper::merge([
+        $options = array_replace_recursive([
             'headers' => $headers,
         ], $options);