Normalize composer.json (#1258)

* Add new cs check for composer.json * Normalize composer.json
phiamo · Oct 6, 2020 · 31a9afe · 31a9afe
1 parent c2413ad
commit 31a9afe
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 30 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -14,11 +14,16 @@ jobs:
           php-version: '7.4'
           coverage: 'none'
           extensions: 'json, mbstring, tokenizer'
-          tools: 'php-cs-fixer:2.16.4'
+          tools: 'composer-normalize, php-cs-fixer:2.16.4'
 
       - name: 'Display tools versions'
         run: |
+          composer-normalize --version
           php-cs-fixer --version
 
       - name: 'Check PHP code'
         run: 'php-cs-fixer fix --diff --dry-run --using-cache=false'
+
+      - name: 'Check composer.json'
+        run: 'composer-normalize --diff --dry-run --no-update-lock'
+        if: 'always()'
diff --git a/composer.json b/composer.json
@@ -2,7 +2,13 @@
     "name": "mopa/bootstrap-bundle",
     "type": "symfony-bundle",
     "description": "Easy integration of twitters bootstrap into symfony2",
-    "keywords": ["form", "extra form", "bootstrap", "bootstrap form", "template"],
+    "keywords": [
+        "form",
+        "extra form",
+        "bootstrap",
+        "bootstrap form",
+        "template"
+    ],
     "license": "MIT",
     "authors": [
         {
@@ -14,49 +20,49 @@
             "homepage": "https://github.com/phiamo/MopaBootstrapBundle/contributors"
         }
     ],
-    "autoload": {
-        "psr-4": {
-            "Mopa\\Bundle\\BootstrapBundle\\": ""
-        },
-        "exclude-from-classmap": [
-            "/Tests/"
-        ]
-    },
     "require": {
-        "symfony/framework-bundle": "~2.3|~3.0|^4.0",
-        "symfony/twig-bundle": "~2.3|~3.0|^4.0",
-        "symfony/form": "~2.3|~3.0|^4.0",
-        "symfony/console": "~2.3|~3.0|^4.0",
-        "twig/twig": "^1.40 || ^2.9",
-        "mopa/composer-bridge": "~1.3"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "~6.0",
-        "symfony/security-bundle": "~2.3|~3.0|^4.0",
-        "symfony/translation": "~2.3|~3.0|^4.0"
+        "mopa/composer-bridge": "^1.3",
+        "symfony/console": "^2.3 || ^3.0 || ^4.0",
+        "symfony/form": "^2.3 || ^3.0 || ^4.0",
+        "symfony/framework-bundle": "^2.3 || ^3.0 || ^4.0",
+        "symfony/twig-bundle": "^2.3 || ^3.0 || ^4.0",
+        "twig/twig": "^1.40 || ^2.9"
     },
     "conflict": {
         "symfony/twig-bridge": "<2.3"
     },
-    "suggest":  {
-        "twbs/bootstrap": ">2.0,<4.0-dev",
-        "knplabs/knp-paginator-bundle": "~2.3",
+    "require-dev": {
+        "phpunit/phpunit": "^6.0",
+        "symfony/security-bundle": "^2.3 || ^3.0 || ^4.0",
+        "symfony/translation": "^2.3 || ^3.0 || ^4.0"
+    },
+    "suggest": {
+        "craue/formflow-bundle": "~2.0",
         "knplabs/knp-menu-bundle": "~2.0@dev",
+        "knplabs/knp-paginator-bundle": "~2.3",
         "mopa/bootstrap-sandbox-bundle": "~2.3",
-        "craue/formflow-bundle": "~2.0",
+        "twbs/bootstrap": ">2.0,<4.0-dev",
         "twbs/bootstrap-sass": "v3.1.1"
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.x-dev"
+        }
+    },
+    "autoload": {
+        "psr-4": {
+            "Mopa\\Bundle\\BootstrapBundle\\": ""
+        },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
     "scripts": {
         "post-install-cmd": [
             "Mopa\\Bundle\\BootstrapBundle\\Composer\\ScriptHandler::postInstallSymlinkTwitterBootstrap"
         ],
         "post-update-cmd": [
             "Mopa\\Bundle\\BootstrapBundle\\Composer\\ScriptHandler::postInstallSymlinkTwitterBootstrap"
         ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        }
     }
 }