From 6f05f72bf24b8844d627ef9d6c13d1e08de8ec0a Mon Sep 17 00:00:00 2001
From: Michael Babker <michael.babker@gmail.com>
Date: Fri, 13 Oct 2023 17:12:44 -0400
Subject: [PATCH] Bump minimum dependencies to match what's actually tested,
 normalize Composer manifest

---
 composer.json | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/composer.json b/composer.json
index c25a1e4fc..647680c68 100644
--- a/composer.json
+++ b/composer.json
@@ -16,12 +16,12 @@
         }
     ],
     "require": {
-        "php": "^7.2||^8.0",
-        "doctrine/annotations": "^1.13 || ^2.0",
-        "doctrine/instantiator": "^1.0.3 || ^2.0",
+        "php": "^7.2 || ^8.0",
+        "doctrine/annotations": "^1.14 || ^2.0",
+        "doctrine/instantiator": "^1.3.1 || ^2.0",
         "doctrine/lexer": "^2.0 || ^3.0",
         "jms/metadata": "^2.6",
-        "phpstan/phpdoc-parser": "^0.4 || ^0.5 || ^1.0"
+        "phpstan/phpdoc-parser": "^1.20"
     },
     "suggest": {
         "doctrine/collections": "Required if you like to use doctrine collection types as ArrayCollection.",
@@ -32,24 +32,24 @@
     "require-dev": {
         "ext-pdo_sqlite": "*",
         "doctrine/coding-standard": "^12.0",
-        "doctrine/orm": "~2.1",
-        "doctrine/persistence": "^1.3.3|^2.0|^3.0",
-        "doctrine/phpcr-odm": "^1.3|^2.0",
-        "jackalope/jackalope-doctrine-dbal": "^1.1.5",
-        "ocramius/proxy-manager": "^1.0|^2.0",
+        "doctrine/orm": "^2.14",
+        "doctrine/persistence": "^2.5.2 || ^3.0",
+        "doctrine/phpcr-odm": "^1.5.2 || ^2.0",
+        "jackalope/jackalope-doctrine-dbal": "^1.3",
+        "ocramius/proxy-manager": "^1.0 || ^2.0",
         "phpbench/phpbench": "^1.0",
         "phpstan/phpstan": "^1.0.2",
-        "phpunit/phpunit": "^8.5.21||^9.0||^10.0",
-        "psr/container": "^1.0|^2.0",
-        "symfony/dependency-injection": "^3.0|^4.0|^5.0|^6.0|^7.0",
-        "symfony/expression-language": "^3.2|^4.0|^5.0|^6.0|^7.0",
-        "symfony/filesystem": "^3.0|^4.0|^5.0|^6.0|^7.0",
-        "symfony/form": "^3.0|^4.0|^5.0|^6.0|^7.0",
-        "symfony/translation": "^3.0|^4.0|^5.0|^6.0|^7.0",
-        "symfony/uid": "^5.1|^6.0|^7.0",
-        "symfony/validator": "^3.1.9|^4.0|^5.0|^6.0|^7.0",
-        "symfony/yaml": "^3.3|^4.0|^5.0|^6.0|^7.0",
-        "twig/twig": "~1.34|~2.4|^3.0"
+        "phpunit/phpunit": "^8.5.21 || ^9.0 || ^10.0",
+        "psr/container": "^1.0 || ^2.0",
+        "symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/expression-language": "^3.2 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/filesystem": "^4.2 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/form": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/translation": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/uid": "^5.1 || ^6.0 || ^7.0",
+        "symfony/validator": "^3.1.9 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "twig/twig": "^1.34 || ^2.4 || ^3.0"
     },
     "autoload": {
         "psr-4": {