Skip to content

Commit 31a9afe

Browse files
authored
Normalize composer.json (#1258)
* Add new cs check for composer.json * Normalize composer.json
1 parent c2413ad commit 31a9afe

File tree

2 files changed

+41
-30
lines changed

2 files changed

+41
-30
lines changed

.github/workflows/continuous-integration.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@ jobs:
1414
php-version: '7.4'
1515
coverage: 'none'
1616
extensions: 'json, mbstring, tokenizer'
17-
tools: 'php-cs-fixer:2.16.4'
17+
tools: 'composer-normalize, php-cs-fixer:2.16.4'
1818

1919
- name: 'Display tools versions'
2020
run: |
21+
composer-normalize --version
2122
php-cs-fixer --version
2223
2324
- name: 'Check PHP code'
2425
run: 'php-cs-fixer fix --diff --dry-run --using-cache=false'
26+
27+
- name: 'Check composer.json'
28+
run: 'composer-normalize --diff --dry-run --no-update-lock'
29+
if: 'always()'

composer.json

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
"name": "mopa/bootstrap-bundle",
33
"type": "symfony-bundle",
44
"description": "Easy integration of twitters bootstrap into symfony2",
5-
"keywords": ["form", "extra form", "bootstrap", "bootstrap form", "template"],
5+
"keywords": [
6+
"form",
7+
"extra form",
8+
"bootstrap",
9+
"bootstrap form",
10+
"template"
11+
],
612
"license": "MIT",
713
"authors": [
814
{
@@ -14,49 +20,49 @@
1420
"homepage": "https://github.com/phiamo/MopaBootstrapBundle/contributors"
1521
}
1622
],
17-
"autoload": {
18-
"psr-4": {
19-
"Mopa\\Bundle\\BootstrapBundle\\": ""
20-
},
21-
"exclude-from-classmap": [
22-
"/Tests/"
23-
]
24-
},
2523
"require": {
26-
"symfony/framework-bundle": "~2.3|~3.0|^4.0",
27-
"symfony/twig-bundle": "~2.3|~3.0|^4.0",
28-
"symfony/form": "~2.3|~3.0|^4.0",
29-
"symfony/console": "~2.3|~3.0|^4.0",
30-
"twig/twig": "^1.40 || ^2.9",
31-
"mopa/composer-bridge": "~1.3"
32-
},
33-
"require-dev": {
34-
"phpunit/phpunit": "~6.0",
35-
"symfony/security-bundle": "~2.3|~3.0|^4.0",
36-
"symfony/translation": "~2.3|~3.0|^4.0"
24+
"mopa/composer-bridge": "^1.3",
25+
"symfony/console": "^2.3 || ^3.0 || ^4.0",
26+
"symfony/form": "^2.3 || ^3.0 || ^4.0",
27+
"symfony/framework-bundle": "^2.3 || ^3.0 || ^4.0",
28+
"symfony/twig-bundle": "^2.3 || ^3.0 || ^4.0",
29+
"twig/twig": "^1.40 || ^2.9"
3730
},
3831
"conflict": {
3932
"symfony/twig-bridge": "<2.3"
4033
},
41-
"suggest": {
42-
"twbs/bootstrap": ">2.0,<4.0-dev",
43-
"knplabs/knp-paginator-bundle": "~2.3",
34+
"require-dev": {
35+
"phpunit/phpunit": "^6.0",
36+
"symfony/security-bundle": "^2.3 || ^3.0 || ^4.0",
37+
"symfony/translation": "^2.3 || ^3.0 || ^4.0"
38+
},
39+
"suggest": {
40+
"craue/formflow-bundle": "~2.0",
4441
"knplabs/knp-menu-bundle": "~2.0@dev",
42+
"knplabs/knp-paginator-bundle": "~2.3",
4543
"mopa/bootstrap-sandbox-bundle": "~2.3",
46-
"craue/formflow-bundle": "~2.0",
44+
"twbs/bootstrap": ">2.0,<4.0-dev",
4745
"twbs/bootstrap-sass": "v3.1.1"
4846
},
47+
"extra": {
48+
"branch-alias": {
49+
"dev-master": "3.x-dev"
50+
}
51+
},
52+
"autoload": {
53+
"psr-4": {
54+
"Mopa\\Bundle\\BootstrapBundle\\": ""
55+
},
56+
"exclude-from-classmap": [
57+
"/Tests/"
58+
]
59+
},
4960
"scripts": {
5061
"post-install-cmd": [
5162
"Mopa\\Bundle\\BootstrapBundle\\Composer\\ScriptHandler::postInstallSymlinkTwitterBootstrap"
5263
],
5364
"post-update-cmd": [
5465
"Mopa\\Bundle\\BootstrapBundle\\Composer\\ScriptHandler::postInstallSymlinkTwitterBootstrap"
5566
]
56-
},
57-
"extra": {
58-
"branch-alias": {
59-
"dev-master": "3.x-dev"
60-
}
6167
}
6268
}

0 commit comments

Comments
 (0)