From a51259d7a6ea649d64f409fc0276baa59cf4f19a Mon Sep 17 00:00:00 2001
From: Muqsit <Muqsit@users.noreply.github.com>
Date: Tue, 12 Nov 2024 21:29:30 +0800
Subject: [PATCH] PHP8.2: Update PHP and dependency versions (#196)

* Update PHP and dependency versions

* cURL: downgrade to v8.9.1 in favor of a succeeding build

* libzip: use v1.10.1

* windows-compile-vs.bat: remove unnecessary backslash
---
 compile.sh             | 14 +++++++-------
 windows-compile-vs.bat | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/compile.sh b/compile.sh
index 01b2cb3f..e225abe5 100755
--- a/compile.sh
+++ b/compile.sh
@@ -1,28 +1,28 @@
 #!/usr/bin/env bash
-[ -z "$PHP_VERSION" ] && PHP_VERSION="8.2.17"
+[ -z "$PHP_VERSION" ] && PHP_VERSION="8.2.25"
 
 #### NOTE: Tags with "v" prefixes behave weirdly in the GitHub API. They'll be stripped in some places but not others.
 #### Use commit hashes to avoid this.
 
 ZLIB_VERSION="1.3.1"
 GMP_VERSION="6.3.0"
-CURL_VERSION="curl-8_7_1"
+CURL_VERSION="curl-8_9_1"
 YAML_VERSION="0.2.5"
 LEVELDB_VERSION="1c7564468b41610da4f498430e795ca4de0931ff" #release not tagged
 LIBXML_VERSION="2.10.1" #2.10.2 requires automake 1.16.3, which isn't easily available on Ubuntu 20.04
 LIBPNG_VERSION="1.6.43"
 LIBJPEG_VERSION="9f"
-OPENSSL_VERSION="3.2.1"
+OPENSSL_VERSION="3.4.0"
 LIBZIP_VERSION="1.10.1"
 SQLITE3_VERSION="3450200" #3.45.2
-LIBDEFLATE_VERSION="275aa5141db6eda3587214e0f1d3a134768f557d" #1.20 - see above note about "v" prefixes
+LIBDEFLATE_VERSION="2335c047e91cac6fd04cb0fd2769380395149f15" #1.22 - see above note about "v" prefixes
 
 EXT_PMMPTHREAD_VERSION="6.1.0"
-EXT_YAML_VERSION="2.2.3"
+EXT_YAML_VERSION="2.2.4"
 EXT_LEVELDB_VERSION="317fdcd8415e1566fc2835ce2bdb8e19b890f9f3" #release not tagged
 EXT_CHUNKUTILS2_VERSION="0.3.5"
-EXT_XDEBUG_VERSION="3.3.1"
-EXT_IGBINARY_VERSION="3.2.15"
+EXT_XDEBUG_VERSION="3.3.2"
+EXT_IGBINARY_VERSION="3.2.16"
 EXT_CRYPTO_VERSION="abbe7cbf869f96e69f2ce897271a61d32f43c7c0" #release not tagged
 EXT_RECURSIONGUARD_VERSION="0.1.0"
 EXT_LIBDEFLATE_VERSION="0.2.1"
diff --git a/windows-compile-vs.bat b/windows-compile-vs.bat
index 312ca7f1..29c4d47c 100644
--- a/windows-compile-vs.bat
+++ b/windows-compile-vs.bat
@@ -3,7 +3,7 @@
 REM For future users: This file MUST have CRLF line endings. If it doesn't, lots of inexplicable undesirable strange behaviour will result.
 REM Also: Don't modify this version with sed, or it will screw up your line endings.
 set PHP_MAJOR_VER=8.2
-set PHP_VER=%PHP_MAJOR_VER%.17
+set PHP_VER=%PHP_MAJOR_VER%.25
 set PHP_GIT_REV=php-%PHP_VER%
 set PHP_DISPLAY_VER=%PHP_VER%
 set PHP_SDK_VER=2.2.0
@@ -25,13 +25,13 @@ set LIBYAML_VER=0.2.5
 set PTHREAD_W32_VER=3.0.0
 REM release not tagged
 set LEVELDB_MCPE_VER=1c7564468b41610da4f498430e795ca4de0931ff
-REM 1.20 - see above note about "v" prefixes
-set LIBDEFLATE_VER=dd12ff2b36d603dbb7fa8838fe7e7176fcbd4f6f
+REM 1.22 - see above note about "v" prefixes
+set LIBDEFLATE_VER=2335c047e91cac6fd04cb0fd2769380395149f15
 
 set PHP_PMMPTHREAD_VER=6.1.0
-set PHP_YAML_VER=2.2.3
+set PHP_YAML_VER=2.2.4
 set PHP_CHUNKUTILS2_VER=0.3.5
-set PHP_IGBINARY_VER=3.2.15
+set PHP_IGBINARY_VER=3.2.16
 REM release not tagged
 set PHP_LEVELDB_VER=317fdcd8415e1566fc2835ce2bdb8e19b890f9f3
 REM release not tagged
@@ -40,7 +40,7 @@ set PHP_RECURSIONGUARD_VER=0.1.0
 set PHP_MORTON_VER=0.1.2
 set PHP_LIBDEFLATE_VER=0.2.1
 set PHP_XXHASH_VER=0.2.0
-set PHP_XDEBUG_VER=3.3.1
+set PHP_XDEBUG_VER=3.3.2
 set PHP_ARRAYDEBUG_VER=0.2.0
 set PHP_ENCODING_VER=0.3.0