Normalize composer.json

webmozarts · Jan 18, 2021 · 42763b5 · 42763b5
1 parent 73a67b0
commit 42763b5
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -17,12 +17,17 @@
         "php": "^5.3.3 || ^7.0 || ^8.0",
         "symfony/polyfill-ctype": "^1.8"
     },
+    "conflict": {
+        "phpstan/phpstan": "<0.12.20",
+        "vimeo/psalm": "<3.9.1"
+    },
     "require-dev": {
         "phpunit/phpunit": "^4.8.36 || ^7.5.13 || ^8.5.13"
     },
-    "conflict": {
-        "vimeo/psalm": "<3.9.1",
-        "phpstan/phpstan": "<0.12.20"
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.10-dev"
+        }
     },
     "autoload": {
         "psr-4": {
@@ -34,10 +39,5 @@
             "Webmozart\\Assert\\Tests\\": "tests/",
             "Webmozart\\Assert\\Bin\\": "bin/src"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.10-dev"
-        }
     }
 }