From 3cfc2f87f94137ad0488c8207aff20eca2ecf31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Sun, 12 Jan 2020 16:39:53 +0100
Subject: [PATCH] Enhancement: Normalize composer.json (#2599)

---
 composer.json | 128 +++++++++++++++++++++++++++-----------------------
 1 file changed, 69 insertions(+), 59 deletions(-)

diff --git a/composer.json b/composer.json
index 097dd8549..c50d79f3b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,12 @@
 {
     "name": "vimeo/psalm",
-    "description": "A static analysis tool for finding errors in PHP applications",
-    "keywords": ["php", "code", "inspection"],
     "type": "library",
+    "description": "A static analysis tool for finding errors in PHP applications",
+    "keywords": [
+        "php",
+        "code",
+        "inspection"
+    ],
     "license": "MIT",
     "authors": [
         {
@@ -11,26 +15,53 @@
     ],
     "require": {
         "php": "^7.1.3",
-        "ext-dom": "*",
         "ext-SimpleXML": "*",
+        "ext-dom": "*",
         "ext-json": "*",
         "ext-libxml": "*",
         "ext-tokenizer": "*",
-        "nikic/php-parser": "^4.3",
-        "openlss/lib-array2xml": "^1.0",
-        "ocramius/package-versions": "^1.2",
-        "composer/xdebug-handler": "^1.1",
-        "felixfbecker/language-server-protocol": "^1.4",
-        "felixfbecker/advanced-json-rpc": "^3.0.3",
-        "netresearch/jsonmapper": "^1.0",
-        "webmozart/glob": "^4.1",
-        "webmozart/path-util": "^2.3",
-        "symfony/console": "^3.3||^4.0||^5.0",
         "amphp/amp": "^2.1",
         "amphp/byte-stream": "^1.5",
-        "sebastian/diff": "^3.0"
+        "composer/xdebug-handler": "^1.1",
+        "felixfbecker/advanced-json-rpc": "^3.0.3",
+        "felixfbecker/language-server-protocol": "^1.4",
+        "netresearch/jsonmapper": "^1.0",
+        "nikic/php-parser": "^4.3",
+        "ocramius/package-versions": "^1.2",
+        "openlss/lib-array2xml": "^1.0",
+        "sebastian/diff": "^3.0",
+        "symfony/console": "^3.3 || ^4.0 || ^5.0",
+        "webmozart/glob": "^4.1",
+        "webmozart/path-util": "^2.3"
+    },
+    "provide": {
+        "psalm/psalm": "self.version"
+    },
+    "require-dev": {
+        "ext-curl": "*",
+        "bamarni/composer-bin-plugin": "^1.2",
+        "friendsofphp/php-cs-fixer": "^2.15",
+        "phpmyadmin/sql-parser": "^5.0",
+        "phpspec/prophecy": ">=1.9.0",
+        "phpunit/phpunit": "^7.5 || ^8.0",
+        "psalm/plugin-phpunit": "^0.6",
+        "slevomat/coding-standard": "^5.0",
+        "squizlabs/php_codesniffer": "^3.5",
+        "symfony/process": "^4.3"
+    },
+    "suggest": {
+        "ext-igbinary": "^2.0.5"
+    },
+    "config": {
+        "optimize-autoloader": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.x-dev",
+            "dev-2.x": "2.x-dev",
+            "dev-1.x": "1.x-dev"
+        }
     },
-    "bin": ["psalm", "psalter", "psalm-language-server", "psalm-plugin", "psalm-refactor"],
     "autoload": {
         "psr-4": {
             "Psalm\\Plugin\\": "src/Psalm/Plugin",
@@ -46,53 +77,32 @@
             "Psalm\\Tests\\": "tests"
         }
     },
-    "config": {
-        "optimize-autoloader": true
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "require-dev": {
-        "phpunit/phpunit": "^7.5 || ^8.0",
-        "phpspec/prophecy": ">=1.9.0",
-        "squizlabs/php_codesniffer": "^3.5",
-        "bamarni/composer-bin-plugin": "^1.2",
-        "psalm/plugin-phpunit": "^0.6",
-        "phpmyadmin/sql-parser": "^5.0",
-        "symfony/process": "^4.3",
-        "slevomat/coding-standard": "^5.0",
-        "friendsofphp/php-cs-fixer": "^2.15",
-        "ext-curl": "*"
-    },
-    "suggest": {
-        "ext-igbinary": "^2.0.5"
-    },
-    "scripts": {
-        "psalm": "./psalm --find-dead-code",
-        "standards": "phpcs",
-        "tests": [
-            "phpcs",
-            "phpunit"
-        ],
-        "all-tests": [
-            "phpcs",
-            "./psalm --find-dead-code",
-            "phpunit"
-        ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.x-dev",
-            "dev-2.x": "2.x-dev",
-            "dev-1.x": "1.x-dev"
-        }
-    },
-    "provide": {
-        "psalm/psalm": "self.version"
-    },
     "repositories": [
         {
             "type": "path",
             "url": "examples/plugins/composer-based/echo-checker"
         }
-    ]
+    ],
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "bin": [
+        "psalm",
+        "psalm-language-server",
+        "psalm-plugin",
+        "psalm-refactor",
+        "psalter"
+    ],
+    "scripts": {
+        "all-tests": [
+            "phpcs",
+            "./psalm --find-dead-code",
+            "phpunit"
+        ],
+        "psalm": "./psalm --find-dead-code",
+        "standards": "phpcs",
+        "tests": [
+            "phpcs",
+            "phpunit"
+        ]
+    }
 }