Merge branch 'master' into stable24

.github/workflows/lint-php.yaml

@@ -5,18 +5,6 @@ on:
   - pull_request
 
 jobs:
-  xml-linters:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@master
-      - name: Download schema
-        run: wget https://apps.nextcloud.com/schema/apps/info.xsd
-      - name: Lint info.xml
-        uses: ChristophWurst/xmllint-action@v1
-        with:
-          xml-file: ./appinfo/info.xml
-          xml-schema-file: ./info.xsd
   php-cs-fixer:
     name: PHP-CS-Fixer
     runs-on: ubuntu-latest

lib/Migration/Repair.php

@@ -8,21 +8,24 @@ use OCP\IConfig;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 
-class Repair implements IRepairStep {
+class Repair implements IRepairStep
+{
+    protected IConfig $config;
 
-	protected IConfig $config;
+    public function __construct(IConfig $config)
+    {
+        $this->config = $config;
+    }
 
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    public function getName(): string
+    {
+        return 'Repair steps for Memories';
+    }
 
-	public function getName(): string {
-		return 'Repair steps for Memories';
-	}
-
-	public function run(IOutput $output): void {
-		// kill any instances of go-transcode and go-vod
+    public function run(IOutput $output): void
+    {
+        // kill any instances of go-transcode and go-vod
         shell_exec('pkill go-transcode');
         shell_exec('pkill go-vod');
-	}
-}
+    }
+}