From d604014297afb24f21e964c794ff262f2c78a88e Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Wed, 26 Apr 2023 17:17:28 +0200
Subject: [PATCH] Streamline composer.json

---
 Documentation/Changelog/2.5.0.rst |  4 ++++
 composer.json                     | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Documentation/Changelog/2.5.0.rst b/Documentation/Changelog/2.5.0.rst
index 79d5cd5..4ed3873 100644
--- a/Documentation/Changelog/2.5.0.rst
+++ b/Documentation/Changelog/2.5.0.rst
@@ -23,6 +23,10 @@ Tasks
 
 * Add `shell.nix` to ease local development.
 
+* Streamline composer.json
+  Ensure packages are sorted.
+  Ensure no composer.lock is created.
+
 Deprecation
 -----------
 
diff --git a/composer.json b/composer.json
index a7a6e8f..916737c 100644
--- a/composer.json
+++ b/composer.json
@@ -26,9 +26,9 @@
         }
     },
     "require": {
-        "doctrine/dbal": "^2.12 || ^3.3",
-        "ext-mbstring": "*",
         "php": "~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0",
+        "ext-mbstring": "*",
+        "doctrine/dbal": "^2.12 || ^3.3",
         "psr/http-message": "^1.0",
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
@@ -39,16 +39,15 @@
         "typo3/cms-dashboard": "^11.5 || ^12.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.0",
-        "phpstan/phpstan": "^1.8.7",
-        "phpstan/extension-installer": "^1.1",
+        "cweagans/composer-patches": "^1.7",
         "jangregor/phpstan-prophecy": "^1.0",
         "phpspec/prophecy-phpunit": "^2.0",
-        "typo3/testing-framework": "~7.0@dev",
-        "symplify/easy-coding-standard": "^11.1",
-        "cweagans/composer-patches": "^1.7",
+        "phpstan/extension-installer": "^1.1",
+        "phpstan/phpstan": "^1.8.7",
+        "phpunit/phpunit": "^9.0",
         "ssch/typo3-rector": "^1.0",
-        "sbuerk/typo3-cmscomposerinstallers-testingframework-bridge": "^0.1"
+        "symplify/easy-coding-standard": "^11.1",
+        "typo3/testing-framework": "^7.0"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -72,6 +71,8 @@
         }
     },
     "config": {
+        "sort-packages": true,
+        "lock": false,
         "allow-plugins": {
             "typo3/class-alias-loader": true,
             "typo3/cms-composer-installers": true,