Merge pull request #1678 from deguif/normalize-composer-json

Add new cs check for composer.json

Author: XWB

.github/workflows/continuous-integration.yaml

@@ -1,9 +1,9 @@
 name: 'Continuous integration'
 on: ['push', 'pull_request']
 jobs:
-  php-cs:
+  cs:
     runs-on: 'ubuntu-latest'
-    name: 'PHP coding style'
+    name: 'Coding style'
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@v2'
@@ -12,10 +12,18 @@ jobs:
         uses: 'shivammathur/setup-php@v2'
         with:
           php-version: '7.4'
+          coverage: 'none'
           extensions: 'json, mbstring, tokenizer'
-          tools: 'cs2pr, php-cs-fixer:2.16.4'
-        env:
-          update: true
+          tools: 'composer-normalize, php-cs-fixer:2.16.4'
 
-      - name: 'Check coding style'
-        run: 'php-cs-fixer fix --diff --dry-run --using-cache=false --format=checkstyle | cs2pr'
+      - 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()'

composer.json

@@ -2,57 +2,79 @@
     "name": "friendsofsymfony/elastica-bundle",
     "type": "symfony-bundle",
     "description": "Elasticsearch PHP integration for your Symfony project using Elastica",
-    "keywords": ["doctrine2", "elastica", "elasticsearch", "mongodb", "search"],
+    "keywords": [
+        "doctrine2",
+        "elastica",
+        "elasticsearch",
+        "mongodb",
+        "search"
+    ],
     "homepage": "https://github.com/FriendsOfSymfony/FOSElasticaBundle",
     "license": "MIT",
     "authors": [
-        { "name": "FriendsOfSymfony Community", "homepage": "https://github.com/FriendsOfSymfony/FOSElasticaBundle/contributors" },
-        { "name": "Tim Nagel", "email": "[email protected]" },
-        { "name": "Richard Miller", "email": "[email protected]" },
-        { "name": "Jeremy Mikola", "email": "[email protected]" }
+        {
+            "name": "FriendsOfSymfony Community",
+            "homepage": "https://github.com/FriendsOfSymfony/FOSElasticaBundle/contributors"
+        },
+        {
+            "name": "Tim Nagel",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Richard Miller",
+            "email": "[email protected]"
+        },
+        {
+            "name": "Jeremy Mikola",
+            "email": "[email protected]"
+        }
     ],
     "require": {
         "php": "^7.2",
-        "symfony/framework-bundle": "^4.4 || ^5.1",
+        "pagerfanta/pagerfanta": "^2.0",
+        "psr/log": "^1.0",
+        "ruflin/elastica": "^7.0",
         "symfony/console": "^4.4 || ^5.1",
         "symfony/dependency-injection": "^4.4 || ^5.1",
+        "symfony/framework-bundle": "^4.4 || ^5.1",
         "symfony/messenger": "^4.4 || ^5.1",
-        "symfony/property-access": "^4.4 || ^5.1",
-        "pagerfanta/pagerfanta": "^2.0",
-        "psr/log": "^1.0",
-        "ruflin/elastica": "^7.0"
+        "symfony/property-access": "^4.4 || ^5.1"
     },
     "require-dev": {
-        "doctrine/orm": "^2.7",
         "doctrine/doctrine-bundle": "^2.0",
         "doctrine/mongodb-odm-bundle": "^4.0",
+        "doctrine/orm": "^2.7",
         "doctrine/persistence": "^1.3.4",
-        "doctrine/phpcr-bundle": "^1.3|^2.0",
+        "doctrine/phpcr-bundle": "^1.3 || ^2.0",
         "doctrine/phpcr-odm": "^1.4",
+        "friendsofphp/php-cs-fixer": "^2.2",
         "jackalope/jackalope-doctrine-dbal": "^1.2",
         "jms/serializer-bundle": "^2.3 || ^3.5",
-        "phpunit/phpunit": "^8.5",
         "knplabs/knp-components": "^2.3",
-        "symfony/expression-language" : "^4.4 || ^5.1",
-        "symfony/twig-bundle": "^4.4 || ^5.1",
+        "phpunit/phpunit": "^8.5",
+        "symfony/expression-language": "^4.4 || ^5.1",
         "symfony/serializer": "^4.4 || ^5.1",
-        "symfony/yaml": "^4.4 || ^5.1",
-        "friendsofphp/php-cs-fixer": "^2.2",
-        "symfony/web-profiler-bundle": "^4.4 || ^5.1"
+        "symfony/twig-bundle": "^4.4 || ^5.1",
+        "symfony/web-profiler-bundle": "^4.4 || ^5.1",
+        "symfony/yaml": "^4.4 || ^5.1"
     },
     "suggest": {
-        "symfony/messenger": "For populating Elasticsearch indexes asynchronously and using significanly less resources.",
-        "enqueue/elastica-bundle": "For populating Elasticsearch indexes asynchronously and using significanly less resources. Uses Enqueue."
-    },
-    "autoload": {
-        "psr-4": { "FOS\\ElasticaBundle\\": "src/" }
-    },
-    "autoload-dev": {
-        "psr-4": { "FOS\\ElasticaBundle\\Tests\\": "tests/" }
+        "enqueue/elastica-bundle": "For populating Elasticsearch indexes asynchronously and using significanly less resources. Uses Enqueue.",
+        "symfony/messenger": "For populating Elasticsearch indexes asynchronously and using significanly less resources."
     },
     "extra": {
         "branch-alias": {
             "dev-master": "6.0.x-dev"
         }
+    },
+    "autoload": {
+        "psr-4": {
+            "FOS\\ElasticaBundle\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "FOS\\ElasticaBundle\\Tests\\": "tests/"
+        }
     }
 }