wip #7567 @1

diff --git a/composer.json b/composer.json
index 9367717bdb6ff5bb3220b964181ca9d94135b884..1f5116c0cd3668f0d40d2c17136caf6a4b68c665 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -1,35 +1,35 @@
 {
-  "name": "cubist\/net",
-  "description": "net cubist composer package",
-  "type": "library",
-  "license": "proprietary",
-  "minimum-stability": "dev",
-  "repositories": [
-    {
-      "type": "composer",
-      "url": "https://composer.cubedesigners.com/"
+    "name": "cubist\/net",
+    "description": "net cubist composer package",
+    "type": "library",
+    "license": "proprietary",
+    "minimum-stability": "dev",
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://composer.cubedesigners.com/"
+        }
+    ],
+    "autoload": {
+        "psr-4": {
+            "Cubist\\Net\\": "src"
+        }
+    },
+    "authors": [
+        {
+            "name": "Vincent Vanwaelscappel",
+            "email": "vincent@cubedesigners.com"
+        }
+    ],
+    "require": {
+        "php": ">=7.0.0",
+        "ext-ssh2": "*",
+        "cubist/util": "dev-master",
+        "ext-ftp": "*",
+        "aws/aws-sdk-php": "^3.325",
+        "google/cloud-storage": "*",
+        "ext-json": "*"
+    },
+    "suggest": {
     }
-  ],
-  "autoload": {
-    "psr-4": {
-      "Cubist\\Net\\": "src"
-    }
-  },
-  "authors": [
-    {
-      "name": "Vincent Vanwaelscappel",
-      "email": "vincent@cubedesigners.com"
-    }
-  ],
-  "require": {
-    "php": ">=7.0.0",
-    "ext-ssh2": "*",
-    "cubist/util": "dev-master",
-    "ext-ftp": "*",
-    "aws/aws-sdk-php": "^3.325",
-    "google/cloud-storage": "*"
-  },
-  "suggest": {
-
-  }
 }

diff --git a/src/Transfer/GCS.php b/src/Transfer/GCS.php
index d4399c01e300aae830bba5fb95026f3df1b908a9..ca3b62c823282ee6a2b2ccc7b099448e2499a3dd 100644 (file)
--- a/src/Transfer/GCS.php
+++ b/src/Transfer/GCS.php
@@ -16,7 +16,7 @@ class GCS extends Driver
      */
     protected function createClient(&$data)
     {
-        return new StorageClient(['keyFile' => json_decode($this->getServer()->gcs_service_account_key, true)]);
+        return new StorageClient(['keyFile' => json_decode($this->getServer()->getGCSServiceAccountKey(), true)]);
     }
 
 

diff --git a/src/Transfer/IServer.php b/src/Transfer/IServer.php
index 0774205fc291a01621fca2d3d8c0f95656077896..967ab5a6aa773922bcc4402db74cc74b122a470e 100644 (file)
--- a/src/Transfer/IServer.php
+++ b/src/Transfer/IServer.php
@@ -71,6 +71,11 @@ interface IServer
 
     public function getS3Provider();
 
+    /**
+     * @return string
+     */
+    public function getGCSServiceAccountKey();
+
     public function makeURL($path);
 
 }