use default composer vendor directory

Signed-off-by: Robin Appelman <robin@icewind.nl>

.drone.yml

@@ -27,12 +27,12 @@ steps:
     image: nextcloudci/php7.2:php7.2-9
     commands:
       - composer install
-      - ./composer/bin/parallel-lint --exclude ./composer/ .
+      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
   - name: syntax-php7.3
     image: nextcloudci/php7.3:php7.3-5
     commands:
       - composer install
-      - ./composer/bin/parallel-lint --exclude ./composer/ .
+      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
 trigger:
   branch:
     - master
@@ -50,9 +50,9 @@ steps:
     CORE_BRANCH: stable20
     DB: sqlite
   commands:
+    - composer install
     - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
     - cd ../server/apps/$APP_NAME
-    - composer install
     - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
 trigger:
   branch:
@@ -71,9 +71,9 @@ steps:
     CORE_BRANCH: stable20
     DB: mysql
   commands:
+    - composer install
     - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
     - cd ../server/apps/$APP_NAME
-    - composer install
     - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
 services:
 - name: mysql
@@ -101,9 +101,9 @@ steps:
     CORE_BRANCH: stable20
     DB: postgres
   commands:
+    - composer install
     - bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
     - cd ../server/apps/$APP_NAME
-    - composer install
     - phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
 services:
 - name: postgres

.gitignore

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

composer.json

@@ -13,7 +13,6 @@
     "platform": {
       "php": "7.0.0"
     },
-    "vendor-dir": "composer/",
     "optimize-autoloader": true,
     "classmap-authoritative": true,
     "autoloader-suffix": "Social"

lib/AppInfo/Application.php

@@ -46,6 +46,7 @@ use OCP\AppFramework\QueryException;
 use OCP\IServerContainer;
 use Throwable;
 
+require_once __DIR__ . '/../../vendor/autoload.php';
 
 /**
  * Class Application

lib/hostmeta.php

@@ -34,7 +34,7 @@ use OC;
 use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\FediverseService;
 
-require_once(__DIR__ . '/../composer/autoload.php');
+require_once(__DIR__ . '/../vendor/autoload.php');
 
 try {
 	$fediverseService = OC::$server->query(FediverseService::class);

lib/webfinger.php

@@ -37,7 +37,7 @@ use OCA\Social\Service\ConfigService;
 use OCA\Social\Service\FediverseService;
 use OCP\AppFramework\QueryException;
 
-require_once(__DIR__ . '/../composer/autoload.php');
+require_once(__DIR__ . '/../vendor/autoload.php');
 
 if (!array_key_exists('resource', $_GET)) {
 	echo 'missing resource';

tests/bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 
 require_once __DIR__ . '/../../../tests/bootstrap.php';
-require_once __DIR__.'/../composer/autoload.php';
+require_once __DIR__.'/../vendor/autoload.php';
 
 OC_App::loadApp('social');
 OC_Hook::clear();