From 14ad8b21d5e3a0d95be2523fa5777884b9393e87 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 10 Dec 2023 09:36:09 +0300
Subject: [PATCH] bump CI jobs & utility scripts to php83

---
 .gitlab-ci.yml               |  4 ++--
 utils/phpstan-watcher.sh     | 14 ++++++++++----
 utils/phpunit-integration.sh |  5 ++---
 utils/phpunit.sh             |  5 ++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2bc74890..68b9eaedb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,7 +56,7 @@ phpdoc:
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $PHPDOC_DEPLOY_SSH_KEY != null
   script:
-    - php82 /phpDocumentor.phar -d classes -d include -t phpdoc --visibility=public
+    - php83 /phpDocumentor.phar -d classes -d include -t phpdoc --visibility=public
     - mkdir -p ~/.ssh &&
         cp ${PHPDOC_DEPLOY_SSH_KEY} ~/.ssh/id_ed25519 &&
         chmod 0600 ~/.ssh/id_ed25519
@@ -74,7 +74,7 @@ phpunit-integration:
     - export TTRSS_DB_USER=postgres
     - export TTRSS_DB_NAME=postgres
     - export TTRSS_DB_PASS=password
-    - php82 vendor/bin/phpunit --group integration --do-not-cache-result --log-junit phpunit-report.xml --coverage-cobertura phpunit-coverage.xml --coverage-text --colors=never
+    - php83 vendor/bin/phpunit --group integration --do-not-cache-result --log-junit phpunit-report.xml --coverage-cobertura phpunit-coverage.xml --coverage-text --colors=never
   artifacts:
     when: always
     reports:
diff --git a/utils/phpstan-watcher.sh b/utils/phpstan-watcher.sh
index 1972df049..2fad5df40 100755
--- a/utils/phpstan-watcher.sh
+++ b/utils/phpstan-watcher.sh
@@ -1,7 +1,11 @@
 #!/bin/sh
 
-docker run --rm -v $(pwd):/app -v /tmp/phpstan-8.1:/tmp/phpstan \
-	--workdir /app registry.fakecake.org/ci/php8.2-alpine:3.18 php82 -d memory_limit=-1 ./vendor/bin/phpstan --memory-limit=2G --error-format=raw analyze .
+export PHP_IMAGE=registry.fakecake.org/infra/php8.3-alpine:3.19
+
+docker run --rm -v $(pwd):/app -v /tmp/phpstan:/tmp/phpstan \
+	--workdir /app ${PHP_IMAGE} \
+	php83 -d memory_limit=-1 ./vendor/bin/phpstan --memory-limit=2G --error-format=raw analyze .
+
 echo All done, RC=$?.
 
 while true; do
@@ -9,8 +13,10 @@ while true; do
 		(
 			MODIFIED=$(git ls-files -m | grep .php)
 
-			docker run --rm -v $(pwd):/app -v /tmp/phpstan-8.1:/tmp/phpstan \
-				--workdir /app registry.fakecake.org/ci/php8.2-alpine:3.18 php82 -d memory_limit=-1 ./vendor/bin/phpstan --memory-limit=2G --error-format=raw analyze ${MODIFIED}
+			docker run --rm -v $(pwd):/app -v /tmp/phpstan:/tmp/phpstan \
+				--workdir /app ${PHP_IMAGE} \
+				php83 -d memory_limit=-1 ./vendor/bin/phpstan --memory-limit=2G --error-format=raw analyze .
+
 			echo All done, RC=$?.
 		)
 	sleep 1
diff --git a/utils/phpunit-integration.sh b/utils/phpunit-integration.sh
index 534a52945..1c05e308a 100755
--- a/utils/phpunit-integration.sh
+++ b/utils/phpunit-integration.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 docker run --rm -v $(pwd):/app -e API_URL=${API_URL} \
-	--workdir /app registry.fakecake.org/ci/php8.2-alpine:3.18 php82 -d memory_limit=-1 ./vendor/bin/phpunit --group integration
-
-
+	--workdir /app registry.fakecake.org/infra/php8.3-alpine:3.19 \
+	php83 -d memory_limit=-1 ./vendor/bin/phpunit --group integration
diff --git a/utils/phpunit.sh b/utils/phpunit.sh
index 461a4abad..8423798e4 100755
--- a/utils/phpunit.sh
+++ b/utils/phpunit.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
 docker run --rm -v $(pwd):/app \
-	--workdir /app registry.fakecake.org/ci/php8.2-alpine:3.18 php82 -d memory_limit=-1 ./vendor/bin/phpunit --exclude integration
-
-
+	--workdir /app registry.fakecake.org/infra/php8.3-alpine:3.19 \
+	php83 -d memory_limit=-1 ./vendor/bin/phpunit --exclude integration