diff options
| author | Maxence Lange <maxence@artificial-owl.com> | 2020-10-11 15:13:47 -0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-11 15:13:47 -0100 |
| commit | 5de193fc22dcc3c5577f84b01af2e4f2bbd6e562 (patch) | |
| tree | ee442aa0aa708b704a71535f6a264a1c2936f562 | |
| parent | 66cd160768c7ad9212cc6227eea656d48005890a (diff) | |
| parent | 67a719890ea4d5b0404a9aaeda3a1a36215b56d5 (diff) | |
Merge pull request #1052 from nextcloud/vendor-dir
use default composer vendor directory
| -rw-r--r-- | .drone.yml | 10 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | composer.json | 1 | ||||
| -rw-r--r-- | lib/AppInfo/Application.php | 1 | ||||
| -rw-r--r-- | lib/hostmeta.php | 2 | ||||
| -rw-r--r-- | lib/webfinger.php | 2 | ||||
| -rw-r--r-- | tests/bootstrap.php | 2 |
7 files changed, 9 insertions, 10 deletions
@@ -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 @@ -3,7 +3,6 @@ js/ node_modules/ vendor/ img/twemoji/ -composer/ cypress/screenshots cypress/snapshots diff --git a/composer.json b/composer.json index a2b5143e..2a6532ba 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,6 @@ "platform": { "php": "7.0.0" }, - "vendor-dir": "composer/", "optimize-autoloader": true, "classmap-authoritative": true, "autoloader-suffix": "Social" diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 87301824..0f7eab91 100644 --- a/lib/AppInfo/Application.php +++ b/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 diff --git a/lib/hostmeta.php b/lib/hostmeta.php index 00e56d94..ef130a3f 100644 --- a/lib/hostmeta.php +++ b/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); diff --git a/lib/webfinger.php b/lib/webfinger.php index ba5849e2..2c65be71 100644 --- a/lib/webfinger.php +++ b/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'; diff --git a/tests/bootstrap.php b/tests/bootstrap.php index bf2dc153..0db0e40a 100644 --- a/tests/bootstrap.php +++ b/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(); |