From 90d8cd40e63f956a7a8e415216115300acf84dba Mon Sep 17 00:00:00 2001
From: dannc <dannc.sao@gmail.com>
Date: Tue, 7 May 2024 12:04:45 +0700
Subject: [PATCH] downgrade and hardcode xdebug version for 7.x

---
 Makefile        | 6 +++---
 readme.md       | 5 ++++-
 v7.2/Dockerfile | 3 +--
 v7.3/Dockerfile | 2 +-
 v7.4/Dockerfile | 3 +--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 1380bf3..4357cb7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,13 @@
 include .env
 
 build-72:
-	cd ./v7.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.2 `pwd`
+	cd ./v7.2 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:7.2 `pwd`
 
 build-73:
-	cd ./v7.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.3 `pwd`
+	cd ./v7.3 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:7.3 `pwd`
 
 build-74:
-	cd ./v7.4 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} --tag=php-for-dev:7.4 `pwd`
+	cd ./v7.4 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} --tag=php-for-dev:7.4 `pwd`
 
 build-80:
 	cd ./v8.0 && docker build --build-arg COMPOSER_VERSION=${COMPOSER_VERSION} ---build-arg PHP_XDEBUG_VERSION=${XDEBUG_VERSION} -tag=php-for-dev:8.0 `pwd`
diff --git a/readme.md b/readme.md
index 99bf2f5..aa13640 100644
--- a/readme.md
+++ b/readme.md
@@ -11,18 +11,21 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan
 * php 8.1.28
 * php 8.0.30 **(latest)**
 * php 7.4.33
+  * xdebug 3.1.6
   * rdkafka 6.0.3
   * timecop 1.2.10
 * php 7.3.33
+  * xdebug 3.1.6
   * rdkafka 6.0.3
   * timecop 1.2.10
 * php 7.2.34
+  * xdebug 3.1.6
   * rdkafka 6.0.3
   * timecop 1.2.10
 
 All images includes:
 * composer 2.7.6
-* xdebug 3.3.2
+* xdebug 3.3.2 (except 7.x)
 * [zsh](https://www.zsh.org/), that allowed using [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh) and its plugins for improving user experience.
 
 #### Build
diff --git a/v7.2/Dockerfile b/v7.2/Dockerfile
index d5d2f65..904ecdd 100644
--- a/v7.2/Dockerfile
+++ b/v7.2/Dockerfile
@@ -1,7 +1,6 @@
 FROM php:7.2.34-alpine
 
 ARG COMPOSER_VERSION
-ARG PHP_XDEBUG_VERSION
 ARG PHP_RDKAFKA_VERSION=6.0.3
 ARG PHP_TIMECOP_VERSION=1.2.10
 
@@ -18,7 +17,7 @@ RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && docker-php-ext-install gmp \
     && docker-php-ext-configure imap --with-imap-ssl \
     && docker-php-ext-install imap \
-    && pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug \
+    && pecl install xdebug-3.1.6 && docker-php-ext-enable xdebug \
     && pecl install rdkafka-${PHP_RDKAFKA_VERSION} && docker-php-ext-enable rdkafka \
     && curl -L -o /tmp/timecop.tar.gz https://github.com/hnw/php-timecop/archive/v${PHP_TIMECOP_VERSION}.tar.gz \
     && mkdir -p timecop \
diff --git a/v7.3/Dockerfile b/v7.3/Dockerfile
index bc941a8..4d0dd34 100644
--- a/v7.3/Dockerfile
+++ b/v7.3/Dockerfile
@@ -18,7 +18,7 @@ RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && docker-php-ext-install gmp \
     && docker-php-ext-configure imap --with-imap-ssl \
     && docker-php-ext-install imap \
-    && pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug \
+    && pecl install xdebug-3.1.6 && docker-php-ext-enable xdebug \
     && pecl install rdkafka-${PHP_RDKAFKA_VERSION} && docker-php-ext-enable rdkafka \
     && curl -L -o /tmp/timecop.tar.gz https://github.com/hnw/php-timecop/archive/v${PHP_TIMECOP_VERSION}.tar.gz \
     && mkdir -p timecop \
diff --git a/v7.4/Dockerfile b/v7.4/Dockerfile
index d54bc0b..258c65d 100644
--- a/v7.4/Dockerfile
+++ b/v7.4/Dockerfile
@@ -1,7 +1,6 @@
 FROM php:7.4.33-alpine
 
 ARG COMPOSER_VERSION
-ARG PHP_XDEBUG_VERSION
 ARG PHP_RDKAFKA_VERSION=6.0.3
 ARG PHP_TIMECOP_VERSION=1.2.10
 
@@ -18,7 +17,7 @@ RUN apk update && apk add --no-cache $PHPIZE_DEPS \
     && docker-php-ext-install gmp \
     && PHP_OPENSSL=yes docker-php-ext-configure imap --with-imap-ssl \
     && docker-php-ext-install imap \
-    && pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug \
+    && pecl install xdebug-3.1.6 && docker-php-ext-enable xdebug \
     && pecl install rdkafka-${PHP_RDKAFKA_VERSION} && docker-php-ext-enable rdkafka \
     && curl -L -o /tmp/timecop.tar.gz https://github.com/hnw/php-timecop/archive/v${PHP_TIMECOP_VERSION}.tar.gz \
     && mkdir -p timecop \