From 7a449a039ada5d361755d809bcd239314aaaa016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Hochd=C3=B6rfer?= Date: Mon, 6 Apr 2020 21:10:56 +0200 Subject: [PATCH] Upgrade CaptainHook dependency --- composer.json | 4 +- composer.lock | 136 +++++++++++++++++++++++++++++++++++++------------- 2 files changed, 104 insertions(+), 36 deletions(-) diff --git a/composer.json b/composer.json index 67a840c..e5025ce 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,8 @@ "phpstan/phpstan": "^0.12.18" }, "require-dev": { - "captainhook/captainhook": "^4.0", - "captainhook/plugin-composer": "^4.0", + "captainhook/captainhook": "^5.1.2", + "captainhook/plugin-composer": "^5.1.3", "phpunit/phpunit": "^7.5", "squizlabs/php_codesniffer": "^3.4", "phing/phing": "^2.16", diff --git a/composer.lock b/composer.lock index bcfce3f..f0ffb20 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "7be36bbfdc497ad8c341a70cbe4a2ce8", + "content-hash": "bd863d9dd30c002705594049818a28a5", "packages": [ { "name": "phpstan/phpstan", @@ -112,46 +112,46 @@ }, { "name": "captainhook/captainhook", - "version": "4.5.8", + "version": "5.1.2", "source": { "type": "git", "url": "https://github.com/CaptainHookPhp/captainhook.git", - "reference": "b89ee9e6b445f44173b2a2a142513d597f490244" + "reference": "3ae89c1f4e2384493a801abb4a6233b77faee888" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CaptainHookPhp/captainhook/zipball/b89ee9e6b445f44173b2a2a142513d597f490244", - "reference": "b89ee9e6b445f44173b2a2a142513d597f490244", + "url": "https://api.github.com/repos/CaptainHookPhp/captainhook/zipball/3ae89c1f4e2384493a801abb4a6233b77faee888", + "reference": "3ae89c1f4e2384493a801abb4a6233b77faee888", "shasum": "" }, "require": { "ext-json": "*", - "ext-simplexml": "*", "ext-spl": "*", - "php": "^7.1", - "sebastianfeldmann/camino": "^0.9.1", + "ext-xml": "*", + "php": "^7.2", + "sebastianfeldmann/camino": "^0.9.2", "sebastianfeldmann/cli": "^3.0", - "sebastianfeldmann/git": "^2.2", - "symfony/console": ">=2.7" + "sebastianfeldmann/git": "^3.1", + "symfony/console": "^2.7 || ^3.0 || ^4.0", + "symfony/process": "^2.7 || ^3.0 || ^4.0" }, "replace": { "sebastianfeldmann/captainhook": "*" }, "require-dev": { "composer/composer": "~1", - "mikey179/vfsstream": "~1", - "phpunit/phpunit": "^7.0" + "mikey179/vfsstream": "~1" }, "bin": [ - "captainhook", - "captainhook-run" + "bin/captainhook" ], "type": "library", "extra": { - "captainhook-config": "captainhook.json", - "captainhook-git-dir": ".git", "branch-alias": { - "dev-master": "4.3.x-dev" + "dev-master": "6.0.x-dev" + }, + "captainhook": { + "config": "captainhook.json" } }, "autoload": { @@ -175,28 +175,35 @@ "commit-msg", "git", "hooks", + "post-merge", "pre-commit", "pre-push", "prepare-commit-msg" ], - "time": "2019-12-02T15:20:27+00:00" + "funding": [ + { + "url": "https://github.com/sebastianfeldmann", + "type": "github" + } + ], + "time": "2020-03-03T16:00:53+00:00" }, { "name": "captainhook/plugin-composer", - "version": "4.0.0", + "version": "5.1.3", "source": { "type": "git", "url": "https://github.com/CaptainHookPhp/plugin-composer.git", - "reference": "61b6c505e0e6855e7ad653f9efe0ae81304340e0" + "reference": "097b03f6bcee40a3a396174a8254f072a9b015fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/CaptainHookPhp/plugin-composer/zipball/61b6c505e0e6855e7ad653f9efe0ae81304340e0", - "reference": "61b6c505e0e6855e7ad653f9efe0ae81304340e0", + "url": "https://api.github.com/repos/CaptainHookPhp/plugin-composer/zipball/097b03f6bcee40a3a396174a8254f072a9b015fe", + "reference": "097b03f6bcee40a3a396174a8254f072a9b015fe", "shasum": "" }, "require": { - "captainhook/captainhook": "^4.0", + "captainhook/captainhook": "^5.0", "composer-plugin-api": "^1.1", "php": "^7.1" }, @@ -230,7 +237,7 @@ } ], "description": "Composer-Plugin handling your git-hooks", - "time": "2019-01-10T19:29:52+00:00" + "time": "2020-03-04T16:33:48+00:00" }, { "name": "composer/ca-bundle", @@ -1847,30 +1854,28 @@ }, { "name": "sebastianfeldmann/git", - "version": "2.4.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/sebastianfeldmann/git.git", - "reference": "d52744f4e24e2ad4aef49c303b8397af0b1dffed" + "reference": "e7a939afe33eb1a8f9af478b9e9fe9f15410709d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianfeldmann/git/zipball/d52744f4e24e2ad4aef49c303b8397af0b1dffed", - "reference": "d52744f4e24e2ad4aef49c303b8397af0b1dffed", + "url": "https://api.github.com/repos/sebastianfeldmann/git/zipball/e7a939afe33eb1a8f9af478b9e9fe9f15410709d", + "reference": "e7a939afe33eb1a8f9af478b9e9fe9f15410709d", "shasum": "" }, "require": { "ext-json": "*", + "ext-xml": "*", "php": "^7.1", - "sebastianfeldmann/cli": "^3.0.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.5" + "sebastianfeldmann/cli": "^3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -1893,7 +1898,7 @@ "keywords": [ "git" ], - "time": "2019-09-30T15:04:34+00:00" + "time": "2020-02-07T11:47:04+00:00" }, { "name": "sensiolabs/security-checker", @@ -2299,6 +2304,69 @@ ], "time": "2020-02-27T09:26:54+00:00" }, + { + "name": "symfony/process", + "version": "v4.4.7", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "3e40e87a20eaf83a1db825e1fa5097ae89042db3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/3e40e87a20eaf83a1db825e1fa5097ae89042db3", + "reference": "3e40e87a20eaf83a1db825e1fa5097ae89042db3", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.4-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "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 Process Component", + "homepage": "https://symfony.com", + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-03-27T16:54:36+00:00" + }, { "name": "symfony/service-contracts", "version": "v2.0.1",