diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2024-01-26 14:37:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-26 14:37:53 +0100 |
commit | 8d114c9e7441f6de4637d38fdec86a7a7f3b5085 (patch) | |
tree | fa570a3fd539ca39b87cd10a01cd2bc3d8215ef2 | |
parent | 08ec513f2956c1beb49cf12385e945ec5e46eaea (diff) | |
parent | da46be4c152c50fbb25bdf999df32f646f5fb5c1 (diff) | |
download | nextcloud-server-8d114c9e7441f6de4637d38fdec86a7a7f3b5085.tar.gz nextcloud-server-8d114c9e7441f6de4637d38fdec86a7a7f3b5085.zip |
Merge pull request #41139 from nextcloud/techdebt/noid/move-integration-testing-to-actions
Move integration tests to github actions
-rw-r--r-- | .drone.yml | 996 | ||||
-rw-r--r-- | .github/workflows/integration-s3-primary.yml (renamed from .github/workflows/s3-primary-integration.yml) | 34 | ||||
-rw-r--r-- | .github/workflows/integration-sqlite.yml | 167 | ||||
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | build/integration/comments_features/comments-search.feature (renamed from build/integration/features/comments-search.feature) | 0 | ||||
-rw-r--r-- | build/integration/comments_features/comments.feature (renamed from build/integration/features/comments.feature) | 0 | ||||
-rw-r--r-- | build/integration/composer.json | 23 | ||||
-rw-r--r-- | build/integration/composer.lock | 554 | ||||
-rw-r--r-- | build/integration/config/behat.yml | 106 | ||||
-rw-r--r-- | build/integration/dav_features/caldav.feature (renamed from build/integration/features/caldav.feature) | 0 | ||||
-rw-r--r-- | build/integration/dav_features/carddav.feature (renamed from build/integration/features/carddav.feature) | 0 | ||||
-rw-r--r-- | build/integration/dav_features/dav-v2.feature (renamed from build/integration/features/dav-v2.feature) | 0 | ||||
-rw-r--r-- | build/integration/dav_features/webdav-related.feature (renamed from build/integration/features/webdav-related.feature) | 0 | ||||
-rw-r--r-- | build/integration/features/bootstrap/CommandLineContext.php | 2 | ||||
-rw-r--r-- | build/integration/features/bootstrap/LDAPContext.php | 5 | ||||
-rw-r--r-- | build/integration/features/bootstrap/WebDav.php | 10 | ||||
-rw-r--r-- | build/integration/features/ratelimiting.feature | 4 | ||||
-rw-r--r-- | build/integration/files_features/checksums.feature (renamed from build/integration/features/checksums.feature) | 0 | ||||
-rw-r--r-- | build/integration/files_features/download.feature (renamed from build/integration/features/download.feature) | 0 | ||||
-rw-r--r-- | build/integration/files_features/external-storage.feature (renamed from build/integration/features/external-storage.feature) | 0 | ||||
-rw-r--r-- | build/integration/files_features/favorites.feature (renamed from build/integration/features/favorites.feature) | 0 | ||||
-rw-r--r-- | build/integration/files_features/tags.feature (renamed from build/integration/features/tags.feature) | 0 | ||||
-rw-r--r-- | build/integration/files_features/transfer-ownership.feature (renamed from build/integration/features/transfer-ownership.feature) | 0 | ||||
-rw-r--r-- | build/integration/files_features/trashbin.feature (renamed from build/integration/features/trashbin.feature) | 0 | ||||
-rw-r--r-- | build/integration/openldap_features/openldap-uid-username.feature (renamed from build/integration/ldap_features/openldap-uid-username.feature) | 0 | ||||
-rw-r--r-- | build/integration/openldap_numerical_features/openldap-numerical-id.feature (renamed from build/integration/ldap_features/openldap-numerical-id.feature) | 0 | ||||
-rwxr-xr-x | build/integration/run.sh | 8 | ||||
-rw-r--r-- | build/integration/videoverification_features/sharing-v1-video-verification.feature (renamed from build/integration/sharing_features/sharing-v1-video-verification.feature) | 0 |
28 files changed, 541 insertions, 1370 deletions
diff --git a/.drone.yml b/.drone.yml index de4b481a39c..4503c9a8741 100644 --- a/.drone.yml +++ b/.drone.yml @@ -569,1000 +569,6 @@ trigger: --- kind: pipeline -name: integration-capabilities_features - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-capabilities_features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh capabilities_features/capabilities.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-collaboration_features - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-collaboration_features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh collaboration_features/ - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-federation_features - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-federation_features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin - - cd build/integration - - ./run.sh federation_features/ - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-auth - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-auth - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/auth.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-avatar - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-avatar - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/avatar.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-maintenance-mode - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-maintenance-mode - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/maintenance-mode.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-ratelimiting - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-ratelimiting - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - ./occ config:system:set redis host --value=cache - - ./occ config:system:set redis port --value=6379 --type=integer - - ./occ config:system:set redis timeout --value=0 --type=integer - - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local - - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed - - ./occ app:enable testing - - cd build/integration - - ./run.sh features/ratelimiting.feature - -services: -- name: cache - image: ghcr.io/nextcloud/continuous-integration-redis:latest - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-carddav - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-carddav - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/carddav.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-dav-v2 - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-dav-v2 - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/dav-v2.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-ocs-v1 - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-ocs-v1 - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/ocs-v1.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-checksums-v1 - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-checksums-v1 - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/checksums.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-external-storage - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-external-storage - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/external-storage.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-provisioning-v1 - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-provisioning-v1 - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/provisioning-v1.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-tags - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-tags - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/tags.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-caldav - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-caldav - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/caldav.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-comments - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-comments - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/comments.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-comments-search - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-comments-search - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/comments-search.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-contacts-menu - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-contacts-menu - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/contacts-menu.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-favorites - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-favorites - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/favorites.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-provisioning-v2 - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-provisioning-v2 - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/provisioning-v2.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-webdav-related - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-webdav-related - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/webdav-related.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-sharees-features - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-sharees-features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh sharees_features/sharees.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-sharees-v2-features - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-sharees-v2-features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh sharees_features/sharees_provisioningapiv2.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-sharing-v1 - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-sharing-v1 - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh sharing_features/sharing-v1.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-sharing-v1-part2 - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-sharing-v1-part2 - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh sharing_features/sharing-v1-part2.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-sharing-v1-part3 - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-sharing-v1-part3 - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh sharing_features/sharing-v1-part3.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-sharing-v1-video-verification - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: install-talk - image: ghcr.io/nextcloud/continuous-integration-php8.0:latest - commands: - # JavaScript files are not used in integration tests, so it is not needed to - # build them. - - git clone --depth 1 --branch main https://github.com/nextcloud/spreed apps/spreed - - cd apps/spreed - - composer --version - - composer self-update --2 - - composer install --no-dev - - cd ../.. -- name: integration-sharing-v1-video-verification - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh sharing_features/sharing-v1-video-verification.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-setup-features - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-setup-features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - cd build/integration - - ./run.sh setup_features/setup.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-filesdrop-features - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-filesdrop-features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh filesdrop_features/filesdrop.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-transfer-ownership-features - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-transfer-ownership-features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/transfer-ownership.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-ldap-features - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-ldap-features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh ldap_features/ldap-ocs.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-ldap-openldap-features - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-ldap-openldap-features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - ./occ config:system:set redis host --value=cache - - ./occ config:system:set redis port --value=6379 --type=integer - - ./occ config:system:set redis timeout --value=0 --type=integer - - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local - - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed - - cd build/integration - - ./run.sh ldap_features/ldap-openldap.feature - -services: -- name: cache - image: ghcr.io/nextcloud/continuous-integration-redis:latest -- name: openldap - image: ghcr.io/nextcloud/continuous-integration-openldap:openldap-7 - environment: - SLAPD_DOMAIN: nextcloud.ci - SLAPD_ORGANIZATION: Nextcloud - SLAPD_PASSWORD: admin - SLAPD_ADDITIONAL_MODULES: memberof - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-ldap-openldap-uid-features - -steps: - - name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init - - name: integration-ldap-openldap-uid-features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - ./occ config:system:set redis host --value=cache - - ./occ config:system:set redis port --value=6379 --type=integer - - ./occ config:system:set redis timeout --value=0 --type=integer - - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local - - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed - - cd build/integration - - ./run.sh ldap_features/openldap-uid-username.feature - -services: - - name: cache - image: ghcr.io/nextcloud/continuous-integration-redis:latest - - name: openldap - image: ghcr.io/nextcloud/continuous-integration-openldap:openldap-7 - environment: - SLAPD_DOMAIN: nextcloud.ci - SLAPD_ORGANIZATION: Nextcloud - SLAPD_PASSWORD: admin - SLAPD_ADDITIONAL_MODULES: memberof - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push -type: docker - ---- -kind: pipeline -name: integration-ldap-openldap-numerical-id-features - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-ldap-openldap-numerical-id-features - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - ./occ config:system:set redis host --value=cache - - ./occ config:system:set redis port --value=6379 --type=integer - - ./occ config:system:set redis timeout --value=0 --type=integer - - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.local - - ./occ config:system:set --type string --value "\\OC\\Memcache\\Redis" memcache.distributed - - cd build/integration - - ./run.sh ldap_features/openldap-numerical-id.feature - -services: -- name: cache - image: ghcr.io/nextcloud/continuous-integration-redis:latest -- name: openldap - image: ghcr.io/nextcloud/continuous-integration-openldap:openldap-7 - environment: - SLAPD_DOMAIN: nextcloud.ci - SLAPD_ORGANIZATION: Nextcloud - SLAPD_PASSWORD: admin - SLAPD_ADDITIONAL_MODULES: memberof - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-trashbin - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-trashbin - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh features/trashbin.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-remote-api - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-remote-api - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh remoteapi_features/remote.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline -name: integration-download - -steps: -- name: submodules - image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest - commands: - - git submodule update --init -- name: integration-download - image: ghcr.io/nextcloud/continuous-integration-integration-php8.0:latest - commands: - - bash tests/drone-run-integration-tests.sh || exit 0 - - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int - - cd build/integration - - ./run.sh --tags ~@large features/download.feature - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - ---- -kind: pipeline name: nodb-codecov steps: @@ -1728,4 +734,4 @@ trigger: - push --- kind: signature -hmac: 641c0bf70ed3d9561f41687c19dd5223da37143cbd6c2ad829836da41b57d4c5 +hmac: 893f108e2269f7da269bf70b284e40d13932bd2697d0393686c42b287da5afcf diff --git a/.github/workflows/s3-primary-integration.yml b/.github/workflows/integration-s3-primary.yml index c957af7ada0..618129c3de9 100644 --- a/.github/workflows/s3-primary-integration.yml +++ b/.github/workflows/integration-s3-primary.yml @@ -4,6 +4,7 @@ on: paths: - '.github/workflows/**' - '3rdparty/**' + - 'build/integration/**' - '**/*.php' - '**/lib/**' - '**/tests/**' @@ -13,12 +14,12 @@ on: - 'composer.lock' concurrency: - group: s3-external-integration-${{ github.head_ref || github.run_id }} + group: integration-s3-primary-${{ github.head_ref || github.run_id }} cancel-in-progress: true jobs: - s3-primary-integration-tests-minio: - runs-on: ubuntu-20.04 + integration-s3-primary: + runs-on: ubuntu-latest if: ${{ github.repository_owner != 'nextcloud-gmbh' }} @@ -33,14 +34,16 @@ jobs: services: redis: - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest + options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3 ports: - - "6379:6379" + - 6379:6379/tcp minio: + image: bitnami/minio env: - MINIO_ACCESS_KEY: minio - MINIO_SECRET_KEY: minio123 - image: bitnami/minio:2021.12.29 + MINIO_ROOT_USER: nextcloud + MINIO_ROOT_PASSWORD: bWluaW8tc2VjcmV0LWtleS1uZXh0Y2xvdWQ= + MINIO_DEFAULT_BUCKETS: nextcloud ports: - "9000:9000" @@ -51,10 +54,13 @@ jobs: submodules: true - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d #v2.25.2 + uses: shivammathur/setup-php@4bd44f22a98a19e0950cbad5f31095157cc9621b # v2 with: php-version: ${{ matrix.php-versions }} - extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, redis + # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation + extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite + coverage: 'none' + ini-file: development env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -66,7 +72,7 @@ jobs: - name: Set up Nextcloud run: | mkdir data - echo '<?php $CONFIG=["${{ matrix.key }}" => ["class" => "OC\Files\ObjectStore\S3", "arguments" => ["bucket" => "nextcloud", "autocreate" => true, "key" => "minio", "secret" => "minio123", "hostname" => "localhost", "port" => 9000, "use_ssl" => false, "use_path_style" => true, "uploadPartSize" => 52428800]]];' > config/config.php + 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 ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin php -f index.php @@ -74,7 +80,7 @@ jobs: - name: Integration run: | cd build/integration - bash run.sh --tags "~@failure-s3" features/webdav-related.feature + bash run.sh --tags "~@failure-s3" dav_features/webdav-related.feature - name: S3 logs if: always() @@ -86,10 +92,10 @@ jobs: s3-primary-integration-summary: runs-on: ubuntu-latest - needs: [s3-primary-integration-tests-minio] + needs: [integration-s3-primary] if: always() steps: - name: Summary status - run: if ${{ needs.s3-primary-integration-tests-minio.result != 'success' }}; then exit 1; fi + run: if ${{ needs.integration-s3-primary.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/integration-sqlite.yml b/.github/workflows/integration-sqlite.yml new file mode 100644 index 00000000000..de32836fc7c --- /dev/null +++ b/.github/workflows/integration-sqlite.yml @@ -0,0 +1,167 @@ +name: Integration sqlite + +on: + pull_request: + push: + branches: + - main + - master + - stable* + +permissions: + contents: read + +concurrency: + group: integration-sqlite-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + changes: + runs-on: ubuntu-latest + + outputs: + # FIXME src: ${{ steps.changes.outputs.src}} + src: 'true' + + steps: + - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - '3rdparty/**' + - '**/*.php' + - '**/lib/**' + - '**/tests/**' + - '**/vendor-bin/**' + - 'build/integration/**' + - '.php-cs-fixer.dist.php' + - 'composer.json' + - 'composer.lock' + + integration-sqlite: + runs-on: ubuntu-latest + + needs: changes + if: needs.changes.outputs.src != 'false' + + strategy: + fail-fast: false + matrix: + test-suite: + - 'capabilities_features' + - 'collaboration_features' + - 'comments_features' + - 'dav_features' + - 'features' + - 'federation_features' + - '--tags ~@large files_features' + - 'filesdrop_features' + - 'openldap_features' + - 'openldap_numerical_features' + - 'ldap_features' + - 'remoteapi_features' + - 'setup_features' + - 'sharees_features' + - 'sharing_features' + - 'videoverification_features' + + php-versions: ['8.2'] + spreed-versions: ['main'] + + services: + redis: + image: ghcr.io/nextcloud/continuous-integration-redis:latest + options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3 + ports: + - 6379:6379/tcp + openldap: + image: ghcr.io/nextcloud/continuous-integration-openldap:openldap-7 + ports: + - 389:389 + env: + SLAPD_DOMAIN: nextcloud.ci + SLAPD_ORGANIZATION: Nextcloud + SLAPD_PASSWORD: admin + SLAPD_ADDITIONAL_MODULES: memberof + + steps: + - name: Checkout server + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + with: + submodules: true + + - name: Checkout Talk app + if: ${{ matrix.test-suite == 'videoverification_features' }} + uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + with: + repository: nextcloud/spreed + path: apps/spreed + ref: ${{ matrix.spreed-versions }} + + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2 + with: + php-version: ${{ matrix.php-versions }} + # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation + extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, imagick, intl, json, ldap, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite + coverage: none + ini-file: development + 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 Talk dependencies + if: ${{ matrix.test-suite == 'videoverification_features' }} + working-directory: apps/spreed + run: composer i --no-dev + + - name: Set up Nextcloud + run: | + mkdir data + ./occ maintenance:install --verbose ${{ contains(matrix.test-suite,'ldap') && '--data-dir=/dev/shm/nc_int' || '' }} --database=sqlite --database-name=nextcloud --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin + ./occ config:system:set hashing_default_password --value=true --type=boolean + + - name: Configure caching + if: ${{ contains(matrix.test-suite,'ldap') }} + run: | + ./occ config:system:set redis host --value=localhost + ./occ config:system:set redis port --value=6379 --type=integer + ./occ config:system:set redis timeout --value=0 --type=integer + ./occ config:system:set memcache.local --value='\OC\Memcache\Redis' + ./occ config:system:set memcache.distributed --value='\OC\Memcache\Redis' + + - name: Run integration + working-directory: build/integration + env: + LDAP_HOST: localhost + run: bash run.sh ${{ matrix.test-suite }} no-tail-log + + - name: Print logs + if: always() + run: | + cat data/nextcloud.log + docker ps -a + docker ps -aq | while read container ; do IMAGE=$(docker inspect --format='{{.Config.Image}}' $container); echo $IMAGE; docker logs $container; echo "\n\n" ; done + + summary: + permissions: + contents: none + runs-on: ubuntu-latest + needs: [changes, integration-sqlite] + + if: always() + + name: integration-sqlite-summary + + steps: + - name: Summary status + run: if ${{ needs.changes.outputs.src != 'false' && needs.integration-sqlite.result != 'success' }}; then exit 1; fi diff --git a/.gitignore b/.gitignore index c2210c1fa06..bbcbddff26a 100644 --- a/.gitignore +++ b/.gitignore @@ -129,6 +129,8 @@ nbproject /build/bin /build/lib/ /build/jsdocs/ +/build/integration/output/ +/build/integration/phpserver.log /npm-debug.log /PhantomJS_* diff --git a/build/integration/features/comments-search.feature b/build/integration/comments_features/comments-search.feature index a1d116ee3f4..a1d116ee3f4 100644 --- a/build/integration/features/comments-search.feature +++ b/build/integration/comments_features/comments-search.feature diff --git a/build/integration/features/comments.feature b/build/integration/comments_features/comments.feature index 0f3a4cc75cf..0f3a4cc75cf 100644 --- a/build/integration/features/comments.feature +++ b/build/integration/comments_features/comments.feature diff --git a/build/integration/composer.json b/build/integration/composer.json index 7ab6e04079d..7ab9da29e4a 100644 --- a/build/integration/composer.json +++ b/build/integration/composer.json @@ -1,11 +1,16 @@ { - "require-dev": { - "phpunit/phpunit": "^9", - "dms/phpunit-arraysubset-asserts": "^0.5", - "behat/behat": "~3.13.0", - "guzzlehttp/guzzle": "7.8.1", - "jarnaiz/behat-junit-formatter": "^1.3", - "sabre/dav": "4.6.0", - "symfony/event-dispatcher": "~5.3" - } + "config": { + "platform": { + "php": "8.0.2" + }, + "sort-packages": true + }, + "require-dev": { + "behat/behat": "^3.14", + "dms/phpunit-arraysubset-asserts": "^0.5", + "guzzlehttp/guzzle": "^7.8", + "phpunit/phpunit": "^9.6", + "sabre/dav": "^4.6", + "symfony/event-dispatcher": "^5.4" + } } diff --git a/build/integration/composer.lock b/build/integration/composer.lock index e6377c0c057..e4a661b4c33 100644 --- a/build/integration/composer.lock +++ b/build/integration/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "81bb555c11815779a3cb331584cbca71", + "content-hash": "a1099632419635a7a22336e2ccf1c8db", "packages": [], "packages-dev": [ { "name": "behat/behat", - "version": "v3.13.0", + "version": "v3.14.0", "source": { "type": "git", "url": "https://github.com/Behat/Behat.git", - "reference": "9dd7cdb309e464ddeab095cd1a5151c2dccba4ab" + "reference": "2a3832d9cb853a794af3a576f9e524ae460f3340" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Behat/zipball/9dd7cdb309e464ddeab095cd1a5151c2dccba4ab", - "reference": "9dd7cdb309e464ddeab095cd1a5151c2dccba4ab", + "url": "https://api.github.com/repos/Behat/Behat/zipball/2a3832d9cb853a794af3a576f9e524ae460f3340", + "reference": "2a3832d9cb853a794af3a576f9e524ae460f3340", "shasum": "" }, "require": { @@ -27,18 +27,18 @@ "ext-mbstring": "*", "php": "^7.2 || ^8.0", "psr/container": "^1.0 || ^2.0", - "symfony/config": "^4.4 || ^5.0 || ^6.0", - "symfony/console": "^4.4 || ^5.0 || ^6.0", - "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0", - "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0", - "symfony/translation": "^4.4 || ^5.0 || ^6.0", - "symfony/yaml": "^4.4 || ^5.0 || ^6.0" + "symfony/config": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/console": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/translation": "^4.4 || ^5.0 || ^6.0 || ^7.0", + "symfony/yaml": "^4.4 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { "herrera-io/box": "~1.6.1", "phpspec/prophecy": "^1.15", "phpunit/phpunit": "^8.5 || ^9.0", - "symfony/process": "^4.4 || ^5.0 || ^6.0", + "symfony/process": "^4.4 || ^5.0 || ^6.0 || ^7.0", "vimeo/psalm": "^4.8" }, "suggest": { @@ -90,9 +90,9 @@ ], "support": { "issues": "https://github.com/Behat/Behat/issues", - "source": "https://github.com/Behat/Behat/tree/v3.13.0" + "source": "https://github.com/Behat/Behat/tree/v3.14.0" }, - "time": "2023-04-18T15:40:53+00:00" + "time": "2023-12-09T13:55:02+00:00" }, { "name": "behat/gherkin", @@ -646,49 +646,6 @@ "time": "2023-12-03T20:05:35+00:00" }, { - "name": "jarnaiz/behat-junit-formatter", - "version": "v1.3.2", - "source": { - "type": "git", - "url": "https://github.com/j-arnaiz/behat-junit-formatter.git", - "reference": "2f80b3881e04d3cf43e05ab821c0e80675a9846d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/j-arnaiz/behat-junit-formatter/zipball/2f80b3881e04d3cf43e05ab821c0e80675a9846d", - "reference": "2f80b3881e04d3cf43e05ab821c0e80675a9846d", - "shasum": "" - }, - "require": { - "behat/behat": "~3.0", - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "v1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "jarnaiz\\JUnitFormatter\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "authors": [ - { - "name": "Jesús Arnaiz", - "email": "j.arnaiz@gmail.com" - } - ], - "description": "Behat 3 JUnit xml formatter", - "support": { - "issues": "https://github.com/j-arnaiz/behat-junit-formatter/issues", - "source": "https://github.com/j-arnaiz/behat-junit-formatter/tree/master" - }, - "time": "2016-01-26T17:05:07+00:00" - }, - { "name": "myclabs/deep-copy", "version": "1.11.1", "source": { @@ -1340,22 +1297,27 @@ }, { "name": "psr/container", - "version": "1.1.2", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", "shasum": "" }, "require": { "php": ">=7.4.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -1382,9 +1344,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "source": "https://github.com/php-fig/container/tree/2.0.2" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-11-05T16:47:00+00:00" }, { "name": "psr/event-dispatcher", @@ -1598,30 +1560,30 @@ }, { "name": "psr/log", - "version": "1.1.4", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1642,9 +1604,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "source": "https://github.com/php-fig/log/tree/3.0.0" }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2021-07-14T16:46:02+00:00" }, { "name": "ralouphie/getallheaders", @@ -3101,35 +3063,34 @@ }, { "name": "symfony/config", - "version": "v5.4.21", + "version": "v6.0.19", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "2a6b1111d038adfa15d52c0871e540f3b352d1e4" + "reference": "db4fc45c24e0c3e2198e68ada9d7f90daa1f97e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/2a6b1111d038adfa15d52c0871e540f3b352d1e4", - "reference": "2a6b1111d038adfa15d52c0871e540f3b352d1e4", + "url": "https://api.github.com/repos/symfony/config/zipball/db4fc45c24e0c3e2198e68ada9d7f90daa1f97e3", + "reference": "db4fc45c24e0c3e2198e68ada9d7f90daa1f97e3", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.0.2", "symfony/deprecation-contracts": "^2.1|^3", - "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/filesystem": "^5.4|^6.0", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-php80": "^1.16", "symfony/polyfill-php81": "^1.22" }, "conflict": { "symfony/finder": "<4.4" }, "require-dev": { - "symfony/event-dispatcher": "^4.4|^5.0|^6.0", - "symfony/finder": "^4.4|^5.0|^6.0", - "symfony/messenger": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/finder": "^5.4|^6.0", + "symfony/messenger": "^5.4|^6.0", "symfony/service-contracts": "^1.1|^2|^3", - "symfony/yaml": "^4.4|^5.0|^6.0" + "symfony/yaml": "^5.4|^6.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" @@ -3160,7 +3121,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v5.4.21" + "source": "https://github.com/symfony/config/tree/v6.0.19" }, "funding": [ { @@ -3176,50 +3137,46 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-01-09T04:36:00+00:00" }, { "name": "symfony/console", - "version": "v5.4.22", + "version": "v6.0.19", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8" + "reference": "c3ebc83d031b71c39da318ca8b7a07ecc67507ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/3cd51fd2e6c461ca678f84d419461281bd87a0a8", - "reference": "3cd51fd2e6c461ca678f84d419461281bd87a0a8", + "url": "https://api.github.com/repos/symfony/console/zipball/c3ebc83d031b71c39da318ca8b7a07ecc67507ed", + "reference": "c3ebc83d031b71c39da318ca8b7a07ecc67507ed", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.0.2", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.9", - "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2|^3", - "symfony/string": "^5.1|^6.0" + "symfony/string": "^5.4|^6.0" }, "conflict": { - "psr/log": ">=3", - "symfony/dependency-injection": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/event-dispatcher": "<4.4", - "symfony/lock": "<4.4", - "symfony/process": "<4.4" + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" }, "provide": { - "psr/log-implementation": "1.0|2.0" + "psr/log-implementation": "1.0|2.0|3.0" }, "require-dev": { - "psr/log": "^1|^2", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/event-dispatcher": "^4.4|^5.0|^6.0", - "symfony/lock": "^4.4|^5.0|^6.0", - "symfony/process": "^4.4|^5.0|^6.0", - "symfony/var-dumper": "^4.4|^5.0|^6.0" + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/lock": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/var-dumper": "^5.4|^6.0" }, "suggest": { "psr/log": "For using the console logger", @@ -3254,12 +3211,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command-line", + "command line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.4.22" + "source": "https://github.com/symfony/console/tree/v6.0.19" }, "funding": [ { @@ -3275,45 +3232,44 @@ "type": "tidelift" } ], - "time": "2023-03-25T09:27:28+00:00" + "time": "2023-01-01T08:36:10+00:00" }, { "name": "symfony/dependency-injection", - "version": "v5.4.22", + "version": "v6.0.20", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "e1b7c1432efb4ad1dd89d62906187271e2601ed9" + "reference": "359806e1adebd1c43e18e5ea22acd14bef7fcf8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e1b7c1432efb4ad1dd89d62906187271e2601ed9", - "reference": "e1b7c1432efb4ad1dd89d62906187271e2601ed9", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/359806e1adebd1c43e18e5ea22acd14bef7fcf8c", + "reference": "359806e1adebd1c43e18e5ea22acd14bef7fcf8c", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1.1", + "php": ">=8.0.2", + "psr/container": "^1.1|^2.0", "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-php80": "^1.16", "symfony/polyfill-php81": "^1.22", - "symfony/service-contracts": "^1.1.6|^2" + "symfony/service-contracts": "^1.1.6|^2.0|^3.0" }, "conflict": { "ext-psr": "<1.1|>=2", - "symfony/config": "<5.3", - "symfony/finder": "<4.4", - "symfony/proxy-manager-bridge": "<4.4", - "symfony/yaml": "<4.4.26" + "symfony/config": "<5.4", + "symfony/finder": "<5.4", + "symfony/proxy-manager-bridge": "<5.4", + "symfony/yaml": "<5.4" }, "provide": { - "psr/container-implementation": "1.0", - "symfony/service-implementation": "1.0|2.0" + "psr/container-implementation": "1.1|2.0", + "symfony/service-implementation": "1.1|2.0|3.0" }, "require-dev": { - "symfony/config": "^5.3|^6.0", - "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/yaml": "^4.4.26|^5.0|^6.0" + "symfony/config": "^5.4|^6.0", + "symfony/expression-language": "^5.4|^6.0", + "symfony/yaml": "^5.4|^6.0" }, "suggest": { "symfony/config": "", @@ -3348,7 +3304,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v5.4.22" + "source": "https://github.com/symfony/dependency-injection/tree/v6.0.20" }, "funding": [ { @@ -3364,29 +3320,29 @@ "type": "tidelift" } ], - "time": "2023-03-10T10:02:45+00:00" + "time": "2023-01-30T15:41:07+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", + "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.0-dev" }, "thanks": { "name": "symfony/contracts", @@ -3415,7 +3371,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2" }, "funding": [ { @@ -3431,20 +3387,20 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-01-02T09:55:41+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v5.4.26", + "version": "v5.4.34", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac" + "reference": "e3bca343efeb613f843c254e7718ef17c9bdf7a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/5dcc00e03413f05c1e7900090927bb7247cb0aac", - "reference": "5dcc00e03413f05c1e7900090927bb7247cb0aac", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e3bca343efeb613f843c254e7718ef17c9bdf7a3", + "reference": "e3bca343efeb613f843c254e7718ef17c9bdf7a3", "shasum": "" }, "require": { @@ -3500,7 +3456,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.26" + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.34" }, "funding": [ { @@ -3516,24 +3472,24 @@ "type": "tidelift" } ], - "time": "2023-07-06T06:34:20+00:00" + "time": "2023-12-27T21:12:56+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v2.5.2", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" + "reference": "7bc61cc2db649b4637d331240c5346dcc7708051" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", - "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051", + "reference": "7bc61cc2db649b4637d331240c5346dcc7708051", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.0.2", "psr/event-dispatcher": "^1" }, "suggest": { @@ -3542,7 +3498,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.0-dev" }, "thanks": { "name": "symfony/contracts", @@ -3579,7 +3535,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.2" }, "funding": [ { @@ -3595,27 +3551,26 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2022-01-02T09:55:41+00:00" }, { "name": "symfony/filesystem", - "version": "v5.4.21", + "version": "v6.0.19", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "e75960b1bbfd2b8c9e483e0d74811d555ca3de9f" + "reference": "3d49eec03fda1f0fc19b7349fbbe55ebc1004214" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/e75960b1bbfd2b8c9e483e0d74811d555ca3de9f", - "reference": "e75960b1bbfd2b8c9e483e0d74811d555ca3de9f", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/3d49eec03fda1f0fc19b7349fbbe55ebc1004214", + "reference": "3d49eec03fda1f0fc19b7349fbbe55ebc1004214", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.0.2", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8", - "symfony/polyfill-php80": "^1.16" + "symfony/polyfill-mbstring": "~1.8" }, "type": "library", "autoload": { @@ -3643,7 +3598,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.21" + "source": "https://github.com/symfony/filesystem/tree/v6.0.19" }, "funding": [ { @@ -3659,20 +3614,20 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-01-20T17:44:14+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -3687,7 +3642,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3725,7 +3680,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -3741,20 +3696,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "875e90aeea2777b6f135677f618529449334a612" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", + "reference": "875e90aeea2777b6f135677f618529449334a612", "shasum": "" }, "require": { @@ -3766,7 +3721,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3806,7 +3761,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -3822,20 +3777,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -3847,7 +3802,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3890,7 +3845,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -3906,20 +3861,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -3934,7 +3889,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -3973,7 +3928,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -3989,86 +3944,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" - }, - { - "name": "symfony/polyfill-php73", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php80", @@ -4155,16 +4031,16 @@ }, { "name": "symfony/polyfill-php81", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a" + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a", - "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", + "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", "shasum": "" }, "require": { @@ -4173,7 +4049,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -4214,7 +4090,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" }, "funding": [ { @@ -4230,26 +4106,25 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.5.2", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/d78d39c1599bd1188b8e26bb341da52c3c6d8a66", + "reference": "d78d39c1599bd1188b8e26bb341da52c3c6d8a66", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1|^3" + "php": ">=8.0.2", + "psr/container": "^2.0" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -4260,7 +4135,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.0-dev" }, "thanks": { "name": "symfony/contracts", @@ -4297,7 +4172,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/service-contracts/tree/v3.0.2" }, "funding": [ { @@ -4313,38 +4188,37 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:17:29+00:00" + "time": "2022-05-30T19:17:58+00:00" }, { "name": "symfony/string", - "version": "v5.4.22", + "version": "v6.0.19", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62" + "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", - "reference": "8036a4c76c0dd29e60b6a7cafcacc50cf088ea62", + "url": "https://api.github.com/repos/symfony/string/zipball/d9e72497367c23e08bf94176d2be45b00a9d232a", + "reference": "d9e72497367c23e08bf94176d2be45b00a9d232a", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.0.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": ">=3.0" + "symfony/translation-contracts": "<2.0" }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/http-client": "^4.4|^5.0|^6.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0|^6.0" + "symfony/error-handler": "^5.4|^6.0", + "symfony/http-client": "^5.4|^6.0", + "symfony/translation-contracts": "^2.0|^3.0", + "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -4383,7 +4257,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.4.22" + "source": "https://github.com/symfony/string/tree/v6.0.19" }, "funding": [ { @@ -4399,52 +4273,50 @@ "type": "tidelift" } ], - "time": "2023-03-14T06:11:53+00:00" + "time": "2023-01-01T08:36:10+00:00" }, { "name": "symfony/translation", - "version": "v5.4.22", + "version": "v6.0.19", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "9a401392f01bc385aa42760eff481d213a0cc2ba" + "reference": "9c24b3fdbbe9fb2ef3a6afd8bbaadfd72dad681f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/9a401392f01bc385aa42760eff481d213a0cc2ba", - "reference": "9a401392f01bc385aa42760eff481d213a0cc2ba", + "url": "https://api.github.com/repos/symfony/translation/zipball/9c24b3fdbbe9fb2ef3a6afd8bbaadfd72dad681f", + "reference": "9c24b3fdbbe9fb2ef3a6afd8bbaadfd72dad681f", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.0.2", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/translation-contracts": "^2.3" + "symfony/translation-contracts": "^2.3|^3.0" }, "conflict": { - "symfony/config": "<4.4", - "symfony/console": "<5.3", - "symfony/dependency-injection": "<5.0", - "symfony/http-kernel": "<5.0", - "symfony/twig-bundle": "<5.0", - "symfony/yaml": "<4.4" + "symfony/config": "<5.4", + "symfony/console": "<5.4", + "symfony/dependency-injection": "<5.4", + "symfony/http-kernel": "<5.4", + "symfony/twig-bundle": "<5.4", + "symfony/yaml": "<5.4" }, "provide": { - "symfony/translation-implementation": "2.3" + "symfony/translation-implementation": "2.3|3.0" }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^4.4|^5.0|^6.0", + "symfony/config": "^5.4|^6.0", "symfony/console": "^5.4|^6.0", - "symfony/dependency-injection": "^5.0|^6.0", - "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/finder": "^5.4|^6.0", "symfony/http-client-contracts": "^1.1|^2.0|^3.0", - "symfony/http-kernel": "^5.0|^6.0", - "symfony/intl": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/intl": "^5.4|^6.0", "symfony/polyfill-intl-icu": "^1.21", "symfony/service-contracts": "^1.1.2|^2|^3", - "symfony/yaml": "^4.4|^5.0|^6.0" + "symfony/yaml": "^5.4|^6.0" }, "suggest": { "psr/log-implementation": "To use logging capability in translator", @@ -4480,7 +4352,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v5.4.22" + "source": "https://github.com/symfony/translation/tree/v6.0.19" }, "funding": [ { @@ -4496,24 +4368,24 @@ "type": "tidelift" } ], - "time": "2023-03-27T16:07:23+00:00" + "time": "2023-01-01T08:36:10+00:00" }, { "name": "symfony/translation-contracts", - "version": "v2.5.2", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe" + "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe", - "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/acbfbb274e730e5a0236f619b6168d9dedb3e282", + "reference": "acbfbb274e730e5a0236f619b6168d9dedb3e282", "shasum": "" }, "require": { - "php": ">=7.2.5" + "php": ">=8.0.2" }, "suggest": { "symfony/translation-implementation": "" @@ -4521,7 +4393,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.0-dev" }, "thanks": { "name": "symfony/contracts", @@ -4558,7 +4430,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/translation-contracts/tree/v3.0.2" }, "funding": [ { @@ -4574,32 +4446,31 @@ "type": "tidelift" } ], - "time": "2022-06-27T16:58:25+00:00" + "time": "2022-06-27T17:10:44+00:00" }, { "name": "symfony/yaml", - "version": "v5.4.21", + "version": "v6.0.19", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "3713e20d93e46e681e51605d213027e48dab3469" + "reference": "deec3a812a0305a50db8ae689b183f43d915c884" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/3713e20d93e46e681e51605d213027e48dab3469", - "reference": "3713e20d93e46e681e51605d213027e48dab3469", + "url": "https://api.github.com/repos/symfony/yaml/zipball/deec3a812a0305a50db8ae689b183f43d915c884", + "reference": "deec3a812a0305a50db8ae689b183f43d915c884", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.0.2", "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<5.3" + "symfony/console": "<5.4" }, "require-dev": { - "symfony/console": "^5.3|^6.0" + "symfony/console": "^5.4|^6.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -4633,7 +4504,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.4.21" + "source": "https://github.com/symfony/yaml/tree/v6.0.19" }, "funding": [ { @@ -4649,7 +4520,7 @@ "type": "tidelift" } ], - "time": "2023-02-21T19:46:44+00:00" + "time": "2023-01-11T11:50:03+00:00" }, { "name": "theseer/tokenizer", @@ -4709,5 +4580,8 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], + "platform-overrides": { + "php": "8.0.2" + }, "plugin-api-version": "2.6.0" } diff --git a/build/integration/config/behat.yml b/build/integration/config/behat.yml index fdd9f890b0e..8401b841cdd 100644 --- a/build/integration/config/behat.yml +++ b/build/integration/config/behat.yml @@ -2,6 +2,8 @@ default: autoload: '': "%paths.base%/../features/bootstrap" formatters: + junit: + output_path: '%paths.base%/../output' pretty: output_styles: comment: [ 'bright-blue' ] @@ -29,6 +31,52 @@ default: - CommandLineContext: baseUrl: http://localhost:8080 ocPath: ../../ + comments: + paths: + - "%paths.base%/../comments_features" + contexts: + - FeatureContext: + baseUrl: http://localhost:8080/ocs/ + admin: + - admin + - admin + regular_user_password: 123456 + - CommentsContext: + baseUrl: http://localhost:8080 + - TagsContext: + baseUrl: http://localhost:8080 + - CardDavContext: + baseUrl: http://localhost:8080 + - CalDavContext: + baseUrl: http://localhost:8080 + - ChecksumsContext: + baseUrl: http://localhost:8080 + - CommandLineContext: + baseUrl: http://localhost:8080 + ocPath: ../../ + dav: + paths: + - "%paths.base%/../dav_features" + contexts: + - FeatureContext: + baseUrl: http://localhost:8080/ocs/ + admin: + - admin + - admin + regular_user_password: 123456 + - CommentsContext: + baseUrl: http://localhost:8080 + - TagsContext: + baseUrl: http://localhost:8080 + - CardDavContext: + baseUrl: http://localhost:8080 + - CalDavContext: + baseUrl: http://localhost:8080 + - ChecksumsContext: + baseUrl: http://localhost:8080 + - CommandLineContext: + baseUrl: http://localhost:8080 + ocPath: ../../ federation: paths: - "%paths.base%/../federation_features" @@ -39,6 +87,29 @@ default: - admin - admin regular_user_password: 123456 + files: + paths: + - "%paths.base%/../files_features" + contexts: + - FeatureContext: + baseUrl: http://localhost:8080/ocs/ + admin: + - admin + - admin + regular_user_password: 123456 + - CommentsContext: + baseUrl: http://localhost:8080 + - TagsContext: + baseUrl: http://localhost:8080 + - CardDavContext: + baseUrl: http://localhost:8080 + - CalDavContext: + baseUrl: http://localhost:8080 + - ChecksumsContext: + baseUrl: http://localhost:8080 + - CommandLineContext: + baseUrl: http://localhost:8080 + ocPath: ../../ capabilities: paths: - "%paths.base%/../capabilities_features" @@ -80,6 +151,17 @@ default: - admin regular_user_password: 123456 - TalkContext + videoverification: + paths: + - "%paths.base%/../videoverification_features" + contexts: + - SharingContext: + baseUrl: http://localhost:8080/ocs/ + admin: + - admin + - admin + regular_user_password: 123456 + - TalkContext setup: paths: - "%paths.base%/../setup_features" @@ -110,6 +192,26 @@ default: - admin - admin regular_user_password: 123456 + openldap_numerical: + paths: + - "%paths.base%/../openldap_numerical_features" + contexts: + - LDAPContext: + baseUrl: http://localhost:8080 + admin: + - admin + - admin + regular_user_password: 123456 + openldap: + paths: + - "%paths.base%/../openldap_features" + contexts: + - LDAPContext: + baseUrl: http://localhost:8080 + admin: + - admin + - admin + regular_user_password: 123456 remoteapi: paths: - "%paths.base%/../remoteapi_features" @@ -122,7 +224,3 @@ default: regular_user_password: 123456 - RemoteContext: remote: http://localhost:8080 - extensions: - jarnaiz\JUnitFormatter\JUnitFormatterExtension: - filename: report.xml - outputDir: "%paths.base%/../output/" diff --git a/build/integration/features/caldav.feature b/build/integration/dav_features/caldav.feature index e2cb4f8dc92..e2cb4f8dc92 100644 --- a/build/integration/features/caldav.feature +++ b/build/integration/dav_features/caldav.feature diff --git a/build/integration/features/carddav.feature b/build/integration/dav_features/carddav.feature index 9c9df6ddd94..9c9df6ddd94 100644 --- a/build/integration/features/carddav.feature +++ b/build/integration/dav_features/carddav.feature diff --git a/build/integration/features/dav-v2.feature b/build/integration/dav_features/dav-v2.feature index a3ac59578e9..a3ac59578e9 100644 --- a/build/integration/features/dav-v2.feature +++ b/build/integration/dav_features/dav-v2.feature diff --git a/build/integration/features/webdav-related.feature b/build/integration/dav_features/webdav-related.feature index 28a0cad619b..28a0cad619b 100644 --- a/build/integration/features/webdav-related.feature +++ b/build/integration/dav_features/webdav-related.feature diff --git a/build/integration/features/bootstrap/CommandLineContext.php b/build/integration/features/bootstrap/CommandLineContext.php index afe17cd75a4..8f9cfc7b45a 100644 --- a/build/integration/features/bootstrap/CommandLineContext.php +++ b/build/integration/features/bootstrap/CommandLineContext.php @@ -35,6 +35,8 @@ class CommandLineContext implements \Behat\Behat\Context\Context { private $lastTransferPath; private $featureContext; + private $localBaseUrl; + private $remoteBaseUrl; public function __construct($ocPath, $baseUrl) { $this->ocPath = rtrim($ocPath, '/') . '/'; diff --git a/build/integration/features/bootstrap/LDAPContext.php b/build/integration/features/bootstrap/LDAPContext.php index e0315bce84e..fd4a448b5e9 100644 --- a/build/integration/features/bootstrap/LDAPContext.php +++ b/build/integration/features/bootstrap/LDAPContext.php @@ -104,7 +104,7 @@ class LDAPContext implements Context { $this->asAn('admin'); $this->creatingAnLDAPConfigurationAt('/apps/user_ldap/api/v1/config'); $data = new TableNode([ - ['configData[ldapHost]', 'openldap'], + ['configData[ldapHost]', getenv('LDAP_HOST') ?: 'openldap'], ['configData[ldapPort]', '389'], ['configData[ldapBase]', 'dc=nextcloud,dc=ci'], ['configData[ldapAgentName]', 'cn=admin,dc=nextcloud,dc=ci'], @@ -141,6 +141,9 @@ class LDAPContext implements Context { $this->asAn('admin'); $configData = $table->getRows(); foreach ($configData as &$row) { + if (str_contains($row[0], 'Host') && getenv('LDAP_HOST')) { + $row[1] = str_replace('openldap', getenv('LDAP_HOST'), $row[1]); + } $row[0] = 'configData[' . $row[0] . ']'; } $this->settingTheLDAPConfigurationTo(new TableNode($configData)); diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php index b919976e790..a832e26ec18 100644 --- a/build/integration/features/bootstrap/WebDav.php +++ b/build/integration/features/bootstrap/WebDav.php @@ -54,6 +54,8 @@ trait WebDav { private array $parsedResponse = []; private string $s3MultipartDestination; private string $uploadId; + /** @var string[] */ + private array $parts = []; /** * @Given /^using dav path "([^"]*)"$/ @@ -475,28 +477,28 @@ trait WebDav { </d:prop> <d:literal>image/png</d:literal> </d:eq> - + <d:eq> <d:prop> <d:getcontenttype/> </d:prop> <d:literal>image/jpeg</d:literal> </d:eq> - + <d:eq> <d:prop> <d:getcontenttype/> </d:prop> <d:literal>image/heic</d:literal> </d:eq> - + <d:eq> <d:prop> <d:getcontenttype/> </d:prop> <d:literal>video/mp4</d:literal> </d:eq> - + <d:eq> <d:prop> <d:getcontenttype/> diff --git a/build/integration/features/ratelimiting.feature b/build/integration/features/ratelimiting.feature index bd8b2e30a73..8f23c073e69 100644 --- a/build/integration/features/ratelimiting.feature +++ b/build/integration/features/ratelimiting.feature @@ -1,9 +1,9 @@ Feature: ratelimiting - + Background: Given user "user0" exists Given As an "admin" - Given app "testing" is enabled + Given invoking occ with "app:enable --force testing" Scenario: Accessing a page with only an AnonRateThrottle as user Given user "user0" exists diff --git a/build/integration/features/checksums.feature b/build/integration/files_features/checksums.feature index d391e93afe8..d391e93afe8 100644 --- a/build/integration/features/checksums.feature +++ b/build/integration/files_features/checksums.feature diff --git a/build/integration/features/download.feature b/build/integration/files_features/download.feature index 16d346b0150..16d346b0150 100644 --- a/build/integration/features/download.feature +++ b/build/integration/files_features/download.feature diff --git a/build/integration/features/external-storage.feature b/build/integration/files_features/external-storage.feature index d92cca3c458..d92cca3c458 100644 --- a/build/integration/features/external-storage.feature +++ b/build/integration/files_features/external-storage.feature diff --git a/build/integration/features/favorites.feature b/build/integration/files_features/favorites.feature index 0439ada9d60..0439ada9d60 100644 --- a/build/integration/features/favorites.feature +++ b/build/integration/files_features/favorites.feature diff --git a/build/integration/features/tags.feature b/build/integration/files_features/tags.feature index 495008ffdd2..495008ffdd2 100644 --- a/build/integration/features/tags.feature +++ b/build/integration/files_features/tags.feature diff --git a/build/integration/features/transfer-ownership.feature b/build/integration/files_features/transfer-ownership.feature index 22e34dcf7af..22e34dcf7af 100644 --- a/build/integration/features/transfer-ownership.feature +++ b/build/integration/files_features/transfer-ownership.feature diff --git a/build/integration/features/trashbin.feature b/build/integration/files_features/trashbin.feature index 3a9c29f7cb8..3a9c29f7cb8 100644 --- a/build/integration/features/trashbin.feature +++ b/build/integration/files_features/trashbin.feature diff --git a/build/integration/ldap_features/openldap-uid-username.feature b/build/integration/openldap_features/openldap-uid-username.feature index 6793273e8c7..6793273e8c7 100644 --- a/build/integration/ldap_features/openldap-uid-username.feature +++ b/build/integration/openldap_features/openldap-uid-username.feature diff --git a/build/integration/ldap_features/openldap-numerical-id.feature b/build/integration/openldap_numerical_features/openldap-numerical-id.feature index 75eb6827192..75eb6827192 100644 --- a/build/integration/ldap_features/openldap-numerical-id.feature +++ b/build/integration/openldap_numerical_features/openldap-numerical-id.feature diff --git a/build/integration/run.sh b/build/integration/run.sh index 45a0333038e..09c1d544c6d 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -34,10 +34,16 @@ if [ -z "$EXECUTOR_NUMBER" ]; then fi PORT=$((8080 + $EXECUTOR_NUMBER)) echo $PORT -php -S localhost:$PORT -t ../.. & + +echo "" > phpserver.log + +php -S localhost:$PORT -t ../.. &> phpserver.log & PHPPID=$! echo $PHPPID +# Output filtered php server logs +tail -f phpserver.log | grep --line-buffered -v -E ":[0-9]+ Accepted$" | grep --line-buffered -v -E ":[0-9]+ Closing$" & + # The federated server is started and stopped by the tests themselves PORT_FED=$((8180 + $EXECUTOR_NUMBER)) echo $PORT_FED diff --git a/build/integration/sharing_features/sharing-v1-video-verification.feature b/build/integration/videoverification_features/sharing-v1-video-verification.feature index cc4be425aab..cc4be425aab 100644 --- a/build/integration/sharing_features/sharing-v1-video-verification.feature +++ b/build/integration/videoverification_features/sharing-v1-video-verification.feature |