Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalize composer.json #428

Merged
merged 1 commit into from
Dec 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/[email protected]
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
58 changes: 29 additions & 29 deletions composer.json
Original file line number Diff line number Diff line change
@@ -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": "[email protected]"
}
],
"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",
Expand All @@ -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",
Expand All @@ -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": {
Expand All @@ -68,6 +83,9 @@
"Nucleos\\ProfileBundle\\Tests\\": "tests/"
}
},
"config": {
"sort-packages": true
},
"scripts": {
"post-install-cmd": [
"@composer bin all install --ansi"
Expand All @@ -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"
}
]
}
}
2 changes: 1 addition & 1 deletion vendor-bin/tools/composer.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down