Merge pull request #1042 from nextcloud/tests/bumb-drone-server-branch

ci fixes

.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,21 +23,16 @@ 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/ .
+      - ./composer/bin/parallel-lint --exclude ./composer/ .
   - 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/ .
+      - ./composer/bin/parallel-lint --exclude ./composer/ .
 trigger:
   branch:
     - master
@@ -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

.gitignore

@@ -3,7 +3,7 @@ js/
 node_modules/
 vendor/
 img/twemoji/
-vendor/
+composer/
 
 cypress/screenshots
 cypress/snapshots

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"
   },

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();