From 0e83cfc4d5cd9a831309842880b83f4186017d60 Mon Sep 17 00:00:00 2001
From: Mathieu De Keyzer <me@theus.be>
Date: Sun, 24 Dec 2023 13:03:24 +0100
Subject: [PATCH] fix(cli): doctrine mapping from annotation to xml (#698)

---
 composer.json                               |  2 +-
 elasticms-cli/composer.json                 | 38 ++++++++++-----------
 elasticms-cli/config/packages/doctrine.yaml |  5 ++-
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/composer.json b/composer.json
index aae8b6834..fbd96a9c4 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
       "homepage": "https://github.com/ems-project/EMSClientHelperBundle/contributors"
     }
   ],
-  "license" : "MIT",
+  "license": "MIT",
   "minimum-stability": "stable",
   "prefer-stable": true,
   "require": {
diff --git a/elasticms-cli/composer.json b/elasticms-cli/composer.json
index e65d12e60..6d13d0f70 100644
--- a/elasticms-cli/composer.json
+++ b/elasticms-cli/composer.json
@@ -1,36 +1,36 @@
 {
   "name": "ems-project/elasticms-cli",
   "description": "command client of the elasticms suite",
-  "type": "project",
-  "license": "MIT",
   "authors": [
     {
       "name": "EMS Community",
       "homepage": "https://github.com/ems-project/EMSClientHelperBundle/contributors"
     }
   ],
+  "type": "project",
+  "license": "MIT",
   "minimum-stability": "stable",
   "prefer-stable": true,
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "ext-ctype": "*",
     "ext-iconv": "*",
     "ext-json": "*",
     "ext-sqlite3": "*",
     "doctrine/doctrine-migrations-bundle": "^3.2",
-    "elasticms/common-bundle": "~5.12.0",
-    "kevinrob/guzzle-cache-middleware": "^4.0",
-    "symfony/console": "^5.4",
-    "symfony/css-selector": "^5.4",
-    "symfony/dotenv": "^5.4",
-    "symfony/expression-language": "^6.2",
-    "symfony/flex": "^1.6",
-    "symfony/framework-bundle": "^5.4",
-    "symfony/http-client": "^5.4",
-    "symfony/property-info": "^5.4",
-    "symfony/runtime": "^5.4",
-    "symfony/var-exporter": "^5.4",
-    "symfony/yaml": "^5.4"
+    "elasticms/common-bundle": "~6.0.0",
+    "kevinrob/guzzle-cache-middleware": "^4.1",
+    "symfony/console": "^6.4",
+    "symfony/css-selector": "^6.4",
+    "symfony/dotenv": "^6.4",
+    "symfony/expression-language": "^6.4",
+    "symfony/flex": "^2.4",
+    "symfony/framework-bundle": "^6.4",
+    "symfony/http-client": "^6.4",
+    "symfony/property-info": "^6.4",
+    "symfony/runtime": "^6.4",
+    "symfony/var-exporter": "^6.4",
+    "symfony/yaml": "^6.4"
   },
   "require-dev": {
     "phpdocumentor/reflection-docblock": "^5.3",
@@ -77,9 +77,9 @@
       "@auto-scripts"
     ],
     "phpcs": "php-cs-fixer fix",
-    "phpstan": "phpstan analyse",
+    "phpstan": "phpstan analyse --memory-limit 1G",
     "phpunit": "phpunit",
-    "phpall": "phpunit && php-cs-fixer fix && phpstan analyse"
+    "phpall": "php-cs-fixer fix && phpunit && phpstan analyse --memory-limit 1G"
   },
   "conflict": {
     "symfony/symfony": "*"
@@ -87,7 +87,7 @@
   "extra": {
     "symfony": {
       "allow-contrib": false,
-      "require": "^5.4"
+      "require": "^6.4"
     }
   }
 }
diff --git a/elasticms-cli/config/packages/doctrine.yaml b/elasticms-cli/config/packages/doctrine.yaml
index 3d67e975a..16eb359a3 100644
--- a/elasticms-cli/config/packages/doctrine.yaml
+++ b/elasticms-cli/config/packages/doctrine.yaml
@@ -4,8 +4,8 @@ parameters:
 
 doctrine:
     dbal:
-      url: '%env(resolve:DATABASE_URL)%'
-      server_version: '%env(resolve:DB_SERVER_VERSION)%'
+        url: '%env(resolve:DATABASE_URL)%'
+        server_version: '%env(resolve:DB_SERVER_VERSION)%'
     orm:
         auto_generate_proxy_classes: true
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
@@ -13,7 +13,6 @@ doctrine:
         mappings:
             App:
               is_bundle: false
-              type: annotation
               dir: '%kernel.project_dir%/src/Entity'
               prefix: 'App\CLI\Entity'
               alias: App