From a39e7bab4fb5b57edba1ffd17ca469ed59ef0db1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Thu, 1 Oct 2020 17:41:28 +0200
Subject: [PATCH 1/4] bumb server version for drone tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 .drone.yml | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e230a77f..417182df 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,10 +2,10 @@ kind: pipeline
 name: compatibility
 steps:
   - name: compatibility
-    image: nextcloudci/php7.1:php7.1-15
+    image: nextcloudci/php7.3:php7.3-5
     environment:
       APP_NAME: social
-      CORE_BRANCH: stable17
+      CORE_BRANCH: stable20
       DB: sqlite
     commands:
       - composer install
@@ -23,18 +23,13 @@ trigger:
 kind: pipeline
 name: syntax
 steps:
-  - name: syntax-php7.1
-    image: nextcloudci/php7.1:php7.1-15
-    commands:
-      - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
   - name: syntax-php7.2
     image: nextcloudci/php7.2:php7.2-9
     commands:
       - composer install
       - ./vendor/bin/parallel-lint --exclude ./vendor/ .
   - name: syntax-php7.3
-    image: nextcloudci/php7.3:php7.3-2
+    image: nextcloudci/php7.3:php7.3-5
     commands:
       - composer install
       - ./vendor/bin/parallel-lint --exclude ./vendor/ .
@@ -46,13 +41,13 @@ trigger:
     - push
 ---
 kind: pipeline
-name: php7.1-sqlite
+name: php7.3-sqlite
 steps:
-- name: php7.1
-  image: nextcloudci/php7.1:php7.1-16
+- name: php7.3
+  image: nextcloudci/php7.3:php7.3-5
   environment:
     APP_NAME: social
-    CORE_BRANCH: stable17
+    CORE_BRANCH: stable20
     DB: sqlite
   commands:
     - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
@@ -67,13 +62,13 @@ trigger:
     - push
 ---
 kind: pipeline
-name: php7.1-mysql
+name: php7.3-mysql
 steps:
-- name: php7.1
-  image: nextcloudci/php7.1:php7.1-16
+- name: php7.3
+  image: nextcloudci/php7.3:php7.3-5
   environment:
     APP_NAME: social
-    CORE_BRANCH: stable17
+    CORE_BRANCH: stable20
     DB: mysql
   commands:
     - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
@@ -97,13 +92,13 @@ trigger:
     - push
 ---
 kind: pipeline
-name: php7.1-postgres
+name: php7.3-postgres
 steps:
-- name: php7.1
-  image: nextcloudci/php7.1:php7.1-16
+- name: php7.3
+  image: nextcloudci/php7.3:php7.3-5
   environment:
     APP_NAME: social
-    CORE_BRANCH: stable17
+    CORE_BRANCH: stable20
     DB: postgres
   commands:
     - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB

From 153195a2adc437cb3e9b1ca03219b620cb0899e5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Thu, 1 Oct 2020 17:51:49 +0200
Subject: [PATCH 2/4] fix lint

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 src/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router.js b/src/router.js
index bb797aaf..d2b281c9 100644
--- a/src/router.js
+++ b/src/router.js
@@ -104,7 +104,7 @@ export default new Router({
 				default: Profile,
 				details: ProfileTimeline
 			},
-			props: true,
+			props: true
 		}
 	]
 })

From b2a7b77d2cee3421166d36d22d9b045eb7927a1a Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Thu, 1 Oct 2020 17:53:17 +0200
Subject: [PATCH 3/4] pin version of daita/my-small-php-tools

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7c3c5a10..a2b5143e 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
     }
   },
   "require": {
-    "daita/my-small-php-tools": "dev-master",
+    "daita/my-small-php-tools": "dev-master#ca9c257dd640576c072cb50282e15ae51147cfc2",
     "gumlet/php-image-resize": "2.0.*",
     "friendica/json-ld": "^1.0"
   },

From 67ff7c85a2bd3c9dbba41785715648b69b11e1df Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Thu, 1 Oct 2020 18:07:14 +0200
Subject: [PATCH 4/4] fix composer bin paths

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 .drone.yml          | 4 ++--
 .gitignore          | 2 +-
 tests/bootstrap.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 417182df..986d1c41 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -27,12 +27,12 @@ steps:
     image: nextcloudci/php7.2:php7.2-9
     commands:
       - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+      - ./composer/bin/parallel-lint --exclude ./composer/ .
   - name: syntax-php7.3
     image: nextcloudci/php7.3:php7.3-5
     commands:
       - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+      - ./composer/bin/parallel-lint --exclude ./composer/ .
 trigger:
   branch:
     - master
diff --git a/.gitignore b/.gitignore
index ba525aaa..3bc6f2af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ js/
 node_modules/
 vendor/
 img/twemoji/
-vendor/
+composer/
 
 cypress/screenshots
 cypress/snapshots
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 0db0e40a..bf2dc153 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
 require_once __DIR__ . '/../../../tests/bootstrap.php';
-require_once __DIR__.'/../vendor/autoload.php';
+require_once __DIR__.'/../composer/autoload.php';
 
 OC_App::loadApp('social');
 OC_Hook::clear();