Hello community, here is the log from the commit of package platformsh-cli for openSUSE:Factory checked in at 2019-10-21 12:28:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old) and /work/SRC/openSUSE:Factory/.platformsh-cli.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "platformsh-cli" Mon Oct 21 12:28:03 2019 rev:83 rq:738636 version:3.49.1 Changes: -------- --- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes 2019-10-09 15:19:47.828445756 +0200 +++ /work/SRC/openSUSE:Factory/.platformsh-cli.new.2352/platformsh-cli.changes 2019-10-21 12:28:08.063942584 +0200 @@ -1,0 +2,12 @@ +Tue Oct 15 14:36:08 UTC 2019 - [email protected] + +- Update to version 3.49.1: + * Release v3.49.1 + * Update client library to include the client ID when revoking tokens + * Support legacy API tokens in the stream context + * Reset account info cache after adding or deleting an SSH key + * Get the access token using form URL-encoded data not JSON, in browser login command + * Allow overriding the OAuth 2.0 endpoint URLs + * Fix argument escaping in drush command + +------------------------------------------------------------------- Old: ---- platformsh-cli-3.49.0.tar.xz New: ---- platformsh-cli-3.49.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ platformsh-cli.spec ++++++ --- /var/tmp/diff_new_pack.W3rebO/_old 2019-10-21 12:28:08.763943378 +0200 +++ /var/tmp/diff_new_pack.W3rebO/_new 2019-10-21 12:28:08.767943382 +0200 @@ -17,7 +17,7 @@ Name: platformsh-cli -Version: 3.49.0 +Version: 3.49.1 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.W3rebO/_old 2019-10-21 12:28:08.807943428 +0200 +++ /var/tmp/diff_new_pack.W3rebO/_new 2019-10-21 12:28:08.811943432 +0200 @@ -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.49.0</param> + <param name="revision">refs/tags/v3.49.1</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.W3rebO/_old 2019-10-21 12:28:08.827943450 +0200 +++ /var/tmp/diff_new_pack.W3rebO/_new 2019-10-21 12:28:08.827943450 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/platformsh/platformsh-cli.git</param> - <param name="changesrevision">0fd5589f730fd0b1bc96bf4223e153681966c057</param> + <param name="changesrevision">8540e6fb67ad2877e0cd4381cfdcd4399fb1d9c1</param> </service> </servicedata> ++++++ licenses.txt ++++++ --- /var/tmp/diff_new_pack.W3rebO/_old 2019-10-21 12:28:08.859943486 +0200 +++ /var/tmp/diff_new_pack.W3rebO/_new 2019-10-21 12:28:08.859943486 +0200 @@ -16,7 +16,7 @@ padraic/phar-updater v1.0.6 BSD-3-Clause paragonie/random_compat v2.0.18 MIT pjcdawkins/guzzle-oauth2-plugin v2.2.0 MIT -platformsh/client v0.30.0 MIT +platformsh/client v0.30.2 MIT platformsh/console-form v0.0.23 MIT psr/container 1.0.0 MIT psr/log 1.1.0 MIT ++++++ platformsh-cli-3.49.0.tar.xz -> platformsh-cli-3.49.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.49.0/composer.json new/platformsh-cli-3.49.1/composer.json --- old/platformsh-cli-3.49.0/composer.json 2019-10-08 19:57:59.000000000 +0200 +++ new/platformsh-cli-3.49.1/composer.json 2019-10-12 14:16:45.000000000 +0200 @@ -8,7 +8,7 @@ "guzzlehttp/guzzle": "^5.3", "guzzlehttp/ringphp": "^1.1", "platformsh/console-form": ">=0.0.22 <2.0", - "platformsh/client": ">=0.30.0 <2.0", + "platformsh/client": ">=0.30.2 <2.0", "symfony/console": "^3.0 >=3.2", "symfony/yaml": "^3.0 || ^2.6", "symfony/finder": "^3.0", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.49.0/composer.lock new/platformsh-cli-3.49.1/composer.lock --- old/platformsh-cli-3.49.0/composer.lock 2019-10-08 19:57:59.000000000 +0200 +++ new/platformsh-cli-3.49.1/composer.lock 2019-10-12 14:16:45.000000000 +0200 @@ -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": "19951cf45dd8fca5a8ee83524fce8cc5", + "content-hash": "39062d5311d32347acfbbbf657ae23e3", "packages": [ { "name": "cocur/slugify", @@ -663,16 +663,16 @@ }, { "name": "platformsh/client", - "version": "v0.30.0", + "version": "v0.30.2", "source": { "type": "git", "url": "https://github.com/platformsh/platformsh-client-php.git";, - "reference": "76c93c8e6f4c19089122a556d532f96f581efebf" + "reference": "603b80d638d138df11a95f73d478b3cedddfc7fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/76c93c8e6f4c19089122a556d532f96f581efebf";, - "reference": "76c93c8e6f4c19089122a556d532f96f581efebf", + "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/603b80d638d138df11a95f73d478b3cedddfc7fb";, + "reference": "603b80d638d138df11a95f73d478b3cedddfc7fb", "shasum": "" }, "require": { @@ -702,7 +702,7 @@ } ], "description": "Platform.sh API client", - "time": "2019-09-20T23:10:19+00:00" + "time": "2019-10-09T13:41:49+00:00" }, { "name": "platformsh/console-form", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.49.0/config.yaml new/platformsh-cli-3.49.1/config.yaml --- old/platformsh-cli-3.49.0/config.yaml 2019-10-08 19:57:59.000000000 +0200 +++ new/platformsh-cli-3.49.1/config.yaml 2019-10-12 14:16:45.000000000 +0200 @@ -92,6 +92,15 @@ # Overridden by {application.env_prefix}ACCOUNTS_API env var. accounts_api_url: 'https://accounts.platform.sh/api/platform/' + # Overridden by {application.env_prefix}OAUTH2_AUTH_URL env var. + oauth2_auth_url: 'https://accounts.platform.sh/oauth2/authorize' + + # Overridden by {application.env_prefix}OAUTH2_TOKEN_URL env var. + oauth2_token_url: 'https://accounts.platform.sh/oauth2/token' + + # Overridden by {application.env_prefix}OAUTH2_REVOKE_URL env var. + oauth2_revoke_url: 'https://accounts.platform.sh/oauth2/revoke' + # Overridden by {application.env_prefix}DEBUG env var. debug: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.49.0/dist/manifest.json new/platformsh-cli-3.49.1/dist/manifest.json --- old/platformsh-cli-3.49.0/dist/manifest.json 2019-10-08 19:57:59.000000000 +0200 +++ new/platformsh-cli-3.49.1/dist/manifest.json 2019-10-12 14:16:45.000000000 +0200 @@ -17,10 +17,10 @@ }, { "name": "platform.phar", - "sha1": "5be35ff708b0ae1561de298060d8ed0fc7b6dfd2", - "sha256": "7c09f9ee8041969af13b5c1f12145a10646e15923f7b4e2da22d295393f3a77e", - "url": "https://github.com/platformsh/platformsh-cli/releases/download/v3.49.0/platform.phar";, - "version": "3.49.0", + "sha1": "52c2e23f509ba1bfadc2a17da20c459cd23ad698", + "sha256": "602c6fb305b0c8620f1fcae8e6659c58dd163b8446aa3df614c22f332aed7b84", + "url": "https://github.com/platformsh/platformsh-cli/releases/download/v3.49.1/platform.phar";, + "version": "3.49.1", "php": { "min": "5.5.9" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.49.0/src/Command/Auth/BrowserLoginCommand.php new/platformsh-cli-3.49.1/src/Command/Auth/BrowserLoginCommand.php --- old/platformsh-cli-3.49.0/src/Command/Auth/BrowserLoginCommand.php 2019-10-08 19:57:59.000000000 +0200 +++ new/platformsh-cli-3.49.1/src/Command/Auth/BrowserLoginCommand.php 2019-10-12 14:16:45.000000000 +0200 @@ -123,16 +123,6 @@ } chmod($codeFile, 0600); - // Find the authorization and token URLs. - $apiUrl = $this->config()->get('api.accounts_api_url'); - $authHost = parse_url($apiUrl, PHP_URL_HOST); - $authScheme = parse_url($apiUrl, PHP_URL_SCHEME) ?: 'https'; - if (!$authHost) { - throw new \RuntimeException('Failed to get API host.'); - } - $authUrl = $authScheme . '://' . $authHost . '/oauth2/authorize'; - $tokenUrl = $authScheme . '://' . $authHost . '/oauth2/token'; - // Start the local server. $process = new Process([ (new PhpExecutableFinder())->find() ?: PHP_BINARY, @@ -145,7 +135,7 @@ $process->setEnv([ 'CLI_OAUTH_APP_NAME' => $this->config()->get('application.name'), 'CLI_OAUTH_STATE' => $this->getRandomState(), - 'CLI_OAUTH_AUTH_URL' => $authUrl, + 'CLI_OAUTH_AUTH_URL' => $this->config()->get('api.oauth2_auth_url'), 'CLI_OAUTH_CLIENT_ID' => $this->config()->get('api.oauth2_client_id'), 'CLI_OAUTH_FILE' => $codeFile, ]); @@ -214,7 +204,7 @@ // Using the authorization code, request an access token. $this->stdErr->writeln('Login information received. Verifying...'); - $token = $this->getAccessToken($code, $localUrl, $tokenUrl); + $token = $this->getAccessToken($code, $localUrl); // Finalize login: call logOut() on the old connector, clear the cache // and save the new credentials. @@ -282,16 +272,15 @@ * * @param string $authCode * @param string $redirectUri - * @param string $tokenUrl * * @return array */ - private function getAccessToken($authCode, $redirectUri, $tokenUrl) + private function getAccessToken($authCode, $redirectUri) { return (new Client())->post( - $tokenUrl, + $this->config()->get('api.oauth2_token_url'), [ - 'json' => [ + 'body' => [ 'grant_type' => 'authorization_code', 'code' => $authCode, 'client_id' => $this->config()->get('api.oauth2_client_id'), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.49.0/src/Command/Environment/EnvironmentDrushCommand.php new/platformsh-cli-3.49.1/src/Command/Environment/EnvironmentDrushCommand.php --- old/platformsh-cli-3.49.0/src/Command/Environment/EnvironmentDrushCommand.php 2019-10-08 19:57:59.000000000 +0200 +++ new/platformsh-cli-3.49.1/src/Command/Environment/EnvironmentDrushCommand.php 2019-10-12 14:16:45.000000000 +0200 @@ -46,9 +46,7 @@ $this->validateInput($input); $drushCommand = $input->getArgument('cmd'); - if (is_array($drushCommand)) { - $drushCommand = implode(' ', $drushCommand); - } + $drushCommand = implode(' ', array_map([OsUtil::class, 'escapePosixShellArg'], (array) $drushCommand)); // Pass through options that the CLI shares with Drush. foreach (['yes', 'no', 'quiet'] as $option) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.49.0/src/Command/SshKey/SshKeyAddCommand.php new/platformsh-cli-3.49.1/src/Command/SshKey/SshKeyAddCommand.php --- old/platformsh-cli-3.49.0/src/Command/SshKey/SshKeyAddCommand.php 2019-10-08 19:57:59.000000000 +0200 +++ new/platformsh-cli-3.49.1/src/Command/SshKey/SshKeyAddCommand.php 2019-10-12 14:16:45.000000000 +0200 @@ -132,6 +132,14 @@ $this->config()->get('service.name') )); + // Reset and warm the account info cache, to keep the has_key property + // up to date. + try { + $this->api()->getMyAccount(true); + } catch (\Exception $e) { + // Suppress exceptions; we do not need the result of this call. + } + return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.49.0/src/Command/SshKey/SshKeyDeleteCommand.php new/platformsh-cli-3.49.1/src/Command/SshKey/SshKeyDeleteCommand.php --- old/platformsh-cli-3.49.0/src/Command/SshKey/SshKeyDeleteCommand.php 2019-10-08 19:57:59.000000000 +0200 +++ new/platformsh-cli-3.49.1/src/Command/SshKey/SshKeyDeleteCommand.php 2019-10-12 14:16:45.000000000 +0200 @@ -50,6 +50,14 @@ $this->config()->get('service.name') )); + // Reset and warm the account info cache, to keep the has_key property + // up to date. + try { + $this->api()->getMyAccount(true); + } catch (\Exception $e) { + // Suppress exceptions; we do not need the result of this call. + } + return 0; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.49.0/src/Service/Api.php new/platformsh-cli-3.49.1/src/Service/Api.php --- old/platformsh-cli-3.49.0/src/Service/Api.php 2019-10-08 19:57:59.000000000 +0200 +++ new/platformsh-cli-3.49.1/src/Service/Api.php 2019-10-12 14:16:45.000000000 +0200 @@ -193,6 +193,14 @@ $connectorOptions['proxy'] = $proxy; } + // Override the OAuth 2.0 token and revoke URLs if provided. + if ($this->config->has('api.oauth2_token_url')) { + $connectorOptions['token_url'] = $this->config->get('api.oauth2_token_url'); + } + if ($this->config->has('api.oauth2_revoke_url')) { + $connectorOptions['revoke_url'] = $this->config->get('api.oauth2_revoke_url'); + } + $connector = new Connector($connectorOptions); // Set up a persistent session to store OAuth2 tokens. By default, @@ -740,11 +748,19 @@ */ public function getAccessToken() { + // Check for legacy API tokens. + if (isset($this->apiToken) && $this->apiTokenType === 'access') { + return $this->apiToken; + } + + // Get the access token from the session. $session = $this->getClient()->getConnector()->getSession(); $token = $session->get('accessToken'); $expires = $session->get('expires'); + + // If there is no token, or it has expired, make an API request, which + // automatically obtains a token and saves it to the session. if (!$token || $expires < time()) { - // Force a connection to the API to ensure there is an access token. $this->getMyAccount(true); if (!$token = $session->get('accessToken')) { throw new \RuntimeException('No access token found'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.49.0/src/Service/Config.php new/platformsh-cli-3.49.1/src/Service/Config.php --- old/platformsh-cli-3.49.0/src/Service/Config.php 2019-10-08 19:57:59.000000000 +0200 +++ new/platformsh-cli-3.49.1/src/Service/Config.php 2019-10-12 14:16:45.000000000 +0200 @@ -187,6 +187,10 @@ 'SESSION_ID' => 'api.session_id', 'SKIP_SSL' => 'api.skip_ssl', 'ACCOUNTS_API' => 'api.accounts_api_url', + 'ACCOUNTS_API_URL' => 'api.accounts_api_url', + 'OAUTH2_AUTH_URL' => 'api.oauth2_auth_url', + 'OAUTH2_TOKEN_URL' => 'api.oauth2_token_url', + 'OAUTH2_REVOKE_URL' => 'api.oauth2_revoke_url', 'UPDATES_CHECK' => 'updates.check', ]; ++++++ 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 2019-10-08 21:02:43.221454830 +0200 +++ new/vendor/autoload.php 2019-10-15 16:36:13.186643290 +0200 @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit79bf3e92a559cefb76d7c4aacdb1f222::getLoader(); +return ComposerAutoloaderInit83d6e0eaa0d493b9ac36dda8f1e66f13::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 2019-10-08 21:02:43.221454830 +0200 +++ new/vendor/composer/autoload_real.php 2019-10-15 16:36:13.186643290 +0200 @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit79bf3e92a559cefb76d7c4aacdb1f222 +class ComposerAutoloaderInit83d6e0eaa0d493b9ac36dda8f1e66f13 { private static $loader; @@ -19,15 +19,15 @@ return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit79bf3e92a559cefb76d7c4aacdb1f222', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit83d6e0eaa0d493b9ac36dda8f1e66f13', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit79bf3e92a559cefb76d7c4aacdb1f222', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit83d6e0eaa0d493b9ac36dda8f1e66f13', '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\ComposerStaticInit79bf3e92a559cefb76d7c4aacdb1f222::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit83d6e0eaa0d493b9ac36dda8f1e66f13::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit79bf3e92a559cefb76d7c4aacdb1f222::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit83d6e0eaa0d493b9ac36dda8f1e66f13::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire79bf3e92a559cefb76d7c4aacdb1f222($fileIdentifier, $file); + composerRequire83d6e0eaa0d493b9ac36dda8f1e66f13($fileIdentifier, $file); } return $loader; } } -function composerRequire79bf3e92a559cefb76d7c4aacdb1f222($fileIdentifier, $file) +function composerRequire83d6e0eaa0d493b9ac36dda8f1e66f13($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 2019-10-08 21:02:43.221454830 +0200 +++ new/vendor/composer/autoload_static.php 2019-10-15 16:36:13.186643290 +0200 @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit79bf3e92a559cefb76d7c4aacdb1f222 +class ComposerStaticInit83d6e0eaa0d493b9ac36dda8f1e66f13 { 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 = ComposerStaticInit79bf3e92a559cefb76d7c4aacdb1f222::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit79bf3e92a559cefb76d7c4aacdb1f222::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit79bf3e92a559cefb76d7c4aacdb1f222::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit83d6e0eaa0d493b9ac36dda8f1e66f13::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit83d6e0eaa0d493b9ac36dda8f1e66f13::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit83d6e0eaa0d493b9ac36dda8f1e66f13::$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 2019-10-08 21:02:42.793450835 +0200 +++ new/vendor/composer/installed.json 2019-10-15 16:36:12.754639362 +0200 @@ -680,17 +680,17 @@ }, { "name": "platformsh/client", - "version": "v0.30.0", - "version_normalized": "0.30.0.0", + "version": "v0.30.2", + "version_normalized": "0.30.2.0", "source": { "type": "git", "url": "https://github.com/platformsh/platformsh-client-php.git";, - "reference": "76c93c8e6f4c19089122a556d532f96f581efebf" + "reference": "603b80d638d138df11a95f73d478b3cedddfc7fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/76c93c8e6f4c19089122a556d532f96f581efebf";, - "reference": "76c93c8e6f4c19089122a556d532f96f581efebf", + "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/603b80d638d138df11a95f73d478b3cedddfc7fb";, + "reference": "603b80d638d138df11a95f73d478b3cedddfc7fb", "shasum": "" }, "require": { @@ -704,7 +704,7 @@ "require-dev": { "phpunit/phpunit": "~4.5" }, - "time": "2019-09-20T23:10:19+00:00", + "time": "2019-10-09T13:41:49+00:00", "type": "library", "installation-source": "dist", "autoload": { 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 2019-09-21 01:10:19.000000000 +0200 +++ new/vendor/platformsh/client/src/Connection/Connector.php 2019-10-09 15:41:49.000000000 +0200 @@ -151,6 +151,8 @@ foreach ($revocations as $type => $token) { $this->getClient()->post($url, [ 'body' => [ + 'client_id' => $this->config['client_id'], + 'client_secret' => $this->config['client_secret'], 'token' => $token, 'token_type_hint' => $type, ], @@ -158,17 +160,6 @@ } } - public function __destruct() - { - if ($this->oauth2Plugin) { - // Save the access token for future requests. - $token = $this->getOauth2Plugin()->getAccessToken(false); - if ($token !== null) { - $this->saveToken($token); - } - } - } - /** * @inheritdoc */ @@ -216,7 +207,7 @@ * * @param AccessToken $token */ - protected function saveToken(AccessToken $token) + public function saveToken(AccessToken $token) { if ($this->config['api_token'] && $this->config['api_token_type'] === 'access') { return;
