From ae9c718a116f02165cc855cf9a5eedeaa4926a9a Mon Sep 17 00:00:00 2001 From: Christoph Reiter <reiter.christoph@gmail.com> Date: Wed, 1 Sep 2021 11:33:06 +0200 Subject: [PATCH] Make composer-git-hooks a non-dev dependency It gets called during composer install which we need when deploying without dev packages. Disabling scripts would work, but then the symfony install commands would be skipped too... --- composer.json | 2 +- composer.lock | 148 +++++++++++++++++++++++++------------------------- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/composer.json b/composer.json index c6a391e..61d494a 100644 --- a/composer.json +++ b/composer.json @@ -4,6 +4,7 @@ "license": "AGPL-3.0-or-later", "require": { "php": "^7.3", + "brainmaestro/composer-git-hooks": "^2.8", "dbp/relay-core-bundle": "^0.1.10", "dbp/relay-keycloak-bundle": "^0.1.1", "symfony/apache-pack": "^1.0", @@ -96,7 +97,6 @@ } }, "require-dev": { - "brainmaestro/composer-git-hooks": "^2.8", "friendsofphp/php-cs-fixer": "^3.0", "phpstan/phpstan": "^0.12.7", "phpstan/phpstan-phpunit": "^0.12.6", diff --git a/composer.lock b/composer.lock index 8bc824e..b9d02a9 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": "fd3773f0de09f512b764a482b79ba2ee", + "content-hash": "40e5f05e6836c6efebf49ca7c37778b9", "packages": [ { "name": "api-platform/core", @@ -165,6 +165,79 @@ ], "time": "2021-06-15T16:53:33+00:00" }, + { + "name": "brainmaestro/composer-git-hooks", + "version": "v2.8.5", + "source": { + "type": "git", + "url": "https://github.com/BrainMaestro/composer-git-hooks.git", + "reference": "ffed8803690ac12214082120eee3441b00aa390e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/BrainMaestro/composer-git-hooks/zipball/ffed8803690ac12214082120eee3441b00aa390e", + "reference": "ffed8803690ac12214082120eee3441b00aa390e", + "shasum": "" + }, + "require": { + "php": "^5.6 || >=7.0", + "symfony/console": "^3.2 || ^4.0 || ^5.0" + }, + "require-dev": { + "ext-json": "*", + "friendsofphp/php-cs-fixer": "^2.9", + "phpunit/phpunit": "^5.7 || ^7.0" + }, + "bin": [ + "cghooks" + ], + "type": "library", + "extra": { + "hooks": { + "pre-commit": "composer check-style", + "pre-push": [ + "composer test", + "appver=$(grep -o -E '\\d.\\d.\\d' cghooks)", + "tag=$(git describe --tags --abbrev=0)", + "if [ \"$tag\" != \"v$appver\" ]; then", + "echo \"The most recent tag $tag does not match the application version $appver\\n\"", + "tag=${tag#v}", + "sed -i -E \"s/$appver/$tag/\" cghooks", + "exit 1", + "fi" + ] + } + }, + "autoload": { + "psr-4": { + "BrainMaestro\\GitHooks\\": "src/" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ezinwa Okpoechi", + "email": "brainmaestro@outlook.com" + } + ], + "description": "Easily manage git hooks in your composer config", + "keywords": [ + "HOOK", + "composer", + "git" + ], + "support": { + "issues": "https://github.com/BrainMaestro/composer-git-hooks/issues", + "source": "https://github.com/BrainMaestro/composer-git-hooks/tree/v2.8.5" + }, + "time": "2021-02-08T15:59:11+00:00" + }, { "name": "brick/math", "version": "0.9.3", @@ -6883,79 +6956,6 @@ ], "time": "2021-03-30T17:13:30+00:00" }, - { - "name": "brainmaestro/composer-git-hooks", - "version": "v2.8.5", - "source": { - "type": "git", - "url": "https://github.com/BrainMaestro/composer-git-hooks.git", - "reference": "ffed8803690ac12214082120eee3441b00aa390e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/BrainMaestro/composer-git-hooks/zipball/ffed8803690ac12214082120eee3441b00aa390e", - "reference": "ffed8803690ac12214082120eee3441b00aa390e", - "shasum": "" - }, - "require": { - "php": "^5.6 || >=7.0", - "symfony/console": "^3.2 || ^4.0 || ^5.0" - }, - "require-dev": { - "ext-json": "*", - "friendsofphp/php-cs-fixer": "^2.9", - "phpunit/phpunit": "^5.7 || ^7.0" - }, - "bin": [ - "cghooks" - ], - "type": "library", - "extra": { - "hooks": { - "pre-commit": "composer check-style", - "pre-push": [ - "composer test", - "appver=$(grep -o -E '\\d.\\d.\\d' cghooks)", - "tag=$(git describe --tags --abbrev=0)", - "if [ \"$tag\" != \"v$appver\" ]; then", - "echo \"The most recent tag $tag does not match the application version $appver\\n\"", - "tag=${tag#v}", - "sed -i -E \"s/$appver/$tag/\" cghooks", - "exit 1", - "fi" - ] - } - }, - "autoload": { - "psr-4": { - "BrainMaestro\\GitHooks\\": "src/" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ezinwa Okpoechi", - "email": "brainmaestro@outlook.com" - } - ], - "description": "Easily manage git hooks in your composer config", - "keywords": [ - "HOOK", - "composer", - "git" - ], - "support": { - "issues": "https://github.com/BrainMaestro/composer-git-hooks/issues", - "source": "https://github.com/BrainMaestro/composer-git-hooks/tree/v2.8.5" - }, - "time": "2021-02-08T15:59:11+00:00" - }, { "name": "composer/package-versions-deprecated", "version": "1.11.99.2", -- GitLab