Hello community, here is the log from the commit of package platformsh-cli for openSUSE:Factory checked in at 2019-02-19 12:02:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/platformsh-cli (Old) and /work/SRC/openSUSE:Factory/.platformsh-cli.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "platformsh-cli" Tue Feb 19 12:02:56 2019 rev:63 rq:677206 version:3.40.2 Changes: -------- --- /work/SRC/openSUSE:Factory/platformsh-cli/platformsh-cli.changes 2019-02-17 12:21:28.120198452 +0100 +++ /work/SRC/openSUSE:Factory/.platformsh-cli.new.28833/platformsh-cli.changes 2019-02-19 12:03:03.673055680 +0100 @@ -1,0 +2,17 @@ +Mon Feb 18 21:02:52 UTC 2019 - [email protected] + +- Update to version 3.40.2: + * Release v3.40.2 + * Fix default for single relationship when choosing a service + * Update dependencies (Symfony 3.4.19 -> 3.4.22) + +------------------------------------------------------------------- +Mon Feb 18 01:40:18 UTC 2019 - [email protected] + +- Update to version 3.40.1: + * Release v3.40.1 + * Fix --relationship option with trailing .0 when selecting from multiple endpoints + * Account for integrated Enterprise environments whose deployment schema information isn't accurate + * Ensure the service name is in the relationship array + +------------------------------------------------------------------- Old: ---- platformsh-cli-3.40.0.tar.xz New: ---- platformsh-cli-3.40.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ platformsh-cli.spec ++++++ --- /var/tmp/diff_new_pack.zkkavW/_old 2019-02-19 12:03:04.429055294 +0100 +++ /var/tmp/diff_new_pack.zkkavW/_new 2019-02-19 12:03:04.433055292 +0100 @@ -17,7 +17,7 @@ Name: platformsh-cli -Version: 3.40.0 +Version: 3.40.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.zkkavW/_old 2019-02-19 12:03:04.457055279 +0100 +++ /var/tmp/diff_new_pack.zkkavW/_new 2019-02-19 12:03:04.461055278 +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.40.0</param> + <param name="revision">refs/tags/v3.40.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.zkkavW/_old 2019-02-19 12:03:04.473055271 +0100 +++ /var/tmp/diff_new_pack.zkkavW/_new 2019-02-19 12:03:04.473055271 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/platformsh/platformsh-cli.git</param> - <param name="changesrevision">4d5f7dcd1eefbbf3473e0b7f091623cd7d83d355</param> + <param name="changesrevision">d32290596cf0d5aec73e88a309c7b94571df8fe3</param> </service> </servicedata> ++++++ licenses.txt ++++++ --- /var/tmp/diff_new_pack.zkkavW/_old 2019-02-19 12:03:04.513055251 +0100 +++ /var/tmp/diff_new_pack.zkkavW/_new 2019-02-19 12:03:04.513055251 +0100 @@ -6,7 +6,7 @@ Name Version License cocur/slugify v2.5 MIT commerceguys/guzzle-oauth2-plugin v2.1.1 MIT -composer/ca-bundle 1.1.3 MIT +composer/ca-bundle 1.1.4 MIT cweagans/composer-patches 1.6.5 BSD-3-Clause doctrine/cache v1.6.2 MIT firebase/php-jwt v2.2.0 BSD-3-Clause @@ -16,21 +16,21 @@ guzzlehttp/streams 3.0.0 MIT padraic/humbug_get_contents 1.1.2 BSD-3-Clause padraic/phar-updater v1.0.6 BSD-3-Clause -paragonie/random_compat v2.0.17 MIT +paragonie/random_compat v2.0.18 MIT platformsh/client v0.23.2 MIT platformsh/console-form v0.0.23 MIT psr/container 1.0.0 MIT psr/log 1.1.0 MIT -react/promise v2.7.0 MIT +react/promise v2.7.1 MIT stecman/symfony-console-completion 0.8.0 MIT -symfony/config v3.4.19 MIT -symfony/console v3.4.19 MIT -symfony/debug v3.4.19 MIT -symfony/dependency-injection v3.4.19 MIT -symfony/event-dispatcher v3.4.19 MIT -symfony/filesystem v3.4.19 MIT -symfony/finder v3.4.19 MIT +symfony/config v3.4.22 MIT +symfony/console v3.4.22 MIT +symfony/debug v3.4.22 MIT +symfony/dependency-injection v3.4.22 MIT +symfony/event-dispatcher v3.4.22 MIT +symfony/filesystem v3.4.22 MIT +symfony/finder v3.4.22 MIT symfony/polyfill-ctype v1.10.0 MIT symfony/polyfill-mbstring v1.10.0 MIT -symfony/process v3.4.19 MIT -symfony/yaml v3.4.19 MIT +symfony/process v3.4.22 MIT +symfony/yaml v3.4.22 MIT ++++++ platformsh-cli-3.40.0.tar.xz -> platformsh-cli-3.40.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.0/composer.lock new/platformsh-cli-3.40.2/composer.lock --- old/platformsh-cli-3.40.0/composer.lock 2019-02-15 17:37:35.000000000 +0100 +++ new/platformsh-cli-3.40.2/composer.lock 2019-02-18 11:22:35.000000000 +0100 @@ -122,16 +122,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git";, - "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660" + "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/8afa52cd417f4ec417b4bfe86b68106538a87660";, - "reference": "8afa52cd417f4ec417b4bfe86b68106538a87660", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d";, + "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d", "shasum": "" }, "require": { @@ -174,7 +174,7 @@ "ssl", "tls" ], - "time": "2018-10-18T06:09:13+00:00" + "time": "2019-01-28T09:30:10+00:00" }, { "name": "cweagans/composer-patches", @@ -663,16 +663,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.17", + "version": "v2.0.18", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git";, - "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d" + "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d";, - "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0a58ef6e3146256cc3dc7cc393927bcc7d1b72db";, + "reference": "0a58ef6e3146256cc3dc7cc393927bcc7d1b72db", "shasum": "" }, "require": { @@ -708,7 +708,7 @@ "pseudorandom", "random" ], - "time": "2018-07-04T16:31:37+00:00" + "time": "2019-01-03T20:59:08+00:00" }, { "name": "platformsh/client", @@ -896,16 +896,16 @@ }, { "name": "react/promise", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git";, - "reference": "f4edc2581617431aea50430749db55cc3fc031b3" + "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/f4edc2581617431aea50430749db55cc3fc031b3";, - "reference": "f4edc2581617431aea50430749db55cc3fc031b3", + "url": "https://api.github.com/repos/reactphp/promise/zipball/31ffa96f8d2ed0341a57848cbb84d88b89dd664d";, + "reference": "31ffa96f8d2ed0341a57848cbb84d88b89dd664d", "shasum": "" }, "require": { @@ -938,7 +938,7 @@ "promise", "promises" ], - "time": "2018-06-13T15:59:06+00:00" + "time": "2019-01-07T21:25:54+00:00" }, { "name": "stecman/symfony-console-completion", @@ -987,16 +987,16 @@ }, { "name": "symfony/config", - "version": "v3.4.19", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/config.git";, - "reference": "8a660daeb65dedbe0b099529f65e61866c055081" + "reference": "c9bc510c217075d42d4a927e285917d0c2001cf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/8a660daeb65dedbe0b099529f65e61866c055081";, - "reference": "8a660daeb65dedbe0b099529f65e61866c055081", + "url": "https://api.github.com/repos/symfony/config/zipball/c9bc510c217075d42d4a927e285917d0c2001cf4";, + "reference": "c9bc510c217075d42d4a927e285917d0c2001cf4", "shasum": "" }, "require": { @@ -1047,20 +1047,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com";, - "time": "2018-11-26T10:17:44+00:00" + "time": "2019-01-30T11:33:42+00:00" }, { "name": "symfony/console", - "version": "v3.4.19", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/console.git";, - "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb" + "reference": "069bf3f0e8f871a2169a06e43d9f3f03f355e9be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb";, - "reference": "8f80fc39bbc3b7c47ee54ba7aa2653521ace94bb", + "url": "https://api.github.com/repos/symfony/console/zipball/069bf3f0e8f871a2169a06e43d9f3f03f355e9be";, + "reference": "069bf3f0e8f871a2169a06e43d9f3f03f355e9be", "shasum": "" }, "require": { @@ -1072,6 +1072,9 @@ "symfony/dependency-injection": "<3.4", "symfony/process": "<3.3" }, + "provide": { + "psr/log-implementation": "1.0" + }, "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.3|~4.0", @@ -1081,7 +1084,7 @@ "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log-implementation": "For using the console logger", + "psr/log": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -1116,20 +1119,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com";, - "time": "2018-11-26T12:48:07+00:00" + "time": "2019-01-25T10:42:12+00:00" }, { "name": "symfony/debug", - "version": "v3.4.19", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/debug.git";, - "reference": "2016b3eec2e49c127dd02d0ef44a35c53181560d" + "reference": "667a26c4dd6bc75c67f06bc9bcd015bdecc7cbb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/2016b3eec2e49c127dd02d0ef44a35c53181560d";, - "reference": "2016b3eec2e49c127dd02d0ef44a35c53181560d", + "url": "https://api.github.com/repos/symfony/debug/zipball/667a26c4dd6bc75c67f06bc9bcd015bdecc7cbb8";, + "reference": "667a26c4dd6bc75c67f06bc9bcd015bdecc7cbb8", "shasum": "" }, "require": { @@ -1172,20 +1175,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com";, - "time": "2018-11-11T19:48:54+00:00" + "time": "2019-01-25T10:19:25+00:00" }, { "name": "symfony/dependency-injection", - "version": "v3.4.19", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git";, - "reference": "622b330ced1bdf29d240bd1c364c038f647eb0f5" + "reference": "b514f5b765cf3e4a56e9d8ebacf14b117f7a0ee1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/622b330ced1bdf29d240bd1c364c038f647eb0f5";, - "reference": "622b330ced1bdf29d240bd1c364c038f647eb0f5", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/b514f5b765cf3e4a56e9d8ebacf14b117f7a0ee1";, + "reference": "b514f5b765cf3e4a56e9d8ebacf14b117f7a0ee1", "shasum": "" }, "require": { @@ -1243,20 +1246,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com";, - "time": "2018-11-20T16:14:23+00:00" + "time": "2019-01-30T17:48:51+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.19", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git";, - "reference": "d365fc4416ec4980825873962ea5d1b1bca46f1a" + "reference": "ed5be1663fa66623b3a7004d5d51a14c4045399b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d365fc4416ec4980825873962ea5d1b1bca46f1a";, - "reference": "d365fc4416ec4980825873962ea5d1b1bca46f1a", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ed5be1663fa66623b3a7004d5d51a14c4045399b";, + "reference": "ed5be1663fa66623b3a7004d5d51a14c4045399b", "shasum": "" }, "require": { @@ -1306,20 +1309,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com";, - "time": "2018-11-26T10:17:44+00:00" + "time": "2019-01-16T13:27:11+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.19", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git";, - "reference": "b49b1ca166bd109900e6a1683d9bb1115727ef2d" + "reference": "b52454ec66fe5082b7a66a491339d1f1da9a5a0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b49b1ca166bd109900e6a1683d9bb1115727ef2d";, - "reference": "b49b1ca166bd109900e6a1683d9bb1115727ef2d", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b52454ec66fe5082b7a66a491339d1f1da9a5a0d";, + "reference": "b52454ec66fe5082b7a66a491339d1f1da9a5a0d", "shasum": "" }, "require": { @@ -1356,20 +1359,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com";, - "time": "2018-11-11T19:48:54+00:00" + "time": "2019-01-16T13:27:11+00:00" }, { "name": "symfony/finder", - "version": "v3.4.19", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/finder.git";, - "reference": "6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442" + "reference": "7c0c627220308928e958a87c293108e5891cde1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442";, - "reference": "6cf2be5cbd0e87aa35c01f80ae0bf40b6798e442", + "url": "https://api.github.com/repos/symfony/finder/zipball/7c0c627220308928e958a87c293108e5891cde1d";, + "reference": "7c0c627220308928e958a87c293108e5891cde1d", "shasum": "" }, "require": { @@ -1405,7 +1408,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com";, - "time": "2018-11-11T19:48:54+00:00" + "time": "2019-01-16T13:43:35+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1526,16 +1529,16 @@ }, { "name": "symfony/process", - "version": "v3.4.19", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/process.git";, - "reference": "abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2" + "reference": "009f8dda80930e89e8344a4e310b08f9ff07dd2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2";, - "reference": "abb46b909dd6ba0b50e10d4c10ffe6ee96dd70f2", + "url": "https://api.github.com/repos/symfony/process/zipball/009f8dda80930e89e8344a4e310b08f9ff07dd2e";, + "reference": "009f8dda80930e89e8344a4e310b08f9ff07dd2e", "shasum": "" }, "require": { @@ -1571,20 +1574,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com";, - "time": "2018-11-20T16:10:26+00:00" + "time": "2019-01-16T13:27:11+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.19", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git";, - "reference": "291e13d808bec481eab83f301f7bff3e699ef603" + "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/291e13d808bec481eab83f301f7bff3e699ef603";, - "reference": "291e13d808bec481eab83f301f7bff3e699ef603", + "url": "https://api.github.com/repos/symfony/yaml/zipball/ba11776e9e6c15ad5759a07bffb15899bac75c2d";, + "reference": "ba11776e9e6c15ad5759a07bffb15899bac75c2d", "shasum": "" }, "require": { @@ -1630,40 +1633,84 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com";, - "time": "2018-11-11T19:48:54+00:00" + "time": "2019-01-16T10:59:17+00:00" } ], "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "2.10.0", + "version": "2.11.2", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git";, - "reference": "8e7d1a05230dc1159c751809e98b74f2b7f71873" + "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/8e7d1a05230dc1159c751809e98b74f2b7f71873";, - "reference": "8e7d1a05230dc1159c751809e98b74f2b7f71873", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/004af26391cd7d1cd04b0ac736dc1324d1b4f572";, + "reference": "004af26391cd7d1cd04b0ac736dc1324d1b4f572", "shasum": "" }, "require": { "consolidation/output-formatters": "^3.4", - "php": ">=5.4.0", + "php": ">=5.4.5", "psr/log": "^1", "symfony/console": "^2.8|^3|^4", "symfony/event-dispatcher": "^2.5|^3|^4", "symfony/finder": "^2.5|^3|^4" }, "require-dev": { - "g1a/composer-test-scenarios": "^2", + "g1a/composer-test-scenarios": "^3", + "php-coveralls/php-coveralls": "^1", "phpunit/phpunit": "^6", - "satooshi/php-coveralls": "^2", "squizlabs/php_codesniffer": "^2.7" }, "type": "library", "extra": { + "scenarios": { + "symfony4": { + "require": { + "symfony/console": "^4.0" + }, + "config": { + "platform": { + "php": "7.1.3" + } + } + }, + "symfony2": { + "require": { + "symfony/console": "^2.8" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + }, + "scenario-options": { + "create-lockfile": "false" + } + }, + "phpunit4": { + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, + "remove": [ + "php-coveralls/php-coveralls" + ], + "config": { + "platform": { + "php": "5.4.8" + } + } + } + }, "branch-alias": { "dev-master": "2.x-dev" } @@ -1684,7 +1731,7 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2018-11-15T01:46:18+00:00" + "time": "2019-02-02T02:29:53+00:00" }, { "name": "consolidation/output-formatters", @@ -2774,6 +2821,7 @@ "mock", "xunit" ], + "abandoned": true, "time": "2015-10-02T06:51:40+00:00" }, { @@ -3224,16 +3272,16 @@ }, { "name": "symfony/var-dumper", - "version": "v3.4.19", + "version": "v3.4.22", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git";, - "reference": "6867713afe6c50ade2f34ed6435563b065a52145" + "reference": "2159335b452d929cbb9921fc4eb7d1bfed32d0be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6867713afe6c50ade2f34ed6435563b065a52145";, - "reference": "6867713afe6c50ade2f34ed6435563b065a52145", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2159335b452d929cbb9921fc4eb7d1bfed32d0be";, + "reference": "2159335b452d929cbb9921fc4eb7d1bfed32d0be", "shasum": "" }, "require": { @@ -3289,24 +3337,25 @@ "debug", "dump" ], - "time": "2018-11-20T16:10:26+00:00" + "time": "2019-01-29T16:19:17+00:00" }, { "name": "webmozart/assert", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git";, - "reference": "0df1908962e7a3071564e857d86874dad1ef204a" + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a";, - "reference": "0df1908962e7a3071564e857d86874dad1ef204a", + "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9";, + "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^5.3.3 || ^7.0", + "symfony/polyfill-ctype": "^1.8" }, "require-dev": { "phpunit/phpunit": "^4.6", @@ -3339,7 +3388,7 @@ "check", "validate" ], - "time": "2018-01-29T19:49:41+00:00" + "time": "2018-12-25T11:19:39+00:00" }, { "name": "webmozart/path-util", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.0/config.yaml new/platformsh-cli-3.40.2/config.yaml --- old/platformsh-cli-3.40.0/config.yaml 2019-02-15 17:37:35.000000000 +0100 +++ new/platformsh-cli-3.40.2/config.yaml 2019-02-18 11:22:35.000000000 +0100 @@ -1,7 +1,7 @@ # Metadata about the CLI application itself. application: name: 'Platform.sh CLI' - version: '3.40.0' + version: '3.40.2' executable: 'platform' package_name: 'platformsh/cli' installer_url: 'https://platform.sh/cli/installer' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.0/dist/manifest.json new/platformsh-cli-3.40.2/dist/manifest.json --- old/platformsh-cli-3.40.0/dist/manifest.json 2019-02-15 17:37:35.000000000 +0100 +++ new/platformsh-cli-3.40.2/dist/manifest.json 2019-02-18 11:22:35.000000000 +0100 @@ -1,10 +1,10 @@ [ { "name": "platform.phar", - "sha1": "72d7a75476e28557e49fbd14c1fd3265075a0891", - "sha256": "9d48efeff8ecfa4a0eea0826c6df8dba12827b8f3e9af0f3aa14b2bff299c420", - "url": "https://github.com/platformsh/platformsh-cli/releases/download/v3.40.0/platform.phar";, - "version": "3.40.0", + "sha1": "66eecd90e6872766f7b94825a57e5f9958dbc4d5", + "sha256": "d36648b91dfe8f24c8f38d8be78e48a59ff787bb19cf41a13e7a018c326c5761", + "url": "https://github.com/platformsh/platformsh-cli/releases/download/v3.40.2/platform.phar";, + "version": "3.40.2", "php": { "min": "5.5.9" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.0/src/Command/Db/DbDumpCommand.php new/platformsh-cli-3.40.2/src/Command/Db/DbDumpCommand.php --- old/platformsh-cli-3.40.0/src/Command/Db/DbDumpCommand.php 2019-02-15 17:37:35.000000000 +0100 +++ new/platformsh-cli-3.40.2/src/Command/Db/DbDumpCommand.php 2019-02-18 11:22:35.000000000 +0100 @@ -83,6 +83,13 @@ ); } + // If the database path is not in the list of schemas, we have to + // use that - it probably indicates an integrated Enterprise + // environment. + if (!empty($database['path']) && !in_array($database['path'], $schemas, true)) { + $schemas = [$database['path']]; + } + // Provide the user with a choice of schemas. $choices = []; foreach ($schemas as $schema) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.0/src/Command/Db/DbSqlCommand.php new/platformsh-cli-3.40.2/src/Command/Db/DbSqlCommand.php --- old/platformsh-cli-3.40.0/src/Command/Db/DbSqlCommand.php 2019-02-15 17:37:35.000000000 +0100 +++ new/platformsh-cli-3.40.2/src/Command/Db/DbSqlCommand.php 2019-02-18 11:22:35.000000000 +0100 @@ -69,10 +69,15 @@ ); } - // Provide the user with a choice of schemas. - if (count($schemas) === 1) { + // If the database path is not in the list of schemas, we have to + // use that - it probably indicates an integrated Enterprise + // environment. + if (!empty($database['path']) && !in_array($database['path'], $schemas, true)) { + $schema = $database['path']; + } elseif (count($schemas) === 1) { $schema = reset($schemas); } else { + // Provide the user with a choice of schemas. $choices = []; $schemas[] = '(none)'; $default = ($database['path'] ?: '(none)'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.0/src/Service/Relationships.php new/platformsh-cli-3.40.2/src/Service/Relationships.php --- old/platformsh-cli-3.40.0/src/Service/Relationships.php 2019-02-15 17:37:35.000000000 +0100 +++ new/platformsh-cli-3.40.2/src/Service/Relationships.php 2019-02-18 11:22:35.000000000 +0100 @@ -87,9 +87,15 @@ $choices = []; foreach ($relationships as $name => $relationship) { $serviceCount = count($relationship); - foreach ($relationship as $key => $service) { + foreach ($relationship as $key => $info) { $identifier = $name . ($serviceCount > 1 ? '.' . $key : ''); - $choices[$identifier] = $identifier; + if (isset($info['username']) && (!isset($info['host']) || $info['host'] === '127.0.0.1')) { + $choices[$identifier] = sprintf('%s (%s)', $identifier, $info['username']); + } elseif (isset($info['username'], $info['host'])) { + $choices[$identifier] = sprintf('%s (%s@%s)', $identifier, $info['username'], $info['host']); + } else { + $choices[$identifier] = $identifier; + } } } @@ -98,7 +104,8 @@ if ($input->hasOption('relationship') && ($relationshipName = $input->getOption('relationship'))) { // Normalise the relationship name to remove a trailing ".0". - if (substr($relationshipName, -2) === '.0') { + if (substr($relationshipName, -2) === '.0' + && isset($relationships[$relationshipName]) && count($relationships[$relationshipName]) ===1) { $relationshipName = substr($relationshipName, 0, strlen($relationshipName) - 2); } if (!isset($choices[$relationshipName])) { @@ -109,7 +116,7 @@ } if (!$identifier && count($choices) === 1) { - $identifier = reset($choices); + $identifier = key($choices); } if (!$identifier && !$input->isInteractive()) { @@ -134,16 +141,29 @@ $name = $identifier; $key = 0; } - $service = $relationships[$name][$key]; + $relationship = $relationships[$name][$key]; + + // Ensure the service name is included in the relationship info. + // This is for backwards compatibility with projects that do not have + // this information. + if (!isset($relationship['service'])) { + $appConfig = $this->envVarService->getArrayEnvVar('APPLICATION', $sshUrl); + if (!empty($appConfig['relationships'][$name]) && is_string($appConfig['relationships'][$name])) { + list($serviceName, ) = explode(':', $appConfig['relationships'][$name], 2); + $relationship['service'] = $serviceName; + } + } // Add metadata about the service. - $service['_relationship_name'] = $name; - $service['_relationship_key'] = $key; + $relationship['_relationship_name'] = $name; + $relationship['_relationship_key'] = $key; - return $service; + return $relationship; } /** + * Get the relationships deployed on the remote application. + * * @param string $sshUrl * @param bool $refresh * @@ -151,9 +171,7 @@ */ public function getRelationships($sshUrl, $refresh = false) { - $value = $this->envVarService->getEnvVar('RELATIONSHIPS', $sshUrl, $refresh); - - return json_decode(base64_decode($value), true) ?: []; + return $this->envVarService->getArrayEnvVar('RELATIONSHIPS', $sshUrl, $refresh); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/platformsh-cli-3.40.0/src/Service/RemoteEnvVars.php new/platformsh-cli-3.40.2/src/Service/RemoteEnvVars.php --- old/platformsh-cli-3.40.0/src/Service/RemoteEnvVars.php 2019-02-15 17:37:35.000000000 +0100 +++ new/platformsh-cli-3.40.2/src/Service/RemoteEnvVars.php 2019-02-18 11:22:35.000000000 +0100 @@ -59,6 +59,24 @@ } /** + * Read a complex environment variable (an associative array) from the application. + * + * @see \Platformsh\Cli\Service\RemoteEnvVars::getEnvVar() + * + * @param string $variable + * @param string $sshUrl + * @param bool $refresh + * + * @return array + */ + public function getArrayEnvVar($variable, $sshUrl, $refresh = false) + { + $value = $this->getEnvVar($variable, $sshUrl, $refresh); + + return json_decode(base64_decode($value), true) ?: []; + } + + /** * Clear caches for remote environment variables. * * @param string $sshUrl The SSH URL to the application. ++++++ platformsh-cli-vendor.tar.xz ++++++ ++++ 37119 lines of diff (skipped)
