From 09e0929096a65cd84f8f79a750ebb0f7aaa582e6 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Thu, 10 Nov 2022 22:22:06 -0800
Subject: [PATCH 1/2] Lint fixes

---
 .github/workflows/lint-php.yaml | 12 ------------
 lib/Migration/Repair.php        | 29 ++++++++++++++++-------------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/lint-php.yaml b/.github/workflows/lint-php.yaml
index fbbda5d3..d5fdff46 100644
--- a/.github/workflows/lint-php.yaml
+++ b/.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
diff --git a/lib/Migration/Repair.php b/lib/Migration/Repair.php
index 2f99d7fb..ddfb93b3 100644
--- a/lib/Migration/Repair.php
+++ b/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');
-	}
-}
\ No newline at end of file
+    }
+}

From e3b9a44b68e074d2e6983bd17ccb3c962dedf8b8 Mon Sep 17 00:00:00 2001
From: Varun Patil <varunpatil@ucla.edu>
Date: Thu, 10 Nov 2022 22:22:23 -0800
Subject: [PATCH 2/2] release: v4.7.0-alpha.6

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index d1f9921e..9848fa74 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -33,7 +33,7 @@ Memories is a *batteries-included* photo management solution for Nextcloud with
 1. Run `php ./occ memories:index` to generate metadata indices for existing photos.
 1. Open the 📷 Memories app in Nextcloud and set the directory containing your photos.
 ]]></description>
-    <version>4.7.0-alpha.5</version>
+    <version>4.7.0-alpha.6</version>
     <licence>agpl</licence>
     <author mail="radialapps@gmail.com" >Varun Patil</author>
     <namespace>Memories</namespace>