Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package platformsh-cli for openSUSE:Factory
checked in at 2021-02-17 18:12:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old)
and /work/SRC/openSUSE:Factory/.platformsh-cli.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "platformsh-cli"
Wed Feb 17 18:12:23 2021 rev:109 rq:873006 version:3.65.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes
2020-12-23 14:22:11.569782160 +0100
+++ /work/SRC/openSUSE:Factory/.platformsh-cli.new.28504/platformsh-cli.changes
2021-02-17 18:13:21.662029992 +0100
@@ -1,0 +2,32 @@
+Wed Feb 17 03:42:25 UTC 2021 - ji...@boombatower.com
+
+- Update to version 3.65.2:
+ * Release v3.65.2
+ * Add help in self:release about obtaining a token from the GitHub CLI
+ * Fix activity log in PHP 8 (#1036)
+ * Replace http->tcp and https->ssl in proxy URLs (#1037)
+ * Bump drush/drush from 8.4.5 to 8.4.6 (#1029)
+ * Release v3.65.1
+ * Add a default timeout to all requests
+ * Fix incomplete activity list example
+ * Support a relative update download path
+
+-------------------------------------------------------------------
+Tue Feb 02 01:40:35 UTC 2021 - ji...@boombatower.com
+
+- Update to version 3.65.0:
+ * Release v3.65.0
+ * Rename the backup --unsafe option to --live (#1026)
+ * Add "plain" format option for table commands (#1021)
+ * Remove the restriction on deleting the main environment
+ * Remove us-2 from available region examples (#1025)
+ * Release v3.64.6
+ * integrations: Pass the user-supplied token for creating webhooks (#1023)
+ * Bump stecman/symfony-console-completion from 0.10.1 to 0.11.0
+ * Configure composer updates with Dependabot (#1022)
+ * Release v3.64.5
+ * Fix HTTP access username validation to match the API
+ * Reduce environment list indent from 3 to 2 spaces
+ * Remove patch version notes from manifest.json
+
+-------------------------------------------------------------------
Old:
----
platformsh-cli-3.64.4.tar.xz
New:
----
platformsh-cli-3.65.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ platformsh-cli.spec ++++++
--- /var/tmp/diff_new_pack.iBS2mM/_old 2021-02-17 18:13:22.402030597 +0100
+++ /var/tmp/diff_new_pack.iBS2mM/_new 2021-02-17 18:13:22.402030597 +0100
@@ -1,7 +1,7 @@
#
# spec file for package platformsh-cli
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: platformsh-cli
-Version: 3.64.4
+Version: 3.65.2
Release: 0
Summary: Tool for managing Platform.sh services from the command line
# See licenses.txt for dependency licenses.
++++++ _service ++++++
--- /var/tmp/diff_new_pack.iBS2mM/_old 2021-02-17 18:13:22.434030623 +0100
+++ /var/tmp/diff_new_pack.iBS2mM/_new 2021-02-17 18:13:22.434030623 +0100
@@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
- <param name="revision">refs/tags/v3.64.4</param>
+ <param name="revision">refs/tags/v3.65.2</param>
<param name="url">git://github.com/platformsh/platformsh-cli.git</param>
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.iBS2mM/_old 2021-02-17 18:13:22.454030640 +0100
+++ /var/tmp/diff_new_pack.iBS2mM/_new 2021-02-17 18:13:22.454030640 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/platformsh/platformsh-cli.git</param>
- <param
name="changesrevision">49bf62a6f42c9fac5b94e22cc98462480f420f14</param>
+ <param
name="changesrevision">af88218588143a8770e7087ab1c21133b396a7e0</param>
</service>
</servicedata>
++++++ licenses.txt ++++++
--- /var/tmp/diff_new_pack.iBS2mM/_old 2021-02-17 18:13:22.498030675 +0100
+++ /var/tmp/diff_new_pack.iBS2mM/_new 2021-02-17 18:13:22.498030675 +0100
@@ -16,12 +16,12 @@
padraic/phar-updater v1.0.6 BSD-3-Clause
paragonie/random_compat v2.0.19 MIT
pjcdawkins/guzzle-oauth2-plugin v2.3.1 MIT
-platformsh/client 0.41.0 MIT
+platformsh/client 0.41.1 MIT
platformsh/console-form v0.0.24 MIT
psr/container 1.0.0 MIT
psr/log 1.1.3 MIT
react/promise v2.8.0 MIT
-stecman/symfony-console-completion 0.10.1 MIT
+stecman/symfony-console-completion 0.11.0 MIT
symfony/config v3.4.47 MIT
symfony/console v3.4.47 MIT
symfony/debug v3.4.47 MIT
++++++ platformsh-cli-3.64.4.tar.xz -> platformsh-cli-3.65.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.64.4/.github/dependabot.yml
new/platformsh-cli-3.65.2/.github/dependabot.yml
--- old/platformsh-cli-3.64.4/.github/dependabot.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/platformsh-cli-3.65.2/.github/dependabot.yml 2021-02-16
21:33:37.000000000 +0100
@@ -0,0 +1,7 @@
+version: 2
+updates:
+ # Enable weekly automated version updates for Composer dependencies.
+ - package-ecosystem: composer
+ directory: /
+ schedule:
+ interval: weekly
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.64.4/composer.json
new/platformsh-cli-3.65.2/composer.json
--- old/platformsh-cli-3.64.4/composer.json 2020-12-22 23:13:15.000000000
+0100
+++ new/platformsh-cli-3.65.2/composer.json 2021-02-16 21:33:37.000000000
+0100
@@ -8,13 +8,13 @@
"guzzlehttp/guzzle": "^5.3",
"guzzlehttp/ringphp": "^1.1",
"platformsh/console-form": ">=0.0.24 <2.0",
- "platformsh/client": ">=0.41.0 <2.0",
+ "platformsh/client": ">=0.41.1 <2.0",
"symfony/console": "^3.0 >=3.2",
"symfony/yaml": "^3.0 || ^2.6",
"symfony/finder": "^3.0",
"symfony/filesystem": "^3.0",
"symfony/process": "^3.0 >=3.4",
- "stecman/symfony-console-completion": "^0.10",
+ "stecman/symfony-console-completion": "^0.11",
"symfony/event-dispatcher": "^3.0",
"padraic/phar-updater": "^1.0",
"symfony/dependency-injection": "^3.1",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.64.4/composer.lock
new/platformsh-cli-3.65.2/composer.lock
--- old/platformsh-cli-3.64.4/composer.lock 2020-12-22 23:13:15.000000000
+0100
+++ new/platformsh-cli-3.65.2/composer.lock 2021-02-16 21:33:37.000000000
+0100
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies";,
"This file is @generated automatically"
],
- "content-hash": "e27c53cbfe70782a951c35e1a12d8732",
+ "content-hash": "923a0c791cf4e828f606a9b37b724e4a",
"packages": [
{
"name": "cocur/slugify",
@@ -730,16 +730,16 @@
},
{
"name": "platformsh/client",
- "version": "0.41.0",
+ "version": "0.41.1",
"source": {
"type": "git",
"url":
"https://github.com/platformsh/platformsh-client-php.git";,
- "reference": "e681a5ad20c695ad728fbe14f965c92eb7e6578b"
+ "reference": "5be54c7f64de23fe2ce7f2d391fed72edbf88af3"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/platformsh/platformsh-client-php/zipball/e681a5ad20c695ad728fbe14f965c92eb7e6578b";,
- "reference": "e681a5ad20c695ad728fbe14f965c92eb7e6578b",
+ "url":
"https://api.github.com/repos/platformsh/platformsh-client-php/zipball/5be54c7f64de23fe2ce7f2d391fed72edbf88af3";,
+ "reference": "5be54c7f64de23fe2ce7f2d391fed72edbf88af3",
"shasum": ""
},
"require": {
@@ -771,9 +771,9 @@
"description": "Platform.sh API client",
"support": {
"issues":
"https://github.com/platformsh/platformsh-client-php/issues";,
- "source":
"https://github.com/platformsh/platformsh-client-php/tree/0.41.0";
+ "source":
"https://github.com/platformsh/platformsh-client-php/tree/0.41.1";
},
- "time": "2020-12-12T12:52:56+00:00"
+ "time": "2021-02-05T20:42:39+00:00"
},
{
"name": "platformsh/console-form",
@@ -973,21 +973,21 @@
},
{
"name": "stecman/symfony-console-completion",
- "version": "0.10.1",
+ "version": "0.11.0",
"source": {
"type": "git",
"url":
"https://github.com/stecman/symfony-console-completion.git";,
- "reference": "7bfa9b93e216896419f2f8de659935d7e04fecd8"
+ "reference": "a9502dab59405e275a9f264536c4e1cb61fc3518"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/stecman/symfony-console-completion/zipball/7bfa9b93e216896419f2f8de659935d7e04fecd8";,
- "reference": "7bfa9b93e216896419f2f8de659935d7e04fecd8",
+ "url":
"https://api.github.com/repos/stecman/symfony-console-completion/zipball/a9502dab59405e275a9f264536c4e1cb61fc3518";,
+ "reference": "a9502dab59405e275a9f264536c4e1cb61fc3518",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
- "symfony/console": "~2.3 || ~3.0 || ~4.0"
+ "symfony/console": "~2.3 || ~3.0 || ~4.0 || ~5.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8.36 || ~5.7 || ~6.4"
@@ -1016,9 +1016,9 @@
"description": "Automatic BASH completion for Symfony Console
Component based applications.",
"support": {
"issues":
"https://github.com/stecman/symfony-console-completion/issues";,
- "source":
"https://github.com/stecman/symfony-console-completion/tree/fix_options_before_command_name";
+ "source":
"https://github.com/stecman/symfony-console-completion/tree/0.11.0";
},
- "time": "2019-04-29T03:20:18+00:00"
+ "time": "2019-11-24T17:03:06+00:00"
},
{
"name": "symfony/config",
@@ -2258,16 +2258,16 @@
},
{
"name": "drush/drush",
- "version": "8.4.5",
+ "version": "8.4.6",
"source": {
"type": "git",
"url": "https://github.com/drush-ops/drush.git";,
- "reference": "29ab4fc41e6b516abc34b8dc477b3039fb5c0e96"
+ "reference": "4e48e11d7fe858eebe6c2fad71650c977d3f8900"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/drush-ops/drush/zipball/29ab4fc41e6b516abc34b8dc477b3039fb5c0e96";,
- "reference": "29ab4fc41e6b516abc34b8dc477b3039fb5c0e96",
+ "url":
"https://api.github.com/repos/drush-ops/drush/zipball/4e48e11d7fe858eebe6c2fad71650c977d3f8900";,
+ "reference": "4e48e11d7fe858eebe6c2fad71650c977d3f8900",
"shasum": ""
},
"require": {
@@ -2372,7 +2372,7 @@
"forum":
"http://drupal.stackexchange.com/questions/tagged/drush";,
"irc": "irc://irc.freenode.org/drush",
"issues": "https://github.com/drush-ops/drush/issues";,
- "source": "https://github.com/drush-ops/drush/tree/8.4.5";
+ "source": "https://github.com/drush-ops/drush/tree/8.4.6";
},
"funding": [
{
@@ -2380,7 +2380,7 @@
"type": "github"
}
],
- "time": "2020-10-01T00:23:28+00:00"
+ "time": "2021-02-01T15:34:47+00:00"
},
{
"name": "nikic/php-parser",
@@ -3132,16 +3132,16 @@
},
{
"name": "psy/psysh",
- "version": "v0.10.5",
+ "version": "v0.10.6",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git";,
- "reference": "7c710551d4a2653afa259c544508dc18a9098956"
+ "reference": "6f990c19f91729de8b31e639d6e204ea59f19cf3"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/bobthecow/psysh/zipball/7c710551d4a2653afa259c544508dc18a9098956";,
- "reference": "7c710551d4a2653afa259c544508dc18a9098956",
+ "url":
"https://api.github.com/repos/bobthecow/psysh/zipball/6f990c19f91729de8b31e639d6e204ea59f19cf3";,
+ "reference": "6f990c19f91729de8b31e639d6e204ea59f19cf3",
"shasum": ""
},
"require": {
@@ -3170,7 +3170,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "0.10.x-dev"
+ "dev-main": "0.10.x-dev"
}
},
"autoload": {
@@ -3202,9 +3202,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues";,
- "source": "https://github.com/bobthecow/psysh/tree/v0.10.5";
+ "source": "https://github.com/bobthecow/psysh/tree/v0.10.6";
},
- "time": "2020-12-04T02:51:30+00:00"
+ "time": "2021-01-18T15:53:43+00:00"
},
{
"name": "sebastian/comparator",
@@ -3736,12 +3736,12 @@
"version": "1.9.1",
"source": {
"type": "git",
- "url": "https://github.com/webmozart/assert.git";,
+ "url": "https://github.com/webmozarts/assert.git";,
"reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389";,
+ "url":
"https://api.github.com/repos/webmozarts/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389";,
"reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
"shasum": ""
},
@@ -3779,8 +3779,8 @@
"validate"
],
"support": {
- "issues": "https://github.com/webmozart/assert/issues";,
- "source": "https://github.com/webmozart/assert/tree/master";
+ "issues": "https://github.com/webmozarts/assert/issues";,
+ "source": "https://github.com/webmozarts/assert/tree/1.9.1";
},
"time": "2020-07-08T17:02:28+00:00"
},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.64.4/config.yaml
new/platformsh-cli-3.65.2/config.yaml
--- old/platformsh-cli-3.64.4/config.yaml 2020-12-22 23:13:15.000000000
+0100
+++ new/platformsh-cli-3.65.2/config.yaml 2021-02-16 21:33:37.000000000
+0100
@@ -94,7 +94,7 @@
api_token_help_url:
'https://docs.platform.sh/gettingstarted/cli/api-tokens.html'
available_regions:
- eu-2.platform.sh
- - us-2.platform.sh
+ - us-3.platform.sh
- au.platform.sh
- ca-1.platform.sh
available_plans:
@@ -111,6 +111,9 @@
environments_ttl: 120
users_ttl: 600
+ # The default timeout for API requests, in seconds.
+ default_timeout: 30
+
# Disable the docker-credential-helpers credential storage.
disable_credential_helpers: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.64.4/dist/installer.php
new/platformsh-cli-3.65.2/dist/installer.php
--- old/platformsh-cli-3.64.4/dist/installer.php 2020-12-22
23:13:15.000000000 +0100
+++ new/platformsh-cli-3.65.2/dist/installer.php 2021-02-16
21:33:37.000000000 +0100
@@ -590,7 +590,7 @@
],
];
if ($proxy = $this->getProxy()) {
- $opts['http']['proxy'] = $proxy;
+ $opts['http']['proxy'] = str_replace(['http://', 'https://'],
['tcp://', 'ssl://'], $proxy);
}
if ($this->flagEnabled('insecure')) {
$opts['ssl']['verify_peer'] = false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.64.4/dist/manifest.json
new/platformsh-cli-3.65.2/dist/manifest.json
--- old/platformsh-cli-3.64.4/dist/manifest.json 2020-12-22
23:13:15.000000000 +0100
+++ new/platformsh-cli-3.65.2/dist/manifest.json 2021-02-16
21:33:37.000000000 +0100
@@ -17,10 +17,10 @@
},
{
"name": "platform.phar",
- "sha1": "86823118792a1cf6342ce419a50d49c3b704f7f4",
- "sha256":
"b497f7ff838ce7b84aa9b5d44f7082d8c270066da0c145129093e5d95225ff3f",
- "url":
"https://github.com/platformsh/platformsh-cli/releases/download/v3.64.4/platform.phar";,
- "version": "3.64.4",
+ "sha1": "3a879d60df584e9ea66551ca3148d1443758efd5",
+ "sha256":
"88b1bf5ec1242b9d88c179281e599f48798f759342cbb1ac4b9cba25cf3a0fd1",
+ "url":
"https://github.com/platformsh/platformsh-cli/releases/download/v3.65.2/platform.phar";,
+ "version": "3.65.2",
"php": {
"min": "5.5.9"
},
@@ -311,9 +311,9 @@
"hide from": "3.64.0"
},
{
- "notes": "* Include SSH options for all calls to Git.\n
Some non-obvious commands such as `environment:delete --merged` were not
adapted\n for SSH certificates (\"Keyless SSH\") because they did not invoke
Git in the\n right way. This commit ensures that any Git commands that need
SSH (any \"online\"\n commands) will still work with SSH certificates (even
without any adaptations to\n `$HOME/.ssh/config`).\n* Fix loading backups
choices in backup:restore command.\n (The `result` API filter cannot
currently be combined with others)\n* Fix drush alias command for Enterprise
projects.",
- "show from": "3.64.2",
- "hide from": "3.64.3"
+ "notes": "New features:\n\n* Add --format=plain option for
table commands. This produces TSV-like output, \n but with no quoting or
escaping, to make most output easier to process with \n basic command-line
tools such as cut and grep. Literal tabs and newlines are \n replaced by a
space.\n\nOther changes:\n\n* Rename the backup --unsafe option to --live\n
(This tones down the warning level on making such a backup)\n* Remove the
restriction on deleting the main environment\n* Remove us-2 from available
region examples",
+ "show from": "3.64.0",
+ "hide from": "3.65.0"
}
]
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.64.4/src/Command/Activity/ActivityListCommand.php
new/platformsh-cli-3.65.2/src/Command/Activity/ActivityListCommand.php
--- old/platformsh-cli-3.64.4/src/Command/Activity/ActivityListCommand.php
2020-12-22 23:13:15.000000000 +0100
+++ new/platformsh-cli-3.65.2/src/Command/Activity/ActivityListCommand.php
2021-02-16 21:33:37.000000000 +0100
@@ -36,7 +36,7 @@
->addExample('List all recent activities for the current
project', '--all')
->addExample('List recent pushes', '--type environment.push')
->addExample('List pushes made before 15 March', '--type
environment.push --start 2015-03-15')
- ->addExample('List up to 25 incomplete activities', '--count 25
--state pending --state in_progress');
+ ->addExample('List up to 25 incomplete activities', '--limit 25
-i');
}
protected function execute(InputInterface $input, OutputInterface $output)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.64.4/src/Command/Backup/BackupCreateCommand.php
new/platformsh-cli-3.65.2/src/Command/Backup/BackupCreateCommand.php
--- old/platformsh-cli-3.64.4/src/Command/Backup/BackupCreateCommand.php
2020-12-22 23:13:15.000000000 +0100
+++ new/platformsh-cli-3.65.2/src/Command/Backup/BackupCreateCommand.php
2021-02-16 21:33:37.000000000 +0100
@@ -17,22 +17,24 @@
->setAliases(['backup'])
->setDescription('Make a backup of an environment')
->addArgument('environment', InputArgument::OPTIONAL, 'The
environment')
- ->addOption('unsafe', null, InputOption::VALUE_NONE,
- 'Unsafe backup: do not stop the environment.'
+ ->addOption('live', null, InputOption::VALUE_NONE,
+ 'Live backup: do not stop the environment.'
. "\n" . 'If set, this leaves the environment running and open
to connections during the backup.'
. "\n" . 'This reduces downtime, at the risk of backing up
data in an inconsistent state.'
);
$this->addProjectOption()
->addEnvironmentOption()
->addWaitOptions();
+ $this->addOption('unsafe', null, InputOption::VALUE_NONE, 'Deprecated
option: use --live instead');
$this->setHiddenAliases(['snapshot:create', 'environment:backup']);
$this->addExample('Make a backup of the current environment');
$this->addExample('Request a backup (and exit quickly)', '--no-wait');
- $this->addExample('Make a backup, avoiding downtime (but risking
inconsistency)', '--unsafe');
+ $this->addExample('Make a backup avoiding downtime (but risking
inconsistency)', '--live');
}
protected function execute(InputInterface $input, OutputInterface $output)
{
+ $this->warnAboutDeprecatedOptions(['unsafe']);
$this->validateInput($input);
$selectedEnvironment = $this->getSelectedEnvironment();
@@ -60,10 +62,12 @@
return 1;
}
- $activity = $selectedEnvironment->backup((bool)
$input->getOption('unsafe'));
+ $live = $input->getOption('live') || $input->getOption('unsafe');
- if ($input->getOption('unsafe')) {
- $this->stdErr->writeln("Creating an <comment>unsafe</comment>
backup of <info>$environmentId</info>");
+ $activity = $selectedEnvironment->backup($live);
+
+ if ($live) {
+ $this->stdErr->writeln("Creating a <info>live</info> backup of
<info>$environmentId</info>");
} else {
$this->stdErr->writeln("Creating a backup of
<info>$environmentId</info>");
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.64.4/src/Command/Environment/EnvironmentDeleteCommand.php
new/platformsh-cli-3.65.2/src/Command/Environment/EnvironmentDeleteCommand.php
---
old/platformsh-cli-3.64.4/src/Command/Environment/EnvironmentDeleteCommand.php
2020-12-22 23:13:15.000000000 +0100
+++
new/platformsh-cli-3.65.2/src/Command/Environment/EnvironmentDeleteCommand.php
2021-02-16 21:33:37.000000000 +0100
@@ -182,11 +182,6 @@
$questionHelper = $this->getService('question_helper');
foreach ($environments as $environment) {
$environmentId = $environment->id;
- if ($environment->is_main) {
- $output->writeln("The main environment cannot be deleted.");
- $error = true;
- continue;
- }
// Check that the environment does not have children.
// @todo remove this check when Platform's behavior is fixed
foreach
($this->api()->getEnvironments($this->getSelectedProject()) as $potentialChild)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.64.4/src/Command/Environment/EnvironmentHttpAccessCommand.php
new/platformsh-cli-3.65.2/src/Command/Environment/EnvironmentHttpAccessCommand.php
---
old/platformsh-cli-3.64.4/src/Command/Environment/EnvironmentHttpAccessCommand.php
2020-12-22 23:13:15.000000000 +0100
+++
new/platformsh-cli-3.65.2/src/Command/Environment/EnvironmentHttpAccessCommand.php
2021-02-16 21:33:37.000000000 +0100
@@ -59,7 +59,7 @@
throw new InvalidArgumentException($message);
}
- if (!preg_match('#^[a-zA-Z0-9]{2,}$#', $parts[0])) {
+ if (!preg_match('#^[a-zA-Z0-9-_]{2,}$#', $parts[0])) {
$message = sprintf('The username "<error>%s</error>" for --auth is
not valid', $parts[0]);
throw new InvalidArgumentException($message);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.64.4/src/Command/Environment/EnvironmentListCommand.php
new/platformsh-cli-3.65.2/src/Command/Environment/EnvironmentListCommand.php
---
old/platformsh-cli-3.64.4/src/Command/Environment/EnvironmentListCommand.php
2020-12-22 23:13:15.000000000 +0100
+++
new/platformsh-cli-3.65.2/src/Command/Environment/EnvironmentListCommand.php
2021-02-16 21:33:37.000000000 +0100
@@ -89,7 +89,7 @@
// Format the environment ID.
$id = $environment->id;
if ($indent) {
- $id = str_repeat(' ', $indentAmount) . $id;
+ $id = str_repeat(' ', $indentAmount) . $id;
}
// Add an indicator for the current environment.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.64.4/src/Command/Integration/IntegrationAddCommand.php
new/platformsh-cli-3.65.2/src/Command/Integration/IntegrationAddCommand.php
--- old/platformsh-cli-3.64.4/src/Command/Integration/IntegrationAddCommand.php
2020-12-22 23:13:15.000000000 +0100
+++ new/platformsh-cli-3.65.2/src/Command/Integration/IntegrationAddCommand.php
2021-02-16 21:33:37.000000000 +0100
@@ -88,7 +88,7 @@
/** @var Integration $integration */
$integration = $result->getEntity();
- $this->ensureHooks($integration);
+ $this->ensureHooks($integration, $values);
$this->stdErr->writeln("Created integration
<info>$integration->id</info> (type: {$values['type']})");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.64.4/src/Command/Integration/IntegrationCommandBase.php
new/platformsh-cli-3.65.2/src/Command/Integration/IntegrationCommandBase.php
---
old/platformsh-cli-3.64.4/src/Command/Integration/IntegrationCommandBase.php
2020-12-22 23:13:15.000000000 +0100
+++
new/platformsh-cli-3.65.2/src/Command/Integration/IntegrationCommandBase.php
2021-02-16 21:33:37.000000000 +0100
@@ -422,18 +422,25 @@
}
/**
+ * Attempts to ensures webhooks are installed for an integration.
+ *
* @param \Platformsh\Client\Model\Integration $integration
+ * The integration as returned in the API.
+ * @param array $creationValues
+ * Values used to create the integration, if the integration was just
+ * created. This is required when the integration includes a secret (an
+ * API token or app credentials) that is hidden in its API
+ * representation.
*/
- protected function ensureHooks(Integration $integration)
+ protected function ensureHooks(Integration $integration, array
$creationValues = [])
{
-
- if ($integration->type === 'github' &&
$integration->hasProperty('token')) {
+ if ($integration->type === 'github' &&
($integration->hasProperty('token') || isset($creationValues['token']))) {
$hooksApiUrl = sprintf('https://api.github.com/repos/%s/hooks',
$integration->getProperty('repository'));
$requestOptions = [
'auth' => false,
'headers' => [
'Accept' => 'application/vnd.github.v3+json',
- 'Authorization' => 'token ' .
$integration->getProperty('token'),
+ 'Authorization' => 'token ' .
(isset($creationValues['token']) ? $creationValues['token'] :
$integration->getProperty('token')),
],
];
$payload = [
@@ -446,14 +453,14 @@
'active' => true,
];
$repoName = $integration->getProperty('repository');
- } elseif ($integration->type === 'gitlab' &&
$integration->hasProperty('token')) {
+ } elseif ($integration->type === 'gitlab' &&
($integration->hasProperty('token') || isset($creationValues['token']))) {
$baseUrl = rtrim($integration->getProperty('base_url'), '/');
$hooksApiUrl = sprintf('%s/api/v4/projects/%s/hooks', $baseUrl,
rawurlencode($integration->getProperty('project')));
$requestOptions = [
'auth' => false,
'headers' => [
'Accept' => 'application/json',
- 'Private-Token' => $integration->getProperty('token'),
+ 'Private-Token' => isset($creationValues['token']) ?
$creationValues['token'] : $integration->getProperty('token'),
],
];
$payload = [
@@ -462,8 +469,8 @@
'merge_requests_events' => true,
];
$repoName = $baseUrl . '/' . $integration->getProperty('project');
- } elseif ($integration->type === 'bitbucket' &&
$integration->hasProperty('app_credentials')) {
- $appCredentials = $integration->getProperty('app_credentials');
+ } elseif ($integration->type === 'bitbucket' &&
(isset($creationValues['app_credentials']) ||
$integration->hasProperty('app_credentials'))) {
+ $appCredentials = isset($creationValues['app_credentials']) ?
$creationValues['app_credentials'] :
$integration->getProperty('app_credentials');
$result = $this->validateBitbucketCredentials($appCredentials);
if ($result !== true) {
$this->stdErr->writeln($result);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.64.4/src/Command/Self/SelfReleaseCommand.php
new/platformsh-cli-3.65.2/src/Command/Self/SelfReleaseCommand.php
--- old/platformsh-cli-3.64.4/src/Command/Self/SelfReleaseCommand.php
2020-12-22 23:13:15.000000000 +0100
+++ new/platformsh-cli-3.65.2/src/Command/Self/SelfReleaseCommand.php
2021-02-16 21:33:37.000000000 +0100
@@ -77,7 +77,13 @@
if (getenv('GITHUB_TOKEN')) {
$gitHubToken = getenv('GITHUB_TOKEN');
} else {
- $this->stdErr->writeln('The GITHUB_TOKEN environment variable must
be set');
+ $this->stdErr->writeln('The GITHUB_TOKEN environment variable must
be set.');
+ $this->stdErr->writeln(
+ "\nIf you have the GitHub CLI installed (gh,
https://github.com/cli/cli), and if you're signed in, you can set the token by
running:"
+ );
+ $this->stdErr->writeln(
+ " export GITHUB_TOKEN=$(gh auth status --show-token 2>&1 |
grep Token: | cut -d' ' -f5)"
+ );
return 1;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.64.4/src/SelfUpdate/ManifestStrategy.php
new/platformsh-cli-3.65.2/src/SelfUpdate/ManifestStrategy.php
--- old/platformsh-cli-3.64.4/src/SelfUpdate/ManifestStrategy.php
2020-12-22 23:13:15.000000000 +0100
+++ new/platformsh-cli-3.65.2/src/SelfUpdate/ManifestStrategy.php
2021-02-16 21:33:37.000000000 +0100
@@ -141,8 +141,15 @@
{
$versionInfo = $this->getRemoteVersionInfo($updater);
+ // A relative download URL is treated as relative to the manifest URL.
+ $url = $versionInfo['url'];
+ if (strpos($url, '//') === false && strpos($this->manifestUrl, '//')
!== false) {
+ $removePath = parse_url($this->manifestUrl, PHP_URL_PATH);
+ $url = str_replace($removePath, '/' . ltrim($url, '/'),
$this->manifestUrl);
+ }
+
$context = stream_context_create(['http' => ['timeout' =>
$this->downloadTimeout]]);
- $fileContents = file_get_contents($versionInfo['url'], false,
$context);
+ $fileContents = file_get_contents($url, false, $context);
if ($fileContents === false) {
throw new HttpRequestException(sprintf('Failed to download file
from URL: %s', $versionInfo['url']));
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/platformsh-cli-3.64.4/src/Service/ActivityMonitor.php
new/platformsh-cli-3.65.2/src/Service/ActivityMonitor.php
--- old/platformsh-cli-3.64.4/src/Service/ActivityMonitor.php 2020-12-22
23:13:15.000000000 +0100
+++ new/platformsh-cli-3.65.2/src/Service/ActivityMonitor.php 2021-02-16
21:33:37.000000000 +0100
@@ -197,6 +197,12 @@
* @return bool
*/
private function canRead($stream, $microseconds) {
+ if (PHP_MAJOR_VERSION >= 8) {
+ // Work around a bug: "Cannot cast a filtered stream on this
system" which throws a ValueError in PHP 8+.
+ // See
https://github.com/platformsh/platformsh-cli/issues/1027#issuecomment-779170913
+ \usleep($microseconds);
+ return true;
+ }
$readSet = [$stream];
$ignore = [];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.64.4/src/Service/Api.php
new/platformsh-cli-3.65.2/src/Service/Api.php
--- old/platformsh-cli-3.64.4/src/Service/Api.php 2020-12-22
23:13:15.000000000 +0100
+++ new/platformsh-cli-3.65.2/src/Service/Api.php 2021-02-16
21:33:37.000000000 +0100
@@ -263,6 +263,7 @@
$connectorOptions['debug'] = $this->config->get('api.debug') ? STDERR
: false;
$connectorOptions['client_id'] =
$this->config->get('api.oauth2_client_id');
$connectorOptions['user_agent'] = $this->getUserAgent();
+ $connectorOptions['timeout'] =
$this->config->get('api.default_timeout');
if ($apiToken = $this->tokenConfig->getApiToken()) {
$connectorOptions['api_token'] = $apiToken;
@@ -372,6 +373,7 @@
'debug' => $this->config->get('api.debug') ? STDERR : false,
'verify' => !$this->config->get('api.skip_ssl'),
'proxy' => $this->getProxy(),
+ 'timeout' => $this->config->get('api.default_timeout'),
],
];
@@ -473,7 +475,7 @@
}
$proxies = [];
foreach (['https', 'http'] as $scheme) {
- $proxies[$scheme] = str_replace($scheme . '://', 'tcp://',
getenv($scheme . '_proxy'));
+ $proxies[$scheme] = str_replace(['http://', 'https://'],
['tcp://', 'ssl://'], getenv($scheme . '_proxy'));
}
$proxies = array_filter($proxies);
if (count($proxies)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.64.4/src/Service/Table.php
new/platformsh-cli-3.65.2/src/Service/Table.php
--- old/platformsh-cli-3.64.4/src/Service/Table.php 2020-12-22
23:13:15.000000000 +0100
+++ new/platformsh-cli-3.65.2/src/Service/Table.php 2021-02-16
21:33:37.000000000 +0100
@@ -4,6 +4,7 @@
use Platformsh\Cli\Console\AdaptiveTable;
use Platformsh\Cli\Util\Csv;
+use Platformsh\Cli\Util\PlainFormat;
use Symfony\Component\Console\Exception\InvalidArgumentException;
use Symfony\Component\Console\Input\InputDefinition;
use Symfony\Component\Console\Input\InputInterface;
@@ -50,7 +51,7 @@
*/
public static function configureInput(InputDefinition $definition)
{
- $description = 'The output format ("table", "csv", or "tsv")';
+ $description = 'The output format ("table", "csv", "tsv", or "plain")';
$option = new InputOption('format', null, InputOption::VALUE_REQUIRED,
$description, 'table');
$definition->addOption($option);
$description = 'Columns to display (comma-separated list, or multiple
values)';
@@ -108,13 +109,17 @@
$this->renderCsv($rows, $header, "\t");
break;
+ case 'plain':
+ $this->renderPlain($rows, $header);
+ break;
+
case null:
case 'table':
$this->renderTable($rows, $header);
break;
default:
- throw new InvalidArgumentException(sprintf('Invalid format:
%s', $format));
+ throw new InvalidArgumentException(sprintf('Invalid format:
"%s". Supported formats: table, csv, tsv, plain', $format));
}
}
@@ -127,7 +132,7 @@
*/
public function formatIsMachineReadable()
{
- return in_array($this->getFormat(), ['csv', 'tsv']);
+ return in_array($this->getFormat(), ['csv', 'tsv', 'plain']);
}
/**
@@ -231,6 +236,20 @@
}
/**
+ * Render plain, line-based output.
+ *
+ * @param array $rows
+ * @param array $header
+ */
+ protected function renderPlain(array $rows, array $header)
+ {
+ if (!empty($header)) {
+ array_unshift($rows, $header);
+ }
+ $this->output->write((new PlainFormat())->format($rows));
+ }
+
+ /**
* Render a Symfony Console table.
*
* @param array $rows
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.64.4/src/Util/Csv.php
new/platformsh-cli-3.65.2/src/Util/Csv.php
--- old/platformsh-cli-3.64.4/src/Util/Csv.php 2020-12-22 23:13:15.000000000
+0100
+++ new/platformsh-cli-3.65.2/src/Util/Csv.php 2021-02-16 21:33:37.000000000
+0100
@@ -62,7 +62,7 @@
*
* @return string
*/
- private function formatCell($cell)
+ protected function formatCell($cell)
{
// Cast cell data to a string.
$cell = (string) $cell;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.64.4/src/Util/PlainFormat.php
new/platformsh-cli-3.65.2/src/Util/PlainFormat.php
--- old/platformsh-cli-3.64.4/src/Util/PlainFormat.php 1970-01-01
01:00:00.000000000 +0100
+++ new/platformsh-cli-3.65.2/src/Util/PlainFormat.php 2021-02-16
21:33:37.000000000 +0100
@@ -0,0 +1,24 @@
+<?php
+
+namespace Platformsh\Cli\Util;
+
+/**
+ * A plain, line-based format intended for easy parsing on the command-line.
+ *
+ * This is similar to tab-separated values (TSV), but does not quote cells. It
+ * therefore cannot preserve newlines or tabs within cells.
+ */
+class PlainFormat extends Csv
+{
+ public function __construct() {
+ parent::__construct("\t", "\n");
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function formatCell($cell) {
+ // Replace any newline or tab characters with a space.
+ return \preg_replace('#[\r\n\t]+#', ' ', (string) $cell);
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/platformsh-cli-3.64.4/tests/Util/CsvTest.php
new/platformsh-cli-3.65.2/tests/Util/CsvTest.php
--- old/platformsh-cli-3.64.4/tests/Util/CsvTest.php 2020-12-22
23:13:15.000000000 +0100
+++ new/platformsh-cli-3.65.2/tests/Util/CsvTest.php 2021-02-16
21:33:37.000000000 +0100
@@ -3,6 +3,7 @@
namespace Platformsh\Cli\Tests\Util;
use Platformsh\Cli\Util\Csv;
+use Platformsh\Cli\Util\PlainFormat;
class CsvTest extends \PHPUnit_Framework_TestCase
{
@@ -42,4 +43,15 @@
$actual = (new Csv("\t", "\n"))->format($this->data, false);
$this->assertEquals($expected, $actual);
}
+
+ public function testPlain()
+ {
+ $expected = "Year\tMake\tModel\tDescription\tPrice\n"
+ . "1997\tFord\tE350\tac, abs, moon\t3000.00\n"
+ . "1999\tChevy\tVenture \"Extended Edition\"\t\t4900.00\n"
+ . "1999\tChevy\tVenture \"Extended Edition, Very
Large\"\t\t5000.00\n"
+ . "1996\tJeep\tGrand Cherokee\tMUST SELL! air, moon roof,
loaded\t4799.00";
+ $actual = (new PlainFormat())->format($this->data, false);
+ $this->assertEquals($expected, $actual);
+ }
}
++++++ platformsh-cli-vendor.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/autoload.php new/vendor/autoload.php
--- old/vendor/autoload.php 2020-12-22 23:30:24.750704506 +0100
+++ new/vendor/autoload.php 2021-02-17 04:43:02.994305714 +0100
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit6e2b3f4083e48bb1922cf457a8c7a86b::getLoader();
+return ComposerAutoloaderInitb2c6d6ef2e3381227ebf575ed7bda3b8::getLoader();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/composer/autoload_real.php
new/vendor/composer/autoload_real.php
--- old/vendor/composer/autoload_real.php 2020-12-22 23:30:24.750704506
+0100
+++ new/vendor/composer/autoload_real.php 2021-02-17 04:43:02.994305714
+0100
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit6e2b3f4083e48bb1922cf457a8c7a86b
+class ComposerAutoloaderInitb2c6d6ef2e3381227ebf575ed7bda3b8
{
private static $loader;
@@ -22,15 +22,15 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInit6e2b3f4083e48bb1922cf457a8c7a86b',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInitb2c6d6ef2e3381227ebf575ed7bda3b8',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInit6e2b3f4083e48bb1922cf457a8c7a86b',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInitb2c6d6ef2e3381227ebf575ed7bda3b8',
'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION')
&& (!function_exists('zend_loader_file_encoded') ||
!zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
-
call_user_func(\Composer\Autoload\ComposerStaticInit6e2b3f4083e48bb1922cf457a8c7a86b::getInitializer($loader));
+
call_user_func(\Composer\Autoload\ComposerStaticInitb2c6d6ef2e3381227ebf575ed7bda3b8::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -51,19 +51,19 @@
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles =
Composer\Autoload\ComposerStaticInit6e2b3f4083e48bb1922cf457a8c7a86b::$files;
+ $includeFiles =
Composer\Autoload\ComposerStaticInitb2c6d6ef2e3381227ebf575ed7bda3b8::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire6e2b3f4083e48bb1922cf457a8c7a86b($fileIdentifier,
$file);
+ composerRequireb2c6d6ef2e3381227ebf575ed7bda3b8($fileIdentifier,
$file);
}
return $loader;
}
}
-function composerRequire6e2b3f4083e48bb1922cf457a8c7a86b($fileIdentifier,
$file)
+function composerRequireb2c6d6ef2e3381227ebf575ed7bda3b8($fileIdentifier,
$file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/composer/autoload_static.php
new/vendor/composer/autoload_static.php
--- old/vendor/composer/autoload_static.php 2020-12-22 23:30:24.750704506
+0100
+++ new/vendor/composer/autoload_static.php 2021-02-17 04:43:02.994305714
+0100
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit6e2b3f4083e48bb1922cf457a8c7a86b
+class ComposerStaticInitb2c6d6ef2e3381227ebf575ed7bda3b8
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' .
'/symfony/polyfill-ctype/bootstrap.php',
@@ -193,9 +193,9 @@
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 =
ComposerStaticInit6e2b3f4083e48bb1922cf457a8c7a86b::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 =
ComposerStaticInit6e2b3f4083e48bb1922cf457a8c7a86b::$prefixDirsPsr4;
- $loader->classMap =
ComposerStaticInit6e2b3f4083e48bb1922cf457a8c7a86b::$classMap;
+ $loader->prefixLengthsPsr4 =
ComposerStaticInitb2c6d6ef2e3381227ebf575ed7bda3b8::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 =
ComposerStaticInitb2c6d6ef2e3381227ebf575ed7bda3b8::$prefixDirsPsr4;
+ $loader->classMap =
ComposerStaticInitb2c6d6ef2e3381227ebf575ed7bda3b8::$classMap;
}, null, ClassLoader::class);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/composer/installed.json
new/vendor/composer/installed.json
--- old/vendor/composer/installed.json 2020-12-22 23:30:24.314700931 +0100
+++ new/vendor/composer/installed.json 2021-02-17 04:43:02.570302221 +0100
@@ -747,17 +747,17 @@
},
{
"name": "platformsh/client",
- "version": "0.41.0",
- "version_normalized": "0.41.0.0",
+ "version": "0.41.1",
+ "version_normalized": "0.41.1.0",
"source": {
"type": "git",
"url": "https://github.com/platformsh/platformsh-client-php.git";,
- "reference": "e681a5ad20c695ad728fbe14f965c92eb7e6578b"
+ "reference": "5be54c7f64de23fe2ce7f2d391fed72edbf88af3"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/platformsh/platformsh-client-php/zipball/e681a5ad20c695ad728fbe14f965c92eb7e6578b";,
- "reference": "e681a5ad20c695ad728fbe14f965c92eb7e6578b",
+ "url":
"https://api.github.com/repos/platformsh/platformsh-client-php/zipball/5be54c7f64de23fe2ce7f2d391fed72edbf88af3";,
+ "reference": "5be54c7f64de23fe2ce7f2d391fed72edbf88af3",
"shasum": ""
},
"require": {
@@ -771,7 +771,7 @@
"require-dev": {
"phpunit/phpunit": "~4.5"
},
- "time": "2020-12-12T12:52:56+00:00",
+ "time": "2021-02-05T20:42:39+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -791,7 +791,7 @@
"description": "Platform.sh API client",
"support": {
"issues":
"https://github.com/platformsh/platformsh-client-php/issues";,
- "source":
"https://github.com/platformsh/platformsh-client-php/tree/0.41.0";
+ "source":
"https://github.com/platformsh/platformsh-client-php/tree/0.41.1";
}
},
{
@@ -1000,27 +1000,27 @@
},
{
"name": "stecman/symfony-console-completion",
- "version": "0.10.1",
- "version_normalized": "0.10.1.0",
+ "version": "0.11.0",
+ "version_normalized": "0.11.0.0",
"source": {
"type": "git",
"url": "https://github.com/stecman/symfony-console-completion.git";,
- "reference": "7bfa9b93e216896419f2f8de659935d7e04fecd8"
+ "reference": "a9502dab59405e275a9f264536c4e1cb61fc3518"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/stecman/symfony-console-completion/zipball/7bfa9b93e216896419f2f8de659935d7e04fecd8";,
- "reference": "7bfa9b93e216896419f2f8de659935d7e04fecd8",
+ "url":
"https://api.github.com/repos/stecman/symfony-console-completion/zipball/a9502dab59405e275a9f264536c4e1cb61fc3518";,
+ "reference": "a9502dab59405e275a9f264536c4e1cb61fc3518",
"shasum": ""
},
"require": {
"php": ">=5.3.2",
- "symfony/console": "~2.3 || ~3.0 || ~4.0"
+ "symfony/console": "~2.3 || ~3.0 || ~4.0 || ~5.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8.36 || ~5.7 || ~6.4"
},
- "time": "2019-04-29T03:20:18+00:00",
+ "time": "2019-11-24T17:03:06+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -1046,7 +1046,7 @@
"description": "Automatic BASH completion for Symfony Console
Component based applications.",
"support": {
"issues":
"https://github.com/stecman/symfony-console-completion/issues";,
- "source":
"https://github.com/stecman/symfony-console-completion/tree/fix_options_before_command_name";
+ "source":
"https://github.com/stecman/symfony-console-completion/tree/0.11.0";
}
},
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/platformsh/client/src/Connection/Connector.php
new/vendor/platformsh/client/src/Connection/Connector.php
--- old/vendor/platformsh/client/src/Connection/Connector.php 2020-12-12
13:52:56.000000000 +0100
+++ new/vendor/platformsh/client/src/Connection/Connector.php 2021-02-05
21:42:39.000000000 +0100
@@ -51,6 +51,10 @@
* - proxy (array|string): A proxy setting, passed to Guzzle directly.
* Use a string to specify an HTTP proxy, or an array to specify
* different proxies for different protocols.
+ * - timeout (float): The default request timeout for any request, in
+ * seconds (default: 60).
+ * - connect_timeout (float): The default connection timeout for any
+ * request, in seconds (default: 60).
* - on_refresh_error: A callback to run when a refresh token error is
* received. It will be passed a Guzzle BadResponseException, and
* should return an AccessToken or null.
@@ -75,6 +79,8 @@
'token_url' => 'https://auth.api.platform.sh/oauth2/token',
'certifier_url' => 'https://ssh.api.platform.sh',
'proxy' => null,
+ 'timeout' => 60.0,
+ 'connect_timeout' => 60.0,
'api_token' => null,
'api_token_type' => 'access',
'gzip' => extension_loaded('zlib'),
@@ -335,6 +341,8 @@
'debug' => $this->config['debug'],
'verify' => $this->config['verify'],
'proxy' => $this->config['proxy'],
+ 'timeout' => $this->config['timeout'],
+ 'connect_timeout' => $this->config['connect_timeout'],
],
];
$oauth2Client = $this->getOauth2Client($options);
@@ -432,6 +440,8 @@
'debug' => $this->config['debug'],
'verify' => $this->config['verify'],
'proxy' => $this->config['proxy'],
+ 'timeout' => $this->config['timeout'],
+ 'connect_timeout' => $this->config['connect_timeout'],
'subscribers' => [$oauth2],
'auth' => 'oauth2',
],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/stecman/symfony-console-completion/composer.json
new/vendor/stecman/symfony-console-completion/composer.json
--- old/vendor/stecman/symfony-console-completion/composer.json 2019-04-29
05:20:18.000000000 +0200
+++ new/vendor/stecman/symfony-console-completion/composer.json 2019-11-24
18:03:06.000000000 +0100
@@ -10,7 +10,7 @@
],
"require": {
"php": ">=5.3.2",
- "symfony/console": "~2.3 || ~3.0 || ~4.0"
+ "symfony/console": "~2.3 || ~3.0 || ~4.0 || ~5.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8.36 || ~5.7 || ~6.4"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/stecman/symfony-console-completion/src/CompletionCommand.php
new/vendor/stecman/symfony-console-completion/src/CompletionCommand.php
--- old/vendor/stecman/symfony-console-completion/src/CompletionCommand.php
2019-04-29 05:20:18.000000000 +0200
+++ new/vendor/stecman/symfony-console-completion/src/CompletionCommand.php
2019-11-24 18:03:06.000000000 +0100
@@ -134,6 +134,8 @@
$output->write($results, true);
}
+
+ return 0;
}
/**
