Merge branch 'FirebirdSQL:master' into master

Author: mlazdans

README.md

@@ -1,5 +1,10 @@
 # PHP Firebird extension
 
+## Using the driver on Windows
+In order for this extension to work, there are DLL files that must be available to the Windows system PATH. For information on how to do this, see the FAQ entitled "How do I add my PHP directory to the PATH on Windows" (https://www.php.net/manual/en/faq.installation.php#faq.installation.addtopath). Although copying DLL files from the PHP folder into the Windows system directory also works (because the system directory is by default in the system's PATH), this is not recommended. This extension requires the following files to be in the PATH: fbclient.dll,gds32.dll
+
+If you installed the Firebird/InterBase database server on the same machine PHP is running on, you will have this DLL already and fbclient.dll, gds32.dll (gds32.dll is generated from the installer for legacy applications) will already be in the PATH.
+
 ## Building the driver
 
 ### Build the driver on Linux

win_build_scripts/README.md build_scripts/README.mdwin_build_scripts/README.md renamed to build_scripts/README.md

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# Configuration
+FIREBIRD_INCLUDE_DIR="/opt/firebird/include"
+INSTALL_DIR="../ext"
+REPO_URL="https://github.com/FirebirdSQL/php-firebird.git"
+DRIVER_VERSION="5.0.2"
+BRANCH_OR_COMMIT="master" # Set to a specific tag or commit if needed
+PHP_VERSIONS=("7.4" "8.0" "8.1" "8.2" "8.3" "8.4") # Adjust as needed
+BUILD_DIR="php-firebird-build"
+
+set -e
+
+mkdir -p "$INSTALL_DIR"
+rm -rf "$BUILD_DIR"
+echo "Cloning repository from $REPO_URL (branch: $BRANCH_OR_COMMIT)..."
+git clone --depth 1 --branch "$BRANCH_OR_COMMIT" "$REPO_URL" "$BUILD_DIR"
+
+for VERSION in "${PHP_VERSIONS[@]}"; do
+    echo "==> Building for PHP $VERSION"
+
+    PHP_BIN="/usr/bin/php$VERSION"
+    PHPIZE="/usr/bin/phpize$VERSION"
+    PHP_CONFIG="/usr/bin/php-config$VERSION"
+
+    if [[ ! -x "$PHP_BIN" || ! -x "$PHPIZE" || ! -x "$PHP_CONFIG" ]]; then
+        echo "--> Installing missing PHP $VERSION packages..."
+        sudo apt-get install -y "php$VERSION-dev" "php$VERSION-cli" "php$VERSION-common"
+    fi
+
+    cd "$BUILD_DIR"
+
+    echo "--> Cleaning previous build (if any)..."
+    make clean || true
+    echo "--> Running phpize..."
+    "$PHPIZE"
+    echo "--> Configuring build..."
+    CPPFLAGS="-I$FIREBIRD_INCLUDE_DIR" ./configure --with-php-config="$PHP_CONFIG"
+    echo "--> Compiling..."
+    make -j"$(nproc)"
+
+    PHP_FULL_VERSION=$("$PHP_BIN" -r 'echo PHP_VERSION;')
+    ARCH=$(uname -m)
+    OS=$(uname -s | tr '[:upper:]' '[:lower:]')
+
+    OUTPUT_FILE="php_${PHP_FULL_VERSION}-interbase-${DRIVER_VERSION}-${OS}-${ARCH}.so"
+    mkdir -p "$INSTALL_DIR"
+    echo "--> Copying output to $INSTALL_DIR/$OUTPUT_FILE"
+    cp modules/interbase.so "$INSTALL_DIR/$OUTPUT_FILE"
+
+    echo "Build complete for PHP $VERSION: $OUTPUT_FILE"
+    cd ..
+done
+
+echo "All builds completed. Files are located in: $INSTALL_DIR"
+

win_build_scripts/php-fb-build-all.bat build_scripts/php-fb-build-all.batwin_build_scripts/php-fb-build-all.bat renamed to build_scripts/php-fb-build-all.bat

@@ -947,6 +947,10 @@ static void _php_ibase_alloc_xsqlda(XSQLDA *sqlda) /* {{{ */
 	for (i = 0; i < sqlda->sqld; i++) {
 		XSQLVAR *var = &sqlda->sqlvar[i];
 
+        if ((var->sqltype & ~1) == SQL_TEXT) {
+            var->sqltype = SQL_VARYING | (var->sqltype & 1);
+        }
+
 		switch (var->sqltype & ~1) {
 			case SQL_TEXT:
 				var->sqldata = safe_emalloc(sizeof(char), var->sqllen, 0);

build_scripts/php-fb-build-linux.sh

@@ -42,7 +42,7 @@
 #include "php_interbase.h"
 #include "php_ibase_includes.h"
 #include "SAPI.h"
-
+#include <stdbool.h>
 #include <time.h>
 
 #define ROLLBACK    0