From 43d8b56728b9dc530049d3e01e5a9e00051c77c5 Mon Sep 17 00:00:00 2001
From: Vitalii Koshura <lestat.de.lionkur@gmail.com>
Date: Wed, 19 Feb 2025 13:46:23 +0100
Subject: [PATCH] Fix scripts

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
---
 .scrutinizer.yml                                       |  3 +++
 tests/integration_test/executeTestSuite.sh             |  4 ++--
 tests/integration_test/installTestSuite.sh             | 10 +++++-----
 .../tasks/clone_boinc_server_docker.yml                |  5 +----
 tests/server-test/tests/composer.json                  |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 124dcc6feab..f4fc706f8bb 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -1,4 +1,6 @@
 build:
+    environment:
+        php: 8.3.6
     nodes:
         analysis:
             dependencies:
@@ -27,6 +29,7 @@ filter:
         - '*.min.js'
         - 'drupal/sites/default/modules/boinc/*'
         - 'drupal/sites/default/themes/boinc/*'
+        - 'tests/server-test/*'
     dependency_paths:
         - 'html/inc/htmLawed.php'
         - 'drupal/sites/all/libraries/*'
diff --git a/tests/integration_test/executeTestSuite.sh b/tests/integration_test/executeTestSuite.sh
index 60e8f54495e..319ecd9c205 100755
--- a/tests/integration_test/executeTestSuite.sh
+++ b/tests/integration_test/executeTestSuite.sh
@@ -56,13 +56,13 @@ isPathSubpath() {
 }
 
 # check working directory because the script needs to be called like: ./integration_test/installTestSuite.sh
-if [ ! -d "integration_test" ]; then
+if [ ! -d "tests/integration_test" ]; then
     echo "start this script in the source root directory"
     exit 1
 fi
 
 ROOTDIR=$(pwd)
-PREFIX=$(realpath -s $ROOTDIR/../bst)
+PREFIX=$ROOTDIR/tests/server-test
 test_dir=""
 while [[ $# -gt 0 ]]; do
     key="$1"
diff --git a/tests/integration_test/installTestSuite.sh b/tests/integration_test/installTestSuite.sh
index 84790374524..2b9d696ccf8 100755
--- a/tests/integration_test/installTestSuite.sh
+++ b/tests/integration_test/installTestSuite.sh
@@ -57,13 +57,13 @@ isPathSubpath() {
 }
 
 # check working directory because the script needs to be called like: ./integration_test/installTestSuite.sh
-if [ ! -d "integration_test" ]; then
+if [ ! -d "tests/integration_test" ]; then
     echo "start this script in the source root directory"
     exit 1
 fi
 
 ROOTDIR=$(pwd)
-PREFIX=$(realpath -s $ROOTDIR/tests/server-test)
+PREFIX=$ROOTDIR/tests/server-test
 test_dir=""
 while [[ $# -gt 0 ]]; do
     key="$1"
@@ -94,11 +94,11 @@ if [ "x$test_dir" != "x" ]; then
 fi
 
 cd "${PREFIX}/tests" || exit 1
-composer require phpunit/phpunit
+composer require --dev phpunit/phpunit
 if [ $? -ne 0 ]; then exit 1; fi
-composer require guzzlehttp/guzzle
+composer require --dev guzzlehttp/guzzle
 if [ $? -ne 0 ]; then exit 1; fi
-composer update
+composer update --dev
 if [ $? -ne 0 ]; then exit 1; fi
 cd .. || exit 1
 
diff --git a/tests/server-test/manage/roles/clone-boinc-server-docker/tasks/clone_boinc_server_docker.yml b/tests/server-test/manage/roles/clone-boinc-server-docker/tasks/clone_boinc_server_docker.yml
index 65101c3d333..42c4ab77bf5 100644
--- a/tests/server-test/manage/roles/clone-boinc-server-docker/tasks/clone_boinc_server_docker.yml
+++ b/tests/server-test/manage/roles/clone-boinc-server-docker/tasks/clone_boinc_server_docker.yml
@@ -2,10 +2,7 @@
   file: path="{{base_dir}}/boinc-server-docker" state=absent
 
 - name: "Clone boinc-server-docker to {{base_dir}}"
-  command: git clone https://github.com/marius311/boinc-server-docker.git chdir="{{base_dir}}"
-
-- name: "Use 28df02f75c07650c53a7c5f0a389118f48698fda commit of boinc-server-docker"
-  command: git checkout 28df02f75c07650c53a7c5f0a389118f48698fda chdir="{{base_dir}}/boinc-server-docker"
+  command: git clone https://github.com/BOINC/boinc-server-docker.git chdir="{{base_dir}}"
 
 - name: Init some submodules
   command: git submodule init images/makeproject/boinc2docker images/makeproject/html/inc/phpmailer chdir="{{base_dir}}/boinc-server-docker"
diff --git a/tests/server-test/tests/composer.json b/tests/server-test/tests/composer.json
index d258a518f8a..085a9cdfd5b 100644
--- a/tests/server-test/tests/composer.json
+++ b/tests/server-test/tests/composer.json
@@ -1,7 +1,7 @@
 {
-    "require": {
-        "phpunit/phpunit": "^7.2",
-        "guzzlehttp/guzzle": "^6.3"
+    "require-dev": {
+        "phpunit/phpunit": "*",
+        "guzzlehttp/guzzle": "*"
     },
 
     "scripts": {