From 3cc906ed64938b9f6c76b9bcebcc2c7ea2ca995d Mon Sep 17 00:00:00 2001
From: Jiri Semmler <jirka.semmler@gmail.com>
Date: Tue, 23 Jul 2024 12:54:46 +0200
Subject: [PATCH] CT-1328 update sapi

---
 .github/workflows/branch.yml | 11 +++++++----
 Dockerfile                   |  6 +++---
 README.md                    |  2 +-
 composer.json                |  8 ++++----
 docker/xdebug/Dockerfile     |  2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
index 222fc84e2..855fa81b8 100644
--- a/.github/workflows/branch.yml
+++ b/.github/workflows/branch.yml
@@ -12,14 +12,17 @@ jobs:
       fail-fast: false
       matrix:
         php-versions:
-          - '7.4'
-          - '8.0'
           - '8.1'
+          - '8.2'
+          - '8.3'
         include:
-          - php-versions: "8.0"
+          - php-versions: "8.1"
             composer-options: "--ignore-platform-req=ext-pdo_pgsql --ignore-platform-req=ext-odbc"
             experimental: true
-          - php-versions: "8.1"
+          - php-versions: "8.2"
+            composer-options: "--ignore-platform-req=ext-pdo_pgsql --ignore-platform-req=ext-odbc"
+            experimental: true
+          - php-versions: "8.3"
             composer-options: "--ignore-platform-req=ext-pdo_pgsql --ignore-platform-req=ext-odbc"
             experimental: true
     steps:
diff --git a/Dockerfile b/Dockerfile
index fc45edaa9..36a09e8bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,9 +5,9 @@ ARG AWS_SESSION_TOKEN
 RUN /usr/bin/aws s3 cp s3://keboola-drivers/teradata/tdodbc1710-17.10.00.08-1.x86_64.deb /tmp/teradata/tdodbc.deb
 RUN /usr/bin/aws s3 cp s3://keboola-drivers/teradata/utils/TeradataToolsAndUtilitiesBase__ubuntu_x8664.17.00.34.00.tar.gz  /tmp/teradata/tdutils.tar.gz
 
-ARG PHP_VERSION=7.4
+ARG PHP_VERSION=8.1
 # the default env bellow is used when build pipeline sends "PHP_VERSION=" - the above default value is ignored in that case
-FROM php:${PHP_VERSION:-7.4}-cli-buster as dev
+FROM php:${PHP_VERSION:-8.1}-cli-buster as dev
 MAINTAINER Martin Halamicek <martin@keboola.com>
 ENV DEBIAN_FRONTEND noninteractive
 ARG COMPOSER_FLAGS="--prefer-dist --no-interaction"
@@ -15,7 +15,7 @@ ARG SNOWFLAKE_ODBC_VERSION=2.25.12
 ARG SNOWFLAKE_GPG_KEY=630D9F3CAB551AF3
 ENV COMPOSER_ALLOW_SUPERUSER 1
 ENV COMPOSER_PROCESS_TIMEOUT 3600
-ARG SYNAPSE_ODBC_VERSION=5.9.0
+ARG SYNAPSE_ODBC_VERSION=5.12.0
 
 WORKDIR /code/
 
diff --git a/README.md b/README.md
index 552f81daa..bd04b4c73 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ mv ./composer.phar ~/bin/composer # or /usr/local/bin/composer
 ```json
 {
     "require": {
-        "php" : ">=7.4",
+        "php" : ">=8.1",
         "keboola/storage-api-client": "^14.0"
     }
 }
diff --git a/composer.json b/composer.json
index d8169e77b..9429a899c 100644
--- a/composer.json
+++ b/composer.json
@@ -25,14 +25,14 @@
 		}
 	},
 	"require": {
-		"php": ">=7.4",
+		"php": ">=8.1",
 		"ext-json": "*",
 		"aws/aws-sdk-php": "~3.2",
 		"google/cloud-bigquery-analyticshub": "^0.2.2",
 		"google/cloud-storage": "^1.27",
 		"guzzlehttp/guzzle": "~7.0",
 		"keboola/csv": "^1",
-		"keboola/php-datatypes": "^6.4",
+		"keboola/php-datatypes": "^7.0",
 		"microsoft/azure-storage-blob": "^1.5",
 		"psr/log": "^1.1|^2.0|^3.0",
 		"symfony/filesystem": "^6.0||^5.0||^4.0",
@@ -46,7 +46,7 @@
 		"keboola/php-csv-db-import": "^6",
 		"keboola/phpunit-retry-annotations": "^0.5",
 		"keboola/retry": "^0.5.0",
-		"keboola/table-backend-utils": "^1",
+		"keboola/table-backend-utils": "^2.1",
 		"phpcompatibility/php-compatibility": "*",
 		"phpstan/phpstan": "^1",
 		"phpstan/phpstan-phpunit": "^1.0",
@@ -57,7 +57,7 @@
 	},
 	"scripts": {
 		"phpcs": "phpcs -n .",
-		"phpcs-compatibility": "phpcs --config-set installed_paths vendor/phpcompatibility/php-compatibility && phpcs --ignore=*vendor/*,*cache/* -n . --standard=PHPCompatibility --runtime-set testVersion 7.4-8.1",
+		"phpcs-compatibility": "phpcs --config-set installed_paths vendor/phpcompatibility/php-compatibility && phpcs --ignore=*vendor/*,*cache/* -n . --standard=PHPCompatibility --runtime-set testVersion 8.1-8.3",
 		"phpcbf": "phpcbf -n .",
 		"phpstan": "phpstan analyse --no-progress --level=max . -c phpstan.neon",
 		"tests": "phpunit --testsuite=unit",
diff --git a/docker/xdebug/Dockerfile b/docker/xdebug/Dockerfile
index a52b5fe90..a62fae133 100644
--- a/docker/xdebug/Dockerfile
+++ b/docker/xdebug/Dockerfile
@@ -1,4 +1,4 @@
 FROM keboola/storage-api-tests
 
-RUN pecl install xdebug-2.9.8 \
+RUN pecl install xdebug-3.3.2 \
   && docker-php-ext-enable xdebug