fix

mvorisek · Sep 25, 2024 · 5267f32 · 5267f32
1 parent db801e7
commit 5267f32
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/data/8.4-alpine/Dockerfile b/data/8.4-alpine/Dockerfile
@@ -16,7 +16,7 @@ RUN git clone --recurse-submodules https://github.com/phpredis/phpredis.git -b d
     && cd phpredis && git reset --hard d3b2d87b10 && rm -r .git
 RUN git clone https://github.com/xdebug/xdebug.git -b master xdebug \
     && cd xdebug && git reset --hard 12adc6394a && rm -r .git \
-    && sed 's~<max>8.4.99</max>~<max>99.99.99</max>~' -i package.xml
+    && sed -E 's~(<max>)[0-9]+.[0-9]+(.99</max>)~\199.99\2~' -i package.xml && sed -E 's~(if test "\$PHP_XDEBUG_FOUND_VERNUM" -ge ")[0-9]+(00"; then)~\19999\2~' -i config.m4
 RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     bcmath \
     exif \

diff --git a/data/8.4-debian/Dockerfile b/data/8.4-debian/Dockerfile
@@ -17,7 +17,7 @@ RUN git clone --recurse-submodules https://github.com/phpredis/phpredis.git -b d
     && cd phpredis && git reset --hard d3b2d87b10 && rm -r .git
 RUN git clone https://github.com/xdebug/xdebug.git -b master xdebug \
     && cd xdebug && git reset --hard 12adc6394a && rm -r .git \
-    && sed 's~<max>8.4.99</max>~<max>99.99.99</max>~' -i package.xml
+    && sed -E 's~(<max>)[0-9]+.[0-9]+(.99</max>)~\199.99\2~' -i package.xml && sed -E 's~(if test "\$PHP_XDEBUG_FOUND_VERNUM" -ge ")[0-9]+(00"; then)~\19999\2~' -i config.m4
 RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     bcmath \
     exif \

diff --git a/data/8.4-debug-alpine/Dockerfile b/data/8.4-debug-alpine/Dockerfile
@@ -16,7 +16,7 @@ RUN git clone --recurse-submodules https://github.com/phpredis/phpredis.git -b d
     && cd phpredis && git reset --hard d3b2d87b10 && rm -r .git
 RUN git clone https://github.com/xdebug/xdebug.git -b master xdebug \
     && cd xdebug && git reset --hard 12adc6394a && rm -r .git \
-    && sed 's~<max>8.4.99</max>~<max>99.99.99</max>~' -i package.xml
+    && sed -E 's~(<max>)[0-9]+.[0-9]+(.99</max>)~\199.99\2~' -i package.xml && sed -E 's~(if test "\$PHP_XDEBUG_FOUND_VERNUM" -ge ")[0-9]+(00"; then)~\19999\2~' -i config.m4
 RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     bcmath \
     exif \

diff --git a/data/8.4-debug-debian/Dockerfile b/data/8.4-debug-debian/Dockerfile
@@ -17,7 +17,7 @@ RUN git clone --recurse-submodules https://github.com/phpredis/phpredis.git -b d
     && cd phpredis && git reset --hard d3b2d87b10 && rm -r .git
 RUN git clone https://github.com/xdebug/xdebug.git -b master xdebug \
     && cd xdebug && git reset --hard 12adc6394a && rm -r .git \
-    && sed 's~<max>8.4.99</max>~<max>99.99.99</max>~' -i package.xml
+    && sed -E 's~(<max>)[0-9]+.[0-9]+(.99</max>)~\199.99\2~' -i package.xml && sed -E 's~(if test "\$PHP_XDEBUG_FOUND_VERNUM" -ge ")[0-9]+(00"; then)~\19999\2~' -i config.m4
 RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     bcmath \
     exif \

diff --git a/data/8.4-zts-alpine/Dockerfile b/data/8.4-zts-alpine/Dockerfile
@@ -16,7 +16,7 @@ RUN git clone --recurse-submodules https://github.com/phpredis/phpredis.git -b d
     && cd phpredis && git reset --hard d3b2d87b10 && rm -r .git
 RUN git clone https://github.com/xdebug/xdebug.git -b master xdebug \
     && cd xdebug && git reset --hard 12adc6394a && rm -r .git \
-    && sed 's~<max>8.4.99</max>~<max>99.99.99</max>~' -i package.xml
+    && sed -E 's~(<max>)[0-9]+.[0-9]+(.99</max>)~\199.99\2~' -i package.xml && sed -E 's~(if test "\$PHP_XDEBUG_FOUND_VERNUM" -ge ")[0-9]+(00"; then)~\19999\2~' -i config.m4
 RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     bcmath \
     exif \

diff --git a/data/8.4-zts-debian/Dockerfile b/data/8.4-zts-debian/Dockerfile
@@ -17,7 +17,7 @@ RUN git clone --recurse-submodules https://github.com/phpredis/phpredis.git -b d
     && cd phpredis && git reset --hard d3b2d87b10 && rm -r .git
 RUN git clone https://github.com/xdebug/xdebug.git -b master xdebug \
     && cd xdebug && git reset --hard 12adc6394a && rm -r .git \
-    && sed 's~<max>8.4.99</max>~<max>99.99.99</max>~' -i package.xml
+    && sed -E 's~(<max>)[0-9]+.[0-9]+(.99</max>)~\199.99\2~' -i package.xml && sed -E 's~(if test "\$PHP_XDEBUG_FOUND_VERNUM" -ge ")[0-9]+(00"; then)~\19999\2~' -i config.m4
 RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     bcmath \
     exif \

diff --git a/make.php b/make.php
@@ -120,7 +120,7 @@
     && cd phpredis && git reset --hard d3b2d87b10 && rm -r .git
 ' : '') . (in_array($phpVersion, ['8.4'], true) ? 'RUN git clone https://github.com/xdebug/xdebug.git -b master xdebug \
     && cd xdebug && git reset --hard 12adc6394a && rm -r .git \
-    && sed \'s~<max>8.4.99</max>~<max>99.99.99</max>~\' -i package.xml
+    && sed -E \'s~(<max>)[0-9]+.[0-9]+(.99</max>)~\199.99\2~\' -i package.xml && sed -E \'s~(if test "\$PHP_XDEBUG_FOUND_VERNUM" -ge ")[0-9]+(00"; then)~\19999\2~\' -i config.m4
 ' : '') . 'RUN IPE_ICU_EN_ONLY=1 install-php-extensions \
     ' . implode(' \\' . "\n" . '    ', [
         'bcmath',