From 9dd9b40e510f0c06b2f6d0f07780b99409edcfca Mon Sep 17 00:00:00 2001 From: core23 Date: Thu, 16 Dec 2021 19:50:30 +0100 Subject: [PATCH] Normalize composer.json --- .github/workflows/continuous-integration.yml | 14 ++--- composer.json | 58 ++++++++++---------- vendor-bin/tools/composer.json | 2 +- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 16f759ac..d9c06269 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -44,7 +44,7 @@ jobs: php${{ matrix.php-version }}-composer- - name: "Install locked dependencies with composer" - run: composer install --no-interaction --no-progress --no-suggest + run: composer install --no-interaction --no-progress - name: "Run localheinz/composer-normalize" run: composer normalize --dry-run @@ -93,7 +93,7 @@ jobs: ${{ matrix.php-version }}-composer- - name: "Install locked dependencies with composer" - run: composer install --no-interaction --no-progress --no-suggest + run: composer install --no-interaction --no-progress - name: "Run phpstan/phpstan" run: composer phpstan @@ -136,7 +136,7 @@ jobs: php-version: ${{ matrix.php-version }} - name: 'Install Symfony Flex' - run: composer global require --prefer-dist --no-progress --no-suggest --ansi symfony/flex + run: composer global require --prefer-dist --no-progress --ansi symfony/flex - name: "Cache dependencies installed with composer" uses: actions/cache@v2.1.6 @@ -151,11 +151,11 @@ jobs: - name: "Install lowest dependencies with composer" if: matrix.dependencies == 'lowest' - run: composer update --no-interaction --no-progress --no-suggest --prefer-lowest + run: composer update --no-interaction --no-progress --prefer-lowest - name: "Install highest dependencies with composer" if: matrix.dependencies == 'highest' - run: composer update --no-interaction --no-progress --no-suggest + run: composer update --no-interaction --no-progress - name: "Run tests with phpunit/phpunit" run: composer test @@ -190,7 +190,7 @@ jobs: php${{ matrix.php-version }}-composer- - name: "Install locked dependencies with composer" - run: composer install --no-interaction --no-progress --no-suggest + run: composer install --no-interaction --no-progress - name: "Collect code coverage with pcov and phpunit/phpunit" run: composer coverage @@ -230,7 +230,7 @@ jobs: php${{ matrix.php-version }}-composer- - name: "Install locked dependencies with composer" - run: composer install --no-interaction --no-progress --no-suggest + run: composer install --no-interaction --no-progress - name: "Download infection" run: wget -O infection https://github.com/infection/infection/releases/download/0.19.0/infection.phar && chmod +x infection diff --git a/composer.json b/composer.json index 8bb76f17..64476448 100644 --- a/composer.json +++ b/composer.json @@ -1,21 +1,39 @@ { "name": "nucleos/profile-bundle", - "type": "symfony-bundle", "description": "Registration and profile management for symfony", + "license": "MIT", + "type": "symfony-bundle", "keywords": [ "user management", "profile", "registration", "symfony" ], - "homepage": "https://nucleos.rocks", - "license": "MIT", "authors": [ { "name": "Christian Gripp", "email": "mail@core23.de" } ], + "homepage": "https://nucleos.rocks", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/core23" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/core23" + }, + { + "type": "ko-fi", + "url": "https://ko-fi.com/core23" + }, + { + "type": "other", + "url": "https://donate.core23.de" + } + ], "require": { "php": "^7.3 || ^8.0", "nucleos/user-bundle": "^1.7", @@ -40,11 +58,6 @@ "symfony/validator": "^4.4 || ^5.0", "twig/twig": "^2.14 || ^3.1" }, - "conflict": { - "doctrine/doctrine-bundle": "<1.12", - "doctrine/orm": "<2.7", - "symfony/doctrine-bridge": "<4.4" - }, "require-dev": { "alcaeus/mongo-php-adapter": "^1.1", "bamarni/composer-bin-plugin": "^1.3", @@ -55,8 +68,10 @@ "symfony/doctrine-bridge": "^4.4 || ^5.0", "symfony/yaml": "^4.4 || ^5.0" }, - "config": { - "sort-packages": true + "conflict": { + "doctrine/doctrine-bundle": "<1.12", + "doctrine/orm": "<2.7", + "symfony/doctrine-bridge": "<4.4" }, "autoload": { "psr-4": { @@ -68,6 +83,9 @@ "Nucleos\\ProfileBundle\\Tests\\": "tests/" } }, + "config": { + "sort-packages": true + }, "scripts": { "post-install-cmd": [ "@composer bin all install --ansi" @@ -87,23 +105,5 @@ "phpmd": "vendor/bin/phpmd src,tests ansi phpmd.xml", "phpstan": "vendor/bin/phpstan analyse", "test": "vendor/bin/phpunit --colors=always" - }, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/core23" - }, - { - "type": "opencollective", - "url": "https://opencollective.com/core23" - }, - { - "type": "ko-fi", - "url": "https://ko-fi.com/core23" - }, - { - "type": "other", - "url": "https://donate.core23.de" - } - ] + } } diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json index f2ecdb7d..1c59a220 100644 --- a/vendor-bin/tools/composer.json +++ b/vendor-bin/tools/composer.json @@ -1,7 +1,7 @@ { "name": "nucleos/dev-tools", - "type": "project", "description": "Development tools that do not conflict the project dependencies", + "type": "project", "require-dev": { "friendsofphp/php-cs-fixer": "^3.0", "jangregor/phpstan-prophecy": "^0.8",