Hello community, here is the log from the commit of package platformsh-cli for openSUSE:Factory checked in at 2017-10-17 01:52:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old) and /work/SRC/openSUSE:Factory/.platformsh-cli.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "platformsh-cli" Tue Oct 17 01:52:12 2017 rev:20 rq:533955 version:3.20.5 Changes: -------- --- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes 2017-09-21 12:35:10.528476004 +0200 +++ /work/SRC/openSUSE:Factory/.platformsh-cli.new/platformsh-cli.changes 2017-10-17 01:52:13.711248171 +0200 @@ -1,0 +2,12 @@ +Fri Oct 13 14:15:34 UTC 2017 - ji...@boombatower.com + +- Update to version 3.20.5: + * Only show prune message once (follow up to #627) + * GitHub integration: add flag for pull_requests_clone_parent_data (#623) + * Add --no-clone-parent option to branch command (#630) + * Add default from address for health.email integration (#632) + * Fix infinite loop in Config::canWriteDir (#634) + * Move Config::canWriteToDir to Filesystem::canWrite and add tests + * Release v3.20.5 + +------------------------------------------------------------------- Old: ---- platformsh-cli-3.20.4.tar.xz New: ---- platformsh-cli-3.20.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ platformsh-cli.spec ++++++ --- /var/tmp/diff_new_pack.N6rwPd/_old 2017-10-17 01:52:15.047185591 +0200 +++ /var/tmp/diff_new_pack.N6rwPd/_new 2017-10-17 01:52:15.051185405 +0200 @@ -17,7 +17,7 @@ Name: platformsh-cli -Version: 3.20.4 +Version: 3.20.5 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.N6rwPd/_old 2017-10-17 01:52:15.087183718 +0200 +++ /var/tmp/diff_new_pack.N6rwPd/_new 2017-10-17 01:52:15.091183531 +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.20.4</param> + <param name="revision">refs/tags/v3.20.5</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.N6rwPd/_old 2017-10-17 01:52:15.111182594 +0200 +++ /var/tmp/diff_new_pack.N6rwPd/_new 2017-10-17 01:52:15.111182594 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/platformsh/platformsh-cli.git</param> - <param name="changesrevision">4371af7abcc8be33aaf078c8cdf833517e41c7ef</param> + <param name="changesrevision">f8e216ec75f1a2f6fdf3e4765c60b624fda06ea3</param> </service> </servicedata> ++++++ licenses.txt ++++++ --- /var/tmp/diff_new_pack.N6rwPd/_old 2017-10-17 01:52:15.151180720 +0200 +++ /var/tmp/diff_new_pack.N6rwPd/_new 2017-10-17 01:52:15.151180720 +0200 @@ -15,8 +15,8 @@ guzzlehttp/streams 3.0.0 MIT padraic/humbug_get_contents 1.0.4 BSD-3-Clause padraic/phar-updater 1.0.4 BSD-3-Clause -platformsh/client v0.11.4 MIT -platformsh/console-form v0.0.12 MIT +platformsh/client v0.12.0 MIT +platformsh/console-form v0.0.13 MIT psr/container 1.0.0 MIT psr/log 1.0.2 MIT react/promise v2.5.1 MIT ++++++ platformsh-cli-3.20.4.tar.xz -> platformsh-cli-3.20.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.4/composer.json new/platformsh-cli-3.20.5/composer.json --- old/platformsh-cli-3.20.4/composer.json 2017-09-20 10:43:46.000000000 +0200 +++ new/platformsh-cli-3.20.5/composer.json 2017-10-13 10:57:00.000000000 +0200 @@ -7,8 +7,8 @@ "doctrine/cache": "~1.5", "guzzlehttp/guzzle": "^5.3", "guzzlehttp/ringphp": "^1.1", - "platformsh/console-form": "0.0.12", - "platformsh/client": "^0.11", + "platformsh/console-form": "0.0.13", + "platformsh/client": "^0.12", "symfony/console": "^3.0 !=3.2.5 !=3.2.6", "symfony/yaml": "^3.0 || ^2.6", "symfony/finder": "^3.0", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.4/composer.lock new/platformsh-cli-3.20.5/composer.lock --- old/platformsh-cli-3.20.4/composer.lock 2017-09-20 10:43:46.000000000 +0200 +++ new/platformsh-cli-3.20.5/composer.lock 2017-10-13 10:57:00.000000000 +0200 @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "5cd770732384ef14b287e70ef359e3e8", + "content-hash": "a659e476dd1e0481d2594685220c4230", "packages": [ { "name": "cocur/slugify", @@ -594,16 +594,16 @@ }, { "name": "platformsh/client", - "version": "v0.11.4", + "version": "v0.12.0", "source": { "type": "git", "url": "https://github.com/platformsh/platformsh-client-php.git", - "reference": "07bc12cf0b81a23368679b6dc274f95c74eeaef2" + "reference": "e5ce468ddc35d8a95fff79579a17b076cd5831c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/07bc12cf0b81a23368679b6dc274f95c74eeaef2", - "reference": "07bc12cf0b81a23368679b6dc274f95c74eeaef2", + "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/e5ce468ddc35d8a95fff79579a17b076cd5831c4", + "reference": "e5ce468ddc35d8a95fff79579a17b076cd5831c4", "shasum": "" }, "require": { @@ -639,20 +639,20 @@ } ], "description": "Platform.sh API client", - "time": "2017-08-10T10:50:40+00:00" + "time": "2017-09-20T08:28:37+00:00" }, { "name": "platformsh/console-form", - "version": "v0.0.12", + "version": "v0.0.13", "source": { "type": "git", "url": "https://github.com/platformsh/console-form.git", - "reference": "9291bf026158f0b571e50d96ffa0f837d1a5058d" + "reference": "6dc8507d5ed9e1a79fff4265d4f72a932e628015" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/platformsh/console-form/zipball/9291bf026158f0b571e50d96ffa0f837d1a5058d", - "reference": "9291bf026158f0b571e50d96ffa0f837d1a5058d", + "url": "https://api.github.com/repos/platformsh/console-form/zipball/6dc8507d5ed9e1a79fff4265d4f72a932e628015", + "reference": "6dc8507d5ed9e1a79fff4265d4f72a932e628015", "shasum": "" }, "require": { @@ -678,7 +678,7 @@ } ], "description": "A lightweight Symfony Console form system.", - "time": "2017-09-20T07:56:57+00:00" + "time": "2017-09-22T10:30:55+00:00" }, { "name": "psr/container", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.4/config.yaml new/platformsh-cli-3.20.5/config.yaml --- old/platformsh-cli-3.20.4/config.yaml 2017-09-20 10:43:46.000000000 +0200 +++ new/platformsh-cli-3.20.5/config.yaml 2017-10-13 10:57:00.000000000 +0200 @@ -1,7 +1,7 @@ # Metadata about the CLI application itself. application: name: 'Platform.sh CLI' - version: '3.20.4' + version: '3.20.5' executable: 'platform' package_name: 'platformsh/cli' installer_url: 'https://platform.sh/cli/installer' @@ -36,6 +36,7 @@ docs_search_url: 'https://www.google.com/search?q=site%3Adocs.platform.sh%20{{ terms }}' accounts_url: 'https://accounts.platform.sh' pricing_url: 'https://platform.sh/pricing' + default_from_address: 'nore...@platform.sh' available_regions: - eu.platform.sh - us.platform.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.4/services.yaml new/platformsh-cli-3.20.5/services.yaml --- old/platformsh-cli-3.20.4/services.yaml 2017-09-20 10:43:46.000000000 +0200 +++ new/platformsh-cli-3.20.5/services.yaml 2017-10-13 10:57:00.000000000 +0200 @@ -13,6 +13,9 @@ class: '\Platformsh\Cli\Service\CacheFactory' config: class: '\Platformsh\Cli\Service\Config' + calls: + - method: setFs + arguments: ['@fs'] drush: class: '\Platformsh\Cli\Service\Drush' arguments: ['@config', '@shell'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.4/src/Command/Environment/EnvironmentBranchCommand.php new/platformsh-cli-3.20.5/src/Command/Environment/EnvironmentBranchCommand.php --- old/platformsh-cli-3.20.4/src/Command/Environment/EnvironmentBranchCommand.php 2017-09-20 10:43:46.000000000 +0200 +++ new/platformsh-cli-3.20.5/src/Command/Environment/EnvironmentBranchCommand.php 2017-10-13 10:57:00.000000000 +0200 @@ -25,6 +25,12 @@ null, InputOption::VALUE_NONE, "Create the new environment even if the branch cannot be checked out locally" + ) + ->addOption( + 'no-clone-parent', + null, + InputOption::VALUE_NONE, + "Do not clone the parent branch's data" ); $this->addProjectOption() ->addEnvironmentOption() @@ -110,7 +116,7 @@ )); $title = $input->getOption('title') ?: $branchName; - $activity = $parentEnvironment->branch($title, $branchName); + $activity = $parentEnvironment->branch($title, $branchName, !$input->getOption('no-clone-parent')); // Clear the environments cache, as branching has started. $this->api()->clearEnvironmentsCache($selectedProject->id); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.4/src/Command/Environment/EnvironmentDeleteCommand.php new/platformsh-cli-3.20.5/src/Command/Environment/EnvironmentDeleteCommand.php --- old/platformsh-cli-3.20.4/src/Command/Environment/EnvironmentDeleteCommand.php 2017-09-20 10:43:46.000000000 +0200 +++ new/platformsh-cli-3.20.5/src/Command/Environment/EnvironmentDeleteCommand.php 2017-10-13 10:57:00.000000000 +0200 @@ -255,13 +255,16 @@ } $environment->delete(); $output->writeln("Deleted remote Git branch <info>$environmentId</info>"); - $output->writeln("Run <info>git fetch --prune</info> to remove the branch from your local cache."); $deleted++; } catch (\Exception $e) { $output->writeln($e->getMessage()); } } + if ($deleted > 0) { + $output->writeln("Run <info>git fetch --prune</info> to remove deleted branches from your local cache."); + } + if ($deleted < count($delete) || $deactivated < count($deactivate)) { $error = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.4/src/Command/Integration/IntegrationCommandBase.php new/platformsh-cli-3.20.5/src/Command/Integration/IntegrationCommandBase.php --- old/platformsh-cli-3.20.4/src/Command/Integration/IntegrationCommandBase.php 2017-09-20 10:43:46.000000000 +0200 +++ new/platformsh-cli-3.20.5/src/Command/Integration/IntegrationCommandBase.php 2017-10-13 10:57:00.000000000 +0200 @@ -84,6 +84,13 @@ ]], 'description' => 'GitHub: build pull requests based on their post-merge state', ]), + 'pull_requests_clone_parent_data' => new BooleanField('Clone data for pull requests', [ + 'optionName' => 'pull-requests-clone-parent-data', + 'conditions' => ['type' => [ + 'github', + ]], + 'description' => 'GitHub: clone data for pull requests', + ]), 'fetch_branches' => new BooleanField('Fetch branches', [ 'conditions' => ['type' => [ 'github', @@ -133,6 +140,9 @@ 'health.email', ]], 'description' => 'The From address for alert emails', + 'default' => $this->config()->has('service.default_from_address') + ? $this->config()->get('service.default_from_address') + : null, ]), 'recipients' => new ArrayField('Recipients', [ 'conditions' => ['type' => [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.4/src/Service/Config.php new/platformsh-cli-3.20.5/src/Service/Config.php --- old/platformsh-cli-3.20.4/src/Service/Config.php 2017-09-20 10:43:46.000000000 +0200 +++ new/platformsh-cli-3.20.5/src/Service/Config.php 2017-10-13 10:57:00.000000000 +0200 @@ -16,6 +16,8 @@ protected $userConfig = null; + private $fs; + /** * @param array|null $env * @param string|null $defaultsFile @@ -66,7 +68,25 @@ */ public function getUserConfigDir() { - return Filesystem::getHomeDirectory() . '/' . $this->get('application.user_config_dir'); + return $this->fs()->getHomeDirectory() . '/' . $this->get('application.user_config_dir'); + } + + /** + * Inject the filesystem service. + * + * @param Filesystem $fs + */ + public function setFs(Filesystem $fs) + { + $this->fs = $fs; + } + + /** + * @return \Platformsh\Cli\Service\Filesystem + */ + private function fs() + { + return $this->fs ?: new Filesystem(); } /** @@ -78,7 +98,7 @@ // If the config directory is not writable (e.g. if we are on a // Platform.sh environment), use a temporary directory instead. - if (!$this->canWriteToDir($configDir)) { + if (!$this->fs()->canWrite($configDir) || (file_exists($configDir) && !is_dir($configDir))) { return sys_get_temp_dir() . '/' . $this->get('application.tmp_sub_dir'); } @@ -86,27 +106,6 @@ } /** - * @param string $dir - * - * @return bool - */ - protected function canWriteToDir($dir) - { - if (is_writable($dir)) { - return true; - } - - $current = $dir; - while (!file_exists($current) && ($parent = dirname($current)) && $parent !== $current) { - if (is_writable($parent)) { - return true; - } - } - - return false; - } - - /** * @param string $filename * * @return array diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.4/src/Service/Filesystem.php new/platformsh-cli-3.20.5/src/Service/Filesystem.php --- old/platformsh-cli-3.20.4/src/Service/Filesystem.php 2017-09-20 10:43:46.000000000 +0200 +++ new/platformsh-cli-3.20.5/src/Service/Filesystem.php 2017-10-13 10:57:00.000000000 +0200 @@ -364,6 +364,30 @@ } /** + * Test whether a file or directory is writable even if it does not exist. + * + * @param string $name + * + * @return bool + */ + public function canWrite($name) + { + if (is_writable($name)) { + return true; + } + + $current = $name; + while (!file_exists($current) && ($parent = dirname($current)) && $parent !== $current) { + if (is_writable($parent)) { + return true; + } + $current = $parent; + } + + return false; + } + + /** * Create a gzipped tar archive of a directory's contents. * * @param string $dir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.20.4/tests/Helper/FilesystemHelperTest.php new/platformsh-cli-3.20.5/tests/Helper/FilesystemHelperTest.php --- old/platformsh-cli-3.20.4/tests/Helper/FilesystemHelperTest.php 2017-09-20 10:43:46.000000000 +0200 +++ new/platformsh-cli-3.20.5/tests/Helper/FilesystemHelperTest.php 2017-10-13 10:57:00.000000000 +0200 @@ -152,6 +152,23 @@ $this->assertFileExists($testDestination . '/test-nesting/1/2/3/test-file'); } + public function testCanWrite() + { + $testDir = $this->createTempSubDir(); + touch($testDir . '/test-file'); + $this->assertTrue($this->filesystemHelper->canWrite($testDir . '/test-file')); + chmod($testDir . '/test-file', 0500); + $this->assertFalse($this->filesystemHelper->canWrite($testDir . '/test-file')); + mkdir($testDir . '/test-dir', 0700); + $this->assertTrue($this->filesystemHelper->canWrite($testDir . '/test-dir')); + $this->assertTrue($this->filesystemHelper->canWrite($testDir . '/test-dir/1')); + $this->assertTrue($this->filesystemHelper->canWrite($testDir . '/test-dir/1/2/3')); + mkdir($testDir . '/test-ro-dir', 0500); + $this->assertFalse(is_writable($testDir . '/test-ro-dir')); + $this->assertFalse($this->filesystemHelper->canWrite($testDir . '/test-ro-dir')); + $this->assertFalse($this->filesystemHelper->canWrite($testDir . '/test-ro-dir/1')); + } + /** * Create a test directory with a unique name. * ++++++ 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 2017-09-20 15:16:33.239927840 +0200 +++ new/vendor/autoload.php 2017-10-13 16:15:40.586800666 +0200 @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit828a4403bb8c275b978d60c609b5e85e::getLoader(); +return ComposerAutoloaderInit8f904e37181a69f3b56037fd804558c1::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 2017-09-20 15:16:33.239927840 +0200 +++ new/vendor/composer/autoload_real.php 2017-10-13 16:15:40.586800666 +0200 @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit828a4403bb8c275b978d60c609b5e85e +class ComposerAutoloaderInit8f904e37181a69f3b56037fd804558c1 { private static $loader; @@ -19,15 +19,15 @@ return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit828a4403bb8c275b978d60c609b5e85e', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit8f904e37181a69f3b56037fd804558c1', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit828a4403bb8c275b978d60c609b5e85e', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit8f904e37181a69f3b56037fd804558c1', '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\ComposerStaticInit828a4403bb8c275b978d60c609b5e85e::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit8f904e37181a69f3b56037fd804558c1::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\ComposerStaticInit828a4403bb8c275b978d60c609b5e85e::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit8f904e37181a69f3b56037fd804558c1::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire828a4403bb8c275b978d60c609b5e85e($fileIdentifier, $file); + composerRequire8f904e37181a69f3b56037fd804558c1($fileIdentifier, $file); } return $loader; } } -function composerRequire828a4403bb8c275b978d60c609b5e85e($fileIdentifier, $file) +function composerRequire8f904e37181a69f3b56037fd804558c1($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 2017-09-20 15:16:33.239927840 +0200 +++ new/vendor/composer/autoload_static.php 2017-10-13 16:15:40.586800666 +0200 @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit828a4403bb8c275b978d60c609b5e85e +class ComposerStaticInit8f904e37181a69f3b56037fd804558c1 { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -188,9 +188,9 @@ public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit828a4403bb8c275b978d60c609b5e85e::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit828a4403bb8c275b978d60c609b5e85e::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit828a4403bb8c275b978d60c609b5e85e::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit8f904e37181a69f3b56037fd804558c1::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit8f904e37181a69f3b56037fd804558c1::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit8f904e37181a69f3b56037fd804558c1::$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 2017-09-20 15:16:32.259915959 +0200 +++ new/vendor/composer/installed.json 2017-10-13 16:15:39.626792307 +0200 @@ -657,17 +657,17 @@ }, { "name": "platformsh/client", - "version": "v0.11.4", - "version_normalized": "0.11.4.0", + "version": "v0.12.0", + "version_normalized": "0.12.0.0", "source": { "type": "git", "url": "https://github.com/platformsh/platformsh-client-php.git", - "reference": "07bc12cf0b81a23368679b6dc274f95c74eeaef2" + "reference": "e5ce468ddc35d8a95fff79579a17b076cd5831c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/07bc12cf0b81a23368679b6dc274f95c74eeaef2", - "reference": "07bc12cf0b81a23368679b6dc274f95c74eeaef2", + "url": "https://api.github.com/repos/platformsh/platformsh-client-php/zipball/e5ce468ddc35d8a95fff79579a17b076cd5831c4", + "reference": "e5ce468ddc35d8a95fff79579a17b076cd5831c4", "shasum": "" }, "require": { @@ -680,7 +680,7 @@ "require-dev": { "phpunit/phpunit": "~4.5" }, - "time": "2017-08-10T10:50:40+00:00", + "time": "2017-09-20T08:28:37+00:00", "type": "library", "extra": { "patches": { @@ -946,17 +946,17 @@ }, { "name": "platformsh/console-form", - "version": "v0.0.12", - "version_normalized": "0.0.12.0", + "version": "v0.0.13", + "version_normalized": "0.0.13.0", "source": { "type": "git", "url": "https://github.com/platformsh/console-form.git", - "reference": "9291bf026158f0b571e50d96ffa0f837d1a5058d" + "reference": "6dc8507d5ed9e1a79fff4265d4f72a932e628015" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/platformsh/console-form/zipball/9291bf026158f0b571e50d96ffa0f837d1a5058d", - "reference": "9291bf026158f0b571e50d96ffa0f837d1a5058d", + "url": "https://api.github.com/repos/platformsh/console-form/zipball/6dc8507d5ed9e1a79fff4265d4f72a932e628015", + "reference": "6dc8507d5ed9e1a79fff4265d4f72a932e628015", "shasum": "" }, "require": { @@ -966,7 +966,7 @@ "require-dev": { "phpunit/phpunit": "^5.0" }, - "time": "2017-09-20T07:56:57+00:00", + "time": "2017-09-22T10:30:55+00:00", "type": "library", "installation-source": "dist", "autoload": { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/platformsh/client/src/Model/Environment.php new/vendor/platformsh/client/src/Model/Environment.php --- old/vendor/platformsh/client/src/Model/Environment.php 2017-08-10 12:50:40.000000000 +0200 +++ new/vendor/platformsh/client/src/Model/Environment.php 2017-09-20 10:28:37.000000000 +0200 @@ -157,17 +157,22 @@ /** * Branch (create a new environment). * - * @param string $title The title of the new environment. - * @param string $id The ID of the new environment. This will be the Git - * branch name. Leave blank to generate automatically - * from the title. + * @param string $title The title of the new environment. + * @param string $id The ID of the new environment. This will be the Git + * branch name. Leave blank to generate automatically + * from the title. + * @param bool $cloneParent Whether to clone data from the parent + * environment while branching. * * @return Activity */ - public function branch($title, $id = null) + public function branch($title, $id = null, $cloneParent = true) { $id = $id ?: $this->sanitizeId($title); $body = ['name' => $id, 'title' => $title]; + if (!$cloneParent) { + $body['clone_parent'] = false; + } return $this->runLongOperation('branch', 'post', $body); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor/platformsh/console-form/src/Field/ArrayField.php new/vendor/platformsh/console-form/src/Field/ArrayField.php --- old/vendor/platformsh/console-form/src/Field/ArrayField.php 2017-09-20 09:56:57.000000000 +0200 +++ new/vendor/platformsh/console-form/src/Field/ArrayField.php 2017-09-22 12:30:55.000000000 +0200 @@ -24,6 +24,22 @@ /** * {@inheritdoc} */ + protected function getQuestionText() + { + $text = $this->name; + if (!empty($this->default)) { + $text .= ' <question>[default: ' . $this->formatDefault($this->default) . ']</question>'; + } else { + $text .= ' <question>[comma-separated]</question>'; + } + $text .= ': '; + + return $text; + } + + /** + * {@inheritdoc} + */ public function matchesCondition($userValue, $condition) { return !array_diff($userValue, $condition);