From 7a39e8391ad3f0d66c1894ae6ef555bb31fb362d Mon Sep 17 00:00:00 2001
From: Cristian <34070946+calmohallag@users.noreply.github.com>
Date: Mon, 10 Mar 2025 07:41:19 +0100
Subject: [PATCH 1/2] Revert "feat: allow dev ddd library version"

---
 Makefile           | 14 +++++++-------
 composer.json      | 16 ++++++++--------
 docker-compose.yml |  1 +
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index d76e651..76f267c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,24 +6,24 @@ DOCKER_PHP_SERVICE=php
 start: erase cache-folders build composer-install bash
 
 erase:
-		docker compose down -v
+		docker-compose down -v
 
 build:
-		docker compose build && \
-		docker compose pull
+		docker-compose build && \
+		docker-compose pull
 
 cache-folders:
 		mkdir -p ~/.composer && chown ${UID}:${GID} ~/.composer
 
 composer-install:
-		docker compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} composer install
+		docker-compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} composer install
 
 bash:
-		docker compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} sh
+		docker-compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} sh
 
 logs:
-		docker compose logs -f ${DOCKER_PHP_SERVICE}
+		docker-compose logs -f ${DOCKER_PHP_SERVICE}
 
 .PHONY: tests
 tests:
-		docker compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} phpunit
\ No newline at end of file
+		docker-compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} phpunit
\ No newline at end of file
diff --git a/composer.json b/composer.json
index dcb52ed..202c7d1 100644
--- a/composer.json
+++ b/composer.json
@@ -22,15 +22,15 @@
     }
   ],
   "require": {
-    "php": "^7.4 || ^8.0",
+    "php": "^7.4|^8.0",
     "ext-json": "*",
-    "monolog/monolog": "^1.25 || ^2.0",
-    "pccomponentes/ddd": "^2.1 || ^3.0 || ^4.0 || dev-*",
-    "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0",
-    "symfony/messenger": "^4.4 || ^5.0 || ^6.0",
-    "symfony/http-foundation": "^4.4 || ^5.0 || ^6.0",
-    "symfony/stopwatch": "^4.4 || ^5.0 || ^6.0",
-    "guzzlehttp/guzzle": "^6.5 || ^7.0"
+    "monolog/monolog": "^1.25|^2.0",
+    "pccomponentes/ddd": "^2.1|^3.0|^4.0",
+    "symfony/http-kernel": "^4.4|^5.0|^6.0",
+    "symfony/messenger": "^4.4|^5.0|^6.0",
+    "symfony/http-foundation": "^4.4|^5.0|^6.0",
+    "symfony/stopwatch": "^4.4|^5.0|^6.0",
+    "guzzlehttp/guzzle": "^6.5|^7.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.0",
diff --git a/docker-compose.yml b/docker-compose.yml
index c55c10f..89b6d15 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,4 @@
+version: '3.7'
 services:
   php:
     build: .

From 803e5d9fec9d4de85aa0bcf3d7999d0600c9c21a Mon Sep 17 00:00:00 2001
From: "cristian.almohalla" <cristian.almohalla@pccomponentes.com>
Date: Mon, 10 Mar 2025 07:46:06 +0100
Subject: [PATCH 2/2] chore: fix composer deprecations

---
 Makefile           | 14 +++++++-------
 docker-compose.yml |  1 -
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 76f267c..d76e651 100644
--- a/Makefile
+++ b/Makefile
@@ -6,24 +6,24 @@ DOCKER_PHP_SERVICE=php
 start: erase cache-folders build composer-install bash
 
 erase:
-		docker-compose down -v
+		docker compose down -v
 
 build:
-		docker-compose build && \
-		docker-compose pull
+		docker compose build && \
+		docker compose pull
 
 cache-folders:
 		mkdir -p ~/.composer && chown ${UID}:${GID} ~/.composer
 
 composer-install:
-		docker-compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} composer install
+		docker compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} composer install
 
 bash:
-		docker-compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} sh
+		docker compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} sh
 
 logs:
-		docker-compose logs -f ${DOCKER_PHP_SERVICE}
+		docker compose logs -f ${DOCKER_PHP_SERVICE}
 
 .PHONY: tests
 tests:
-		docker-compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} phpunit
\ No newline at end of file
+		docker compose run --rm -u ${UID}:${GID} ${DOCKER_PHP_SERVICE} phpunit
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 89b6d15..c55c10f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   php:
     build: .