Normalize composer.json (#649)

* Remove cs2pr for phpcs

* Add more cs tools

* Normalize composer.json

* Disable xdebug

* Rename github action job for cs

Author: deguif

.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,19 @@ 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'
+          tools: 'composer-normalize, php-cs-fixer:2.16.4'
         env:
           update: true
 
-      - 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'

composer.json

@@ -2,13 +2,17 @@
     "name": "friendsofsymfony/oauth-server-bundle",
     "type": "symfony-bundle",
     "description": "Symfony2 OAuth Server Bundle",
-    "keywords": ["oauth", "oauth2", "server"],
+    "keywords": [
+        "oauth",
+        "oauth2",
+        "server"
+    ],
     "homepage": "http://friendsofsymfony.github.com",
     "license": "MIT",
     "authors": [
         {
-          "name": "Arnaud Le Blanc",
-          "email": "[email protected]"
+            "name": "Arnaud Le Blanc",
+            "email": "[email protected]"
         },
         {
             "name": "FriendsOfSymfony Community",
@@ -18,40 +22,36 @@
     "require": {
         "php": "^7.1",
         "friendsofsymfony/oauth2-php": "~1.1",
-        "symfony/dependency-injection": "~3.0|~4.0",
-        "symfony/framework-bundle": "~3.0|~4.0",
-        "symfony/security-bundle": "~3.0|~4.0"
+        "symfony/dependency-injection": "~3.0 || ~4.0",
+        "symfony/framework-bundle": "~3.0 || ~4.0",
+        "symfony/security-bundle": "~3.0 || ~4.0"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "~1.0",
         "doctrine/mongodb-odm": "~1.0",
         "doctrine/orm": "~2.2",
         "phing/phing": "~2.4",
-        "php-mock/php-mock-phpunit": "~1.0|~2.0",
+        "php-mock/php-mock-phpunit": "~1.0 || ~2.0",
         "phpstan/phpstan-phpunit": "~0.9",
         "phpstan/phpstan-shim": "~0.9",
-        "phpunit/phpunit": "~5.0|~6.0",
+        "phpunit/phpunit": "~5.0 || ~6.0",
         "propel/propel1": "~1.6",
-        "symfony/class-loader": "~3.0|~4.0",
-        "symfony/console": "~3.0|~4.0",
-        "symfony/form": "~3.0|~4.0",
-        "symfony/phpunit-bridge": "~3.0|~4.0",
-        "symfony/templating": "~3.0|~4.0",
-        "symfony/twig-bundle": "~3.0|^4.0",
-        "symfony/yaml": "~3.0|~4.0",
+        "symfony/class-loader": "~3.0 || ~4.0",
+        "symfony/console": "~3.0 || ~4.0",
+        "symfony/form": "~3.0 || ~4.0",
+        "symfony/phpunit-bridge": "~3.0 || ~4.0",
+        "symfony/templating": "~3.0 || ~4.0",
+        "symfony/twig-bundle": "~3.0 || ^4.0",
+        "symfony/yaml": "~3.0 || ~4.0",
         "willdurand/propel-typehintable-behavior": "~1.0"
     },
     "suggest": {
         "doctrine/doctrine-bundle": "*",
         "doctrine/mongodb-odm-bundle": "*",
         "propel/propel-bundle": "If you want to use Propel with Symfony2, then you will have to install the PropelBundle",
-        "willdurand/propel-typehintable-behavior": "The Typehintable behavior is useful to add type hints on generated methods, to be compliant with interfaces",
-        "symfony/form" : "Needed to be able to use the AuthorizeFormType",
-        "symfony/console": "Needed to be able to use commands"
-    },
-    "autoload": {
-        "psr-4": { "FOS\\OAuthServerBundle\\": "" },
-        "exclude-from-classmap": ["/Tests/"]
+        "symfony/console": "Needed to be able to use commands",
+        "symfony/form": "Needed to be able to use the AuthorizeFormType",
+        "willdurand/propel-typehintable-behavior": "The Typehintable behavior is useful to add type hints on generated methods, to be compliant with interfaces"
     },
     "config": {
         "sort-packages": true
@@ -60,5 +60,13 @@
         "branch-alias": {
             "dev-master": "2.0.x-dev"
         }
+    },
+    "autoload": {
+        "psr-4": {
+            "FOS\\OAuthServerBundle\\": ""
+        },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
     }
 }