From: Vincent Vanwaelscappel Date: Mon, 2 Jun 2025 13:51:59 +0000 (+0200) Subject: wip #7567 @1 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=36fcea1ec10b28df7cafb436babf0a4581dea7c1;p=cubist_net.git wip #7567 @1 --- diff --git a/composer.json b/composer.json index 9367717..1f5116c 100644 --- 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 d4399c0..ca3b62c 100644 --- 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 0774205..967ab5a 100644 --- 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); }