From: Vincent Vanwaelscappel Date: Mon, 2 Jun 2025 14:48:29 +0000 (+0200) Subject: #7567 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=380d41aab690e1aec729397d6bb12d7e3319c1de;p=cubist_util.git #7567 --- diff --git a/composer.lock b/composer.lock index 971787c..1776f45 100644 --- a/composer.lock +++ b/composer.lock @@ -292,18 +292,19 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_net.git", - "reference": "dc67a7911a9c51f7f73eda4b5f5424073fa8b034" + "reference": "36fcea1ec10b28df7cafb436babf0a4581dea7c1" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-d11130.tar", - "reference": "dc67a7911a9c51f7f73eda4b5f5424073fa8b034", - "shasum": "297478335935037ac1a87414e9b33a36dcbdf091" + "url": "https://composer.cubedesigners.com/dist/cubist/net/cubist-net-dev-master-35f038.tar", + "reference": "36fcea1ec10b28df7cafb436babf0a4581dea7c1", + "shasum": "265d84aefc3fced6200e9bcaaad8965b9de26f0c" }, "require": { "aws/aws-sdk-php": "^3.325", "cubist/util": "dev-master", "ext-ftp": "*", + "ext-json": "*", "ext-ssh2": "*", "google/cloud-storage": "*", "php": ">=7.0.0" @@ -325,7 +326,7 @@ } ], "description": "net cubist composer package", - "time": "2025-06-02T11:55:44+00:00" + "time": "2025-06-02T13:51:59+00:00" }, { "name": "cubist/pdf", @@ -4283,12 +4284,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "497f73ac996a598c92409b44ac43b6690c4f666d" + "reference": "b1275294c9e511d5b1a507cb0c314a068d401d83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/497f73ac996a598c92409b44ac43b6690c4f666d", - "reference": "497f73ac996a598c92409b44ac43b6690c4f666d", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b1275294c9e511d5b1a507cb0c314a068d401d83", + "reference": "b1275294c9e511d5b1a507cb0c314a068d401d83", "shasum": "" }, "require": { @@ -4305,13 +4306,13 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/error-handler": "^6.4|^7.0", - "symfony/expression-language": "^6.4|^7.0", - "symfony/http-foundation": "^6.4|^7.0", + "symfony/config": "^6.4|^7.0|^8.0", + "symfony/dependency-injection": "^6.4|^7.0|^8.0", + "symfony/error-handler": "^6.4|^7.0|^8.0", + "symfony/expression-language": "^6.4|^7.0|^8.0", + "symfony/http-foundation": "^6.4|^7.0|^8.0", "symfony/service-contracts": "^2.5|^3", - "symfony/stopwatch": "^6.4|^7.0" + "symfony/stopwatch": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -4339,7 +4340,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.0-RC1" + "source": "https://github.com/symfony/event-dispatcher/tree/7.4" }, "funding": [ { @@ -4355,7 +4356,7 @@ "type": "tidelift" } ], - "time": "2025-04-22T09:11:45+00:00" + "time": "2025-06-02T14:13:49+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4440,12 +4441,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb" + "reference": "70acd85443c3883b2691326b8017c38c6688d53c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b8dce482de9d7c9fe2891155035a7248ab5c7fdb", - "reference": "b8dce482de9d7c9fe2891155035a7248ab5c7fdb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/70acd85443c3883b2691326b8017c38c6688d53c", + "reference": "70acd85443c3883b2691326b8017c38c6688d53c", "shasum": "" }, "require": { @@ -4454,7 +4455,7 @@ "symfony/polyfill-mbstring": "~1.8" }, "require-dev": { - "symfony/process": "^6.4|^7.0" + "symfony/process": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -4482,7 +4483,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.3.0-RC1" + "source": "https://github.com/symfony/filesystem/tree/7.4" }, "funding": [ { @@ -4498,7 +4499,7 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:15:23+00:00" + "time": "2025-06-02T14:13:49+00:00" }, { "name": "symfony/finder", @@ -5799,12 +5800,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125" + "reference": "4f1e5bafe27b07f545f90d8c92bb96789ff6f564" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f3570b8c61ca887a9e2938e85cb6458515d2b125", - "reference": "f3570b8c61ca887a9e2938e85cb6458515d2b125", + "url": "https://api.github.com/repos/symfony/string/zipball/4f1e5bafe27b07f545f90d8c92bb96789ff6f564", + "reference": "4f1e5bafe27b07f545f90d8c92bb96789ff6f564", "shasum": "" }, "require": { @@ -5818,12 +5819,12 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/emoji": "^7.1", - "symfony/error-handler": "^6.4|^7.0", - "symfony/http-client": "^6.4|^7.0", - "symfony/intl": "^6.4|^7.0", + "symfony/emoji": "^7.1|^8.0", + "symfony/error-handler": "^6.4|^7.0|^8.0", + "symfony/http-client": "^6.4|^7.0|^8.0", + "symfony/intl": "^6.4|^7.0|^8.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^6.4|^7.0" + "symfony/var-exporter": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -5862,7 +5863,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.3.0-RC1" + "source": "https://github.com/symfony/string/tree/7.4" }, "funding": [ { @@ -5878,7 +5879,7 @@ "type": "tidelift" } ], - "time": "2025-04-20T20:19:01+00:00" + "time": "2025-06-02T14:13:49+00:00" }, { "name": "symfony/translation", diff --git a/src/CommandLine/LocalToGCSRclone.php b/src/CommandLine/LocalToGCSRclone.php index 3850836..0ca423d 100644 --- a/src/CommandLine/LocalToGCSRclone.php +++ b/src/CommandLine/LocalToGCSRclone.php @@ -7,7 +7,7 @@ use Cubist\Net\Transfer\IServer; class LocalToGCSRclone extends CloneProgram { protected $_prog = 'rclone'; - protected $_gcs_service_account_key = []; + protected $_gcs_service_account_key = ""; protected $_bucket; protected function _preExecute() @@ -31,7 +31,7 @@ class LocalToGCSRclone extends CloneProgram { parent::setServer($server); - + $this->setGCSServiceAccountKey($server->getGCSServiceAccountKey()); $this->setBucket($server->getBucket()); }