fix tests

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>

Author: julien-nc

.github/workflows/phpunit-mysql.yml

@@ -61,7 +61,7 @@ jobs:
           mkdir -p ~/html
           echo "git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b ${{ matrix.server-versions }} ~/html/nextcloud"
           git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b ${{ matrix.server-versions }} ~/html/nextcloud
-          sed -i $'s|if (substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|if (is_string($root) and substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|g' ~/html/nextcloud/lib/autoloader.php
+          #sed -i $'s|if (substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|if (is_string($root) and substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|g' ~/html/nextcloud/lib/autoloader.php
           cp -r $GITHUB_WORKSPACE ~/html/nextcloud/apps/${{ env.APP_ID }}
           # SETUP NEXTCLOUD
           export DB_PORT=4444

.github/workflows/phpunit-pgsql.yml

@@ -63,7 +63,7 @@ jobs:
           mkdir -p ~/html
           echo "git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b ${{ matrix.server-versions }} ~/html/nextcloud"
           git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b ${{ matrix.server-versions }} ~/html/nextcloud
-          sed -i $'s|if (substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|if (is_string($root) and substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|g' ~/html/nextcloud/lib/autoloader.php
+          #sed -i $'s|if (substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|if (is_string($root) and substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|g' ~/html/nextcloud/lib/autoloader.php
           cp -r $GITHUB_WORKSPACE ~/html/nextcloud/apps/${{ env.APP_ID }}
           # SETUP NEXTCLOUD
           export DB_PORT=4445

.github/workflows/phpunit-sqlite.yml

@@ -52,7 +52,7 @@ jobs:
           mkdir -p ~/html
           echo "git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b ${{ matrix.server-versions }} ~/html/nextcloud"
           git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b ${{ matrix.server-versions }} ~/html/nextcloud
-          sed -i $'s|if (substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|if (is_string($root) and substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|g' ~/html/nextcloud/lib/autoloader.php
+          #sed -i $'s|if (substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|if (is_string($root) and substr($fullPath, 0, strlen($root) + 1) === $root . \'/\')|g' ~/html/nextcloud/lib/autoloader.php
           cp -r $GITHUB_WORKSPACE ~/html/nextcloud/apps/${{ env.APP_ID }}
           # SETUP NEXTCLOUD
           echo "php ~/html/nextcloud/occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-port=$DB_PORT --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin"

composer.json

@@ -27,7 +27,7 @@
 	},
 	"require-dev": {
 		"nextcloud/coding-standard": "^1.1",
-		"psalm/phar": "^6.1.0",
+		"psalm/phar": "6.4.0",
 		"nextcloud/ocp": "dev-master",
 		"phpunit/phpunit": "^9.5"
 	}

composer.lock

@@ -786,9 +786,9 @@ public function addDirectoryRecursive(string $path): DataResponse {
 			$files = $this->processService->searchFilesWithExt($folder, $sharedAllowed, $mountedAllowed, $extensions);
 			$alldirs = [];
 			foreach ($files as $file) {
-				if ($file instanceof File &&
+				if ($file instanceof File
 					// name extension is supported
-					(
+					&& (
 						in_array('.' . pathinfo($file->getName(), PATHINFO_EXTENSION), array_keys(ConversionService::fileExtToGpsbabelFormat))
 						|| in_array('.' . pathinfo($file->getName(), PATHINFO_EXTENSION), $this->upperExtensions)
 					)

lib/Controller/PageController.php

@@ -523,8 +523,8 @@ public function igcToGpx($fh, $trackOptions) {
 				$gpx_time = $domGpx->createElement('time');
 				$gpx_trkpt->appendChild($gpx_time);
 				$gpx_time_text = $domGpx->createTextNode(
-					$date->format('Y-m-d') .
-					'T' . substr($line, 1, 2) . ':' . substr($line, 3, 2) . ':' . substr($line, 5, 2)
+					$date->format('Y-m-d')
+					. 'T' . substr($line, 1, 2) . ':' . substr($line, 3, 2) . ':' . substr($line, 5, 2)
 				);
 				$gpx_time->appendChild($gpx_time_text);