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

---
 Makefile           | 14 +++++++-------
 composer.json      |  4 ++--
 docker-compose.yml |  2 ++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index b4464ae..1bcb2e7 100644
--- a/Makefile
+++ b/Makefile
@@ -5,24 +5,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 429e646..9b93978 100644
--- a/composer.json
+++ b/composer.json
@@ -26,8 +26,8 @@
   "require": {
     "ext-amqp": "*",
     "php": "^8.0",
-    "pccomponentes/ddd-logging": "^2.5 || dev-*",
-    "pccomponentes/ddd": "^4.0 || dev-*",
+    "pccomponentes/ddd-logging": "^2.5",
+    "pccomponentes/ddd": "^4.0",
     "beberlei/assert": "^3.3",
     "ramsey/uuid": "^4.5",
     "symfony/framework-bundle": "^6.0",
diff --git a/docker-compose.yml b/docker-compose.yml
index e346a25..091b0d0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,5 @@
+version: '3.7'
+
 services:
   php:
     environment:

From 247644ebbfbf051ab7a0ca90edcbf01a1ae86752 Mon Sep 17 00:00:00 2001
From: "cristian.almohalla" <cristian.almohalla@pccomponentes.com>
Date: Mon, 10 Mar 2025 07:46:56 +0100
Subject: [PATCH 2/2] chore: remove docker deprecations

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

diff --git a/Makefile b/Makefile
index 1bcb2e7..b4464ae 100644
--- a/Makefile
+++ b/Makefile
@@ -5,24 +5,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 091b0d0..e346a25 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.7'
-
 services:
   php:
     environment: