Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ updates:
target-branch: stable32
directories:
- "/"
- "/build/integration"
- "/vendor-bin/behat"
- "/vendor-bin/cs-fixer"
- "/vendor-bin/openapi-extractor"
- "/vendor-bin/phpunit"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integration-s3-primary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ jobs:
- name: Set up Nextcloud
run: |
composer install
mkdir data
echo '<?php $CONFIG=["${{ matrix.key }}" => ["class" => "OC\Files\ObjectStore\S3", "arguments" => ["bucket" => "nextcloud", "autocreate" => true, "key" => "nextcloud", "secret" => "bWluaW8tc2VjcmV0LWtleS1uZXh0Y2xvdWQ=", "hostname" => "localhost", "port" => 9000, "use_ssl" => false, "use_path_style" => true, "uploadPartSize" => 52428800]]];' > config/config.php
echo '<?php $CONFIG=["redis" => ["host" => "localhost", "port" => 6379], "memcache.local" => "\OC\Memcache\Redis", "memcache.distributed" => "\OC\Memcache\Redis"];' > config/redis.config.php
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/integration-sqlite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,9 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Set up production dependencies
run: composer i --no-dev

- name: Set up behat dependencies
working-directory: build/integration
run: composer i
- name: Set up dependencies
run: |
composer install
- name: Set up Talk dependencies
if: ${{ matrix.test-suite == 'videoverification_features' }}
Expand Down
2 changes: 1 addition & 1 deletion REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ SPDX-FileCopyrightText = "2025 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later"

[[annotations]]
path = ["composer.json", "composer.lock", ".github/CODEOWNERS", "__tests__/tsconfig.json", "tsconfig.json", "build/integration/composer.**", "vendor-bin/**/composer.json", "vendor-bin/**/composer.lock", "apps/**/composer/composer.json", "apps/**/composer/composer.lock", "apps/**/composer/composer/installed.json"]
path = ["composer.json", "composer.lock", ".github/CODEOWNERS", "__tests__/tsconfig.json", "tsconfig.json", "apps/**/composer/composer.json", "apps/**/composer/composer.lock", "apps/**/composer/composer/installed.json"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2011-2016 ownCloud, Inc., 2016-2024 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-only OR AGPL-3.0-or-later"
Expand Down
11 changes: 3 additions & 8 deletions autotest-external.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ADMINLOGIN=admin$EXECUTOR_NUMBER
BASEDIR=$PWD

DBCONFIGS="sqlite mysql pgsql oci"
PHPUNIT=$(which phpunit)
PHPUNIT="$PWD/lib/composer/bin/phpunit"

_XDEBUG_CONFIG=$XDEBUG_CONFIG
unset XDEBUG_CONFIG
Expand All @@ -28,13 +28,8 @@ function print_syntax {
}

if ! [ -x "$PHPUNIT" ]; then
echo "phpunit executable not found, trying local one from build/integration" >&2
if [ -x "$PWD/build/integration/vendor/phpunit/phpunit/phpunit" ]; then
PHPUNIT="$PWD/build/integration/vendor/phpunit/phpunit/phpunit"
else
echo "phpunit executable not found, please install phpunit version >= 9.0" >&2
exit 3
fi
echo "phpunit executable not found, please run 'composer install' in the root directory first." >&2
exit 3
fi

PHPUNIT_VERSION=$("$PHPUNIT" --version | cut -d" " -f2)
Expand Down
15 changes: 0 additions & 15 deletions build/integration/composer.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use PHPUnit\Framework\Assert;
use Psr\Http\Message\ResponseInterface;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

trait AppConfiguration {
/** @var string */
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\ServerException;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

trait Auth {
/** @var string */
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/Avatar.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
use PHPUnit\Framework\Assert;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

trait Avatar {
/** @var string * */
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/BasicStructure.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
use PHPUnit\Framework\Assert;
use Psr\Http\Message\ResponseInterface;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

trait BasicStructure {
use Auth;
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/CalDavContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use Behat\Behat\Context\SnippetAcceptingContext;
use PHPUnit\Framework\Assert;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

/**
* Capabilities context.
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/CardDavContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

use GuzzleHttp\Client;
use GuzzleHttp\Message\ResponseInterface;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use GuzzleHttp\Client;
use PHPUnit\Framework\Assert;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

class CollaborationContext implements Context {
use Provisioning;
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/CommandLine.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/
use PHPUnit\Framework\Assert;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

trait CommandLine {
/** @var int return code of last command */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

use Behat\Behat\Context\Exception\ContextNotFoundException;
use Behat\Behat\Hook\Scope\BeforeScenarioScope;
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/CommentsContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

class CommentsContext implements \Behat\Behat\Context\Context {
/** @var string */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

class DavFeatureContext implements Context, SnippetAcceptingContext {
use AppConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/Download.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use PHPUnit\Framework\Assert;
use Psr\Http\Message\StreamInterface;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

trait Download {
/** @var string * */
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/ExternalStorage.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Behat\Gherkin\Node\TableNode;
use PHPUnit\Framework\Assert;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

trait ExternalStorage {
private array $storageIds = [];
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/FeatureContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

/**
* Features context.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use Behat\Gherkin\Node\TableNode;
use PHPUnit\Framework\Assert;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

/**
* Federation context.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Behat\Behat\Context\SnippetAcceptingContext;
use GuzzleHttp\Client;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

class FilesDropContext implements Context, SnippetAcceptingContext {
use WebDav;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Behat\Behat\Context\Context;
use PHPUnit\Framework\Assert;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';


/**
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/MetadataContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use PHPUnit\Framework\Assert;
use Sabre\DAV\Client as SClient;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

class MetadataContext implements Context {
private string $davPath = '/remote.php/dav';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

use Behat\Behat\Context\Context;
use GuzzleHttp\BodySummarizer;
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/Provisioning.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
use GuzzleHttp\Message\ResponseInterface;
use PHPUnit\Framework\Assert;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

trait Provisioning {
use BasicStructure;
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/RemoteContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use OCP\Http\Client\IClientService;
use PHPUnit\Framework\Assert;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

/**
* Remote context.
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/RoutingContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

class RoutingContext implements Context, SnippetAcceptingContext {
use Provisioning;
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/SetupContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
use Behat\Behat\Context\Context;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';


/**
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/ShareesContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';


/**
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/Sharing.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
use PHPUnit\Framework\Assert;
use Psr\Http\Message\ResponseInterface;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';



Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/SharingContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Behat\Behat\Context\Context;
use Behat\Behat\Context\SnippetAcceptingContext;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';


/**
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/TagsContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-only
*/
require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

use Behat\Gherkin\Node\TableNode;
use GuzzleHttp\Client;
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/Theming.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

trait Theming {

Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/Trashbin.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

use PHPUnit\Framework\Assert;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';

/**
* Trashbin functions
Expand Down
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/WebDav.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Sabre\DAV\Client as SClient;
use Sabre\DAV\Xml\Property\ResourceType;

require __DIR__ . '/../../vendor/autoload.php';
require __DIR__ . '/autoload.php';


trait WebDav {
Expand Down
9 changes: 9 additions & 0 deletions build/integration/features/bootstrap/autoload.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

/**
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

require __DIR__ . '/../../../../vendor-bin/behat/vendor/autoload.php';
require __DIR__ . '/../../../../3rdparty/autoload.php';
Loading
Loading