From bf1b1765574b0460864bea710c3dfd9337e3cf42 Mon Sep 17 00:00:00 2001
From: wotnak <wotnak@pm.me>
Date: Sat, 4 Nov 2023 21:43:21 +0100
Subject: [PATCH] use DDEV_PHP_VERSION env variable instead of statically
 requiring php 8.1

---
 README.md                     |  2 --
 install.yaml                  |  9 ---------
 php/geos.ini                  |  1 +
 web-build/Dockerfile.php-geos | 29 ++++++++++++++++++-----------
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 58311fa..c651110 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,4 @@
 
 [DDEV addon](https://ddev.readthedocs.io/en/latest/users/extend/additional-services/) that installs [php-geos](https://git.osgeo.org/gitea/geos/php-geos) module.
 
-⚠️ Currently works only with php 8.1.
-
 `ddev get wotnak/ddev-php-geos`
diff --git a/install.yaml b/install.yaml
index 49e6832..a17f435 100644
--- a/install.yaml
+++ b/install.yaml
@@ -1,14 +1,5 @@
 name: php-geos
 
-pre_install_actions:
-  - |
-    #ddev-nodisplay
-    #ddev-description:Check php version
-    if [ ${DDEV_PHP_VERSION} != "8.1" ]; then
-      echo "Currently this add-on only supports PHP 8.1.";
-      exit 1;
-    fi
-
 project_files:
 - web-build/Dockerfile.php-geos
 - php/geos.ini
diff --git a/php/geos.ini b/php/geos.ini
index a7d340a..12278df 100644
--- a/php/geos.ini
+++ b/php/geos.ini
@@ -1,2 +1,3 @@
+#ddev-generated
 [PHP]
 extension=geos.so
diff --git a/web-build/Dockerfile.php-geos b/web-build/Dockerfile.php-geos
index 31a9510..68a5cfd 100644
--- a/web-build/Dockerfile.php-geos
+++ b/web-build/Dockerfile.php-geos
@@ -1,14 +1,21 @@
+#ddev-generated
 # Build and install the GEOS PHP extension.
 # See https://git.osgeo.org/gitea/geos/php-geos
-RUN apt-get update && apt-get install -y php8.1-dev libgeos-dev \
-  && git clone https://github.com/libgeos/php-geos \
-  && ( \
-    cd php-geos \
+RUN set -eux ;\
+  apt-get update ;\
+  apt-get install -y php${DDEV_PHP_VERSION}-dev libgeos-dev ;\
+  # Use github mirror for cloning.
+  git clone https://github.com/libgeos/php-geos ;\
+  # Build the extension.
+  ( \
+    cd php-geos ;\
     # Checkout latest commit with PHP 8 support.
-    && git checkout e77d5a16abbf89a59d947d1fe49381a944762c9d \
-    && ./autogen.sh \
-    && ./configure \
-    && make \
-    && make install \
-  ) \
-  && rm -r php-geos
+    git checkout e77d5a16abbf89a59d947d1fe49381a944762c9d ;\
+    ./autogen.sh ;\
+    ./configure ;\
+    make ;\
+    make install ;\
+  ) ;\
+  # Cleanup after build.
+  rm -r php-geos ;\
+  apt-get purge -y php${DDEV_PHP_VERSION}-dev