From 62b9c8426675df84b4b841e3647271598d039d4d Mon Sep 17 00:00:00 2001 From: Krystian Szymukowicz Date: Fri, 7 Jul 2017 20:11:02 +0200 Subject: [PATCH 01/12] Added possibility to use callable when setting 'default_stage'. --- CHANGELOG.md | 3 ++- src/Deployer.php | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cefc53f91..1d89eb9cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ ## master [v4.3.0...master](https://github.com/deployphp/deployer/compare/v4.3.0...master) --- +### Added +- Added possibility to use callable when setting 'default_stage'. ## v4.3.0 [v4.2.1...v4.3.0](https://github.com/deployphp/deployer/compare/v4.2.1...v4.3.0) diff --git a/src/Deployer.php b/src/Deployer.php index cbe123167..3c99d027e 100644 --- a/src/Deployer.php +++ b/src/Deployer.php @@ -89,7 +89,11 @@ public function __construct(Application $console, Console\Input\InputInterface $ return new Task\ScriptManager($c['tasks']); }; $this['stageStrategy'] = function ($c) { - return new StageStrategy($c['servers'], $c['environments'], $c['config']['default_stage']); + $defaultStage = $c['config']['default_stage']; + if (is_object($defaultStage) && ($defaultStage instanceof \Closure)) { + $defaultStage = call_user_func($defaultStage); + } + return new StageStrategy($c['servers'], $c['environments'], $defaultStage); }; $this['onFailure'] = function () { return new Collection(); From 18799bd0b95c8127c72667b8a579b0053736a8fb Mon Sep 17 00:00:00 2001 From: Anton Medvedev Date: Fri, 21 Jul 2017 18:04:26 +0700 Subject: [PATCH 02/12] Update CHANGELOG.md --- CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d89eb9cb..581a9562b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,17 @@ # Changelog -## master -[v4.3.0...master](https://github.com/deployphp/deployer/compare/v4.3.0...master) +## 4.x +[v4.3.1...4.x](https://github.com/deployphp/deployer/compare/v4.3.1...4.x) + +- + +## v4.3.1 +[v4.3.0...v4.3.1](https://github.com/deployphp/deployer/compare/v4.3.0...v4.3.1) ### Added - Added possibility to use callable when setting 'default_stage'. + ## v4.3.0 [v4.2.1...v4.3.0](https://github.com/deployphp/deployer/compare/v4.2.1...v4.3.0) From b04df783ae360ff10b9ee28a3b19050f472134f6 Mon Sep 17 00:00:00 2001 From: Wesley Lancel Date: Thu, 19 Oct 2017 08:17:04 +0200 Subject: [PATCH 03/12] Fix time format for touch when deploying assets --- CHANGELOG.md | 3 ++- recipe/symfony.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 581a9562b..3873d1946 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ ## 4.x [v4.3.1...4.x](https://github.com/deployphp/deployer/compare/v4.3.1...4.x) -- +### Changed +- Fixed bug where wrong time format is passed to touch when deploying assets [#1391] ## v4.3.1 [v4.3.0...v4.3.1](https://github.com/deployphp/deployer/compare/v4.3.0...v4.3.1) diff --git a/recipe/symfony.php b/recipe/symfony.php index 6ac0ea735..cf7b85a72 100644 --- a/recipe/symfony.php +++ b/recipe/symfony.php @@ -81,7 +81,7 @@ return "{{release_path}}/$asset"; }, get('assets'))); - run(sprintf('find %s -exec touch -t %s {} \';\' &> /dev/null || true', $assets, date('Ymdhi.s'))); + run(sprintf('find %s -exec touch -t %s {} \';\' &> /dev/null || true', $assets, date('YmdHi.s'))); })->desc('Normalize asset timestamps'); From 6aeaa5fc9bf7ad96612bfd35dc2d47abf03edc07 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Fri, 8 Dec 2017 12:24:15 +0100 Subject: [PATCH 04/12] support php7 \Errors in CommandEvent --- src/Console/CommandEvent.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Console/CommandEvent.php b/src/Console/CommandEvent.php index 8e7ba0ff5..96ad77884 100644 --- a/src/Console/CommandEvent.php +++ b/src/Console/CommandEvent.php @@ -24,10 +24,10 @@ class CommandEvent * @param $command * @param $input * @param $output - * @param $exception + * @param \Exception|\Error $exception * @param $exitCode */ - public function __construct(Command $command, InputInterface $input, OutputInterface $output, \Exception $exception = null, $exitCode = 0) + public function __construct(Command $command, InputInterface $input, OutputInterface $output, $exception = null, $exitCode = 0) { $this->command = $command; $this->input = $input; @@ -61,7 +61,7 @@ public function getOutput() } /** - * @return \Exception + * @return \Exception|\Error */ public function getException() { From 431cd95cd53ae5721fe7c149b0cde73f3a4b48cc Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Fri, 8 Dec 2017 12:26:12 +0100 Subject: [PATCH 05/12] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3873d1946..68534dc3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ ### Changed - Fixed bug where wrong time format is passed to touch when deploying assets [#1391] +### Fixed +- support php7 \Errors in CommandEvent [#1442] + ## v4.3.1 [v4.3.0...v4.3.1](https://github.com/deployphp/deployer/compare/v4.3.0...v4.3.1) From 1e73d1c68652be6251acfe585f7cf4f7a6d1c842 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Fri, 8 Dec 2017 14:19:38 +0100 Subject: [PATCH 06/12] Update CommandEvent.php --- src/Console/CommandEvent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Console/CommandEvent.php b/src/Console/CommandEvent.php index 96ad77884..a839618c7 100644 --- a/src/Console/CommandEvent.php +++ b/src/Console/CommandEvent.php @@ -24,7 +24,7 @@ class CommandEvent * @param $command * @param $input * @param $output - * @param \Exception|\Error $exception + * @param \Throwable $exception * @param $exitCode */ public function __construct(Command $command, InputInterface $input, OutputInterface $output, $exception = null, $exitCode = 0) From b634ac254250d635c0c29f9797058e9750242513 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Fri, 8 Dec 2017 14:19:52 +0100 Subject: [PATCH 07/12] Update CommandEvent.php --- src/Console/CommandEvent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Console/CommandEvent.php b/src/Console/CommandEvent.php index a839618c7..001a3e4b0 100644 --- a/src/Console/CommandEvent.php +++ b/src/Console/CommandEvent.php @@ -61,7 +61,7 @@ public function getOutput() } /** - * @return \Exception|\Error + * @return \Throwable */ public function getException() { From 0fda27f124943bfcecf714f010c7747a4be66d04 Mon Sep 17 00:00:00 2001 From: Anton Medvedev Date: Thu, 14 Dec 2017 13:41:41 +0700 Subject: [PATCH 08/12] Update CHANGELOG.md --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68534dc3e..4a0bbf489 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ # Changelog ## 4.x -[v4.3.1...4.x](https://github.com/deployphp/deployer/compare/v4.3.1...4.x) + +## 4.3.2 +[v4.3.1...4.3.2](https://github.com/deployphp/deployer/compare/v4.3.1...4.3.2) ### Changed - Fixed bug where wrong time format is passed to touch when deploying assets [#1391] From 30c7f43f60a4efcb707ba8b9513905aee79096d8 Mon Sep 17 00:00:00 2001 From: Mathias Brodala Date: Tue, 18 Sep 2018 09:34:20 +0200 Subject: [PATCH 09/12] moved symfony finder to dev-dependency (#1702) --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 0602a8249..09ff5def8 100644 --- a/composer.json +++ b/composer.json @@ -32,13 +32,13 @@ "phpseclib/phpseclib": "~2.0", "pimple/pimple": "~3.0", "symfony/console": "~2.6|~3.0", - "symfony/finder": "~2.6|~3.0", "symfony/process": "~2.6|~3.0", "symfony/yaml": "~2.6|~3.0" }, "require-dev": { "deployer/phar-update": "~2.0", - "phpunit/phpunit": "~5.7" + "phpunit/phpunit": "~5.7", + "symfony/finder": "~2.6|~3.0" }, "suggest": { "ext-sockets": "For parallel deployment" From 8fc00d4877b7d15c385cba4cf0eef4e78c4e9b75 Mon Sep 17 00:00:00 2001 From: Mathias Brodala Date: Tue, 18 Sep 2018 12:23:44 +0200 Subject: [PATCH 10/12] Allow installation with elfet/pure v3 (#1703) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 09ff5def8..dbc0e8f88 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ ], "require": { "php": ">=5.6.0", - "elfet/pure": "~2.0", + "elfet/pure": "~2.0|~3.0", "monolog/monolog": "^1.21", "phpseclib/phpseclib": "~2.0", "pimple/pimple": "~3.0", From 5674460ae037be9687a071e711b0fc0228645ede Mon Sep 17 00:00:00 2001 From: Mathias Brodala Date: Thu, 20 Sep 2018 12:52:04 +0200 Subject: [PATCH 11/12] Update Composer lock (#1706) --- composer.lock | 127 +++++++++++++++++++++++++------------------------- 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/composer.lock b/composer.lock index 43c367cf2..ccdb3f7a1 100644 --- a/composer.lock +++ b/composer.lock @@ -1,35 +1,35 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "41315607c3aa4cab0f8994a63fea3e6b", + "content-hash": "4e82b74892a67f56cc6bdf0a22e0e35f", "packages": [ { "name": "elfet/pure", - "version": "v2.0.0", + "version": "v3.0.0", "source": { "type": "git", - "url": "https://github.com/elfet/purephp.git", - "reference": "9d6422d31b89c4f79c322df2a7772936a8bc74a1" + "url": "https://github.com/antonmedv/purephp.git", + "reference": "05aa6b44cea9b0457ec1e5e67e8278cd89d47f21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/elfet/purephp/zipball/9d6422d31b89c4f79c322df2a7772936a8bc74a1", - "reference": "9d6422d31b89c4f79c322df2a7772936a8bc74a1", + "url": "https://api.github.com/repos/antonmedv/purephp/zipball/05aa6b44cea9b0457ec1e5e67e8278cd89d47f21", + "reference": "05aa6b44cea9b0457ec1e5e67e8278cd89d47f21", "shasum": "" }, "require": { "react/react": "~0.4", - "symfony/console": "~2.6|~3.0", - "symfony/debug": "~2.6|~3.0", - "symfony/expression-language": "~2.6|~3.0" + "symfony/console": "~2.6 || ~3.0 || ~4.0", + "symfony/debug": "~2.6 || ~3.0 || ~4.0", + "symfony/expression-language": "~2.6 || ~3.0 || ~4.0" }, "require-dev": { "phpunit/phpunit": "~4.4", - "symfony/finder": "~2.6|~3.0", - "symfony/process": "~2.6|~3.0" + "symfony/finder": "~2.6 || ~3.0 || ~4.0", + "symfony/process": "~2.6 || ~3.0 || ~4.0" }, "bin": [ "pure" @@ -47,11 +47,11 @@ "authors": [ { "name": "Anton Medvedev", - "email": "anton@medv.io" + "email": "anton@elfet.ru" } ], "description": "Pure PHP key-value storage", - "time": "2016-03-19T14:26:03+00:00" + "time": "2018-09-18T08:59:27+00:00" }, { "name": "evenement/evenement", @@ -925,6 +925,7 @@ "keywords": [ "Socket" ], + "abandoned": "react/socket", "time": "2016-12-06T10:54:49+00:00" }, { @@ -1208,55 +1209,6 @@ "homepage": "https://symfony.com", "time": "2017-01-02T20:32:22+00:00" }, - { - "name": "symfony/finder", - "version": "v3.2.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/finder.git", - "reference": "8c71141cae8e2957946b403cc71a67213c0380d6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6", - "reference": "8c71141cae8e2957946b403cc71a67213c0380d6", - "shasum": "" - }, - "require": { - "php": ">=5.5.9" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Finder\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Finder Component", - "homepage": "https://symfony.com", - "time": "2017-01-02T20:32:22+00:00" - }, { "name": "symfony/polyfill-mbstring", "version": "v1.3.0", @@ -2681,6 +2633,55 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2016-10-03T07:35:21+00:00" }, + { + "name": "symfony/finder", + "version": "v3.2.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "8c71141cae8e2957946b403cc71a67213c0380d6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6", + "reference": "8c71141cae8e2957946b403cc71a67213c0380d6", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "https://symfony.com", + "time": "2017-01-02T20:32:22+00:00" + }, { "name": "webmozart/assert", "version": "1.2.0", From 407a183f6ddfe56421da4d0e9bc72ea941d0d38d Mon Sep 17 00:00:00 2001 From: piotr-lottestyle <33749856+piotr-lottestyle@users.noreply.github.com> Date: Thu, 24 Jan 2019 17:52:08 +0100 Subject: [PATCH 12/12] Revert "moved symfony finder to dev-dependency (#1702)" as it breaks upload() function (#1801) This reverts commit 30c7f43f --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index dbc0e8f88..8ca523406 100644 --- a/composer.json +++ b/composer.json @@ -32,13 +32,13 @@ "phpseclib/phpseclib": "~2.0", "pimple/pimple": "~3.0", "symfony/console": "~2.6|~3.0", + "symfony/finder": "~2.6|~3.0", "symfony/process": "~2.6|~3.0", "symfony/yaml": "~2.6|~3.0" }, "require-dev": { "deployer/phar-update": "~2.0", - "phpunit/phpunit": "~5.7", - "symfony/finder": "~2.6|~3.0" + "phpunit/phpunit": "~5.7" }, "suggest": { "ext-sockets": "For parallel deployment"