diff options
| -rw-r--r-- | .drone.yml | 148 | ||||
| -rw-r--r-- | .github/workflows/lint.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/oci.yml | 2 | ||||
| -rw-r--r-- | build/integration/features/bootstrap/CommentsContext.php | 2 | ||||
| -rw-r--r-- | build/integration/features/bootstrap/Sharing.php | 4 | ||||
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | composer.lock | 4 | ||||
| -rw-r--r-- | lib/versioncheck.php | 6 | ||||
| -rw-r--r-- | vendor-bin/cs-fixer/composer.json | 2 | ||||
| -rw-r--r-- | vendor-bin/cs-fixer/composer.lock | 2 | ||||
| -rw-r--r-- | vendor-bin/psalm/composer.json | 2 | ||||
| -rw-r--r-- | vendor-bin/psalm/composer.lock | 2 |
12 files changed, 84 insertions, 94 deletions
diff --git a/.drone.yml b/.drone.yml index 4825a6b1a7f..95b28731e34 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ steps: commands: - git submodule update --init - name: checkers - image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 + image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 commands: - ./autotest-checkers.sh secrets: [ github_token ] @@ -30,12 +30,12 @@ steps: commands: - git submodule update --init - name: litmus-v1 - image: nextcloudci/litmus-php7.3:litmus-php7.3-1 + image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest commands: - bash tests/travis/install.sh sqlite - bash apps/dav/tests/travis/litmus-v1/script.sh - name: litmus-v2 - image: nextcloudci/litmus-php7.3:litmus-php7.3-1 + image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest commands: - bash tests/travis/install.sh sqlite - bash apps/dav/tests/travis/litmus-v2/script.sh @@ -58,7 +58,7 @@ steps: commands: - git submodule update --init - name: caldavtester-new-endpoint - image: nextcloudci/litmus-php7.3:litmus-php7.3-1 + image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest commands: - bash tests/travis/install.sh sqlite - bash apps/dav/tests/travis/caldav/install.sh @@ -82,7 +82,7 @@ steps: commands: - git submodule update --init - name: caldavtester-old-endpoint - image: nextcloudci/litmus-php7.3:litmus-php7.3-1 + image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest commands: - bash tests/travis/install.sh sqlite - bash apps/dav/tests/travis/caldav/install.sh @@ -106,7 +106,7 @@ steps: commands: - git submodule update --init - name: carddavtester-new-endpoint - image: nextcloudci/litmus-php7.3:litmus-php7.3-1 + image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest commands: - bash tests/travis/install.sh sqlite - bash apps/dav/tests/travis/carddav/install.sh @@ -130,7 +130,7 @@ steps: commands: - git submodule update --init - name: carddavtester-old-endpoint - image: nextcloudci/litmus-php7.3:litmus-php7.3-1 + image: ghcr.io/nextcloud/continuous-integration-litmus-php7.4:latest commands: - bash tests/travis/install.sh sqlite - bash apps/dav/tests/travis/carddav/install.sh @@ -153,8 +153,8 @@ steps: image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest commands: - git submodule update --init -- name: sqlite-php7.3-samba-native - image: nextcloudci/samba-native-php7.3:samba-native-php7.3-1 +- name: sqlite-php7.4-samba-native + image: ghcr.io/nextcloud/continuous-integration-samba-native-php7.4:latest commands: - smbd -D -FS & - ./autotest-external.sh sqlite smb-linux @@ -163,8 +163,8 @@ steps: - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi" - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi" - sh -c "if [ '$DRONE_BUILD_EVENT' != 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite-smb-linux.xml; fi" -- name: sqlite-php7.3-samba-non-native - image: nextcloudci/samba-non-native-php7.3:samba-non-native-php7.3-1 +- name: sqlite-php7.4-samba-non-native + image: ghcr.io/nextcloud/continuous-integration-samba-non-native-php7.4:latest commands: - smbd -D -FS & - ./autotest-external.sh sqlite smb-linux @@ -184,17 +184,17 @@ trigger: --- kind: pipeline -name: sqlite-php7.3-webdav-apache +name: sqlite-php7.4-webdav-apache steps: - name: submodules image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest commands: - git submodule update --init -- name: sqlite-php7.3-webdav-apache - image: nextcloudci/webdav-apache-php7.3:webdav-apache-php7.3-3 +- name: sqlite-php7.4-webdav-apache + image: ghcr.io/nextcloud/continuous-integration-webdav-apache-php7.4:latest commands: - - apache2 + - apache2ctl start - ./autotest-external.sh sqlite webdav-apachedrone - wget https://codecov.io/bash -O codecov.sh - sh -c "if [ '$DRONE_BUILD_EVENT' = 'pull_request' ]; then bash codecov.sh -B $DRONE_BRANCH -C $DRONE_COMMIT -P $DRONE_PULL_REQUEST -t 117641e2-a9e8-4b7b-984b-ae872d9b05f5 -f tests/autotest-external-clover-sqlite.xml; fi" @@ -223,11 +223,6 @@ steps: image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest commands: - git submodule update --init -- name: nodb-php7.3 - image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 - commands: - - bash tests/drone-run-php-tests.sh || exit 0 - - NOCOVERAGE=true TEST_SELECTION=NODB ./autotest.sh sqlite - name: nodb-php7.4 image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 commands: @@ -260,11 +255,6 @@ steps: image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest commands: - git submodule update --init -- name: sqlite-php7.3 - image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 - commands: - - bash tests/drone-run-php-tests.sh || exit 0 - - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh sqlite - name: sqlite-php7.4 image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 commands: @@ -290,15 +280,15 @@ trigger: --- kind: pipeline -name: mariadb10.1-php7.3 +name: mariadb10.1-php7.4 steps: - name: submodules image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest commands: - git submodule update --init -- name: mariadb10.1-php7.3 - image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 +- name: mariadb10.1-php7.4 + image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 commands: - bash tests/drone-run-php-tests.sh || exit 0 - NOCOVERAGE=true TEST_SELECTION=DB ./autotest.sh mariadb @@ -435,15 +425,15 @@ trigger: --- kind: pipeline -name: postgres9.6-php7.3 +name: postgres9.6-php7.4 steps: - name: submodules image: ghcr.io/nextcloud/continuous-integration-alpine-git:latest commands: - git submodule update --init -- name: postgres-php7.3 - image: ghcr.io/nextcloud/continuous-integration-php7.3:php7.3-6 +- name: postgres-php7.4 + image: ghcr.io/nextcloud/continuous-integration-php7.4:php7.4-3 commands: - bash tests/drone-run-php-tests.sh || exit 0 - sleep 10 # gives the database enough time to initialize @@ -551,7 +541,7 @@ steps: commands: - git submodule update --init - name: integration-capabilities_features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -576,7 +566,7 @@ steps: commands: - git submodule update --init - name: integration-collaboration_features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -601,7 +591,7 @@ steps: commands: - git submodule update --init - name: integration-federation_features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin @@ -626,7 +616,7 @@ steps: commands: - git submodule update --init - name: integration-auth - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -651,7 +641,7 @@ steps: commands: - git submodule update --init - name: integration-avatar - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -676,7 +666,7 @@ steps: commands: - git submodule update --init - name: integration-maintenance-mode - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -701,7 +691,7 @@ steps: commands: - git submodule update --init - name: integration-ratelimiting - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -736,7 +726,7 @@ steps: commands: - git submodule update --init - name: integration-carddav - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -761,7 +751,7 @@ steps: commands: - git submodule update --init - name: integration-dav-v2 - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -786,7 +776,7 @@ steps: commands: - git submodule update --init - name: integration-ocs-v1 - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -811,7 +801,7 @@ steps: commands: - git submodule update --init - name: integration-checksums-v1 - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -836,7 +826,7 @@ steps: commands: - git submodule update --init - name: integration-external-storage - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -861,7 +851,7 @@ steps: commands: - git submodule update --init - name: integration-provisioning-v1 - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -886,7 +876,7 @@ steps: commands: - git submodule update --init - name: integration-tags - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -911,7 +901,7 @@ steps: commands: - git submodule update --init - name: integration-caldav - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -936,7 +926,7 @@ steps: commands: - git submodule update --init - name: integration-comments - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -961,7 +951,7 @@ steps: commands: - git submodule update --init - name: integration-comments-search - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -986,7 +976,7 @@ steps: commands: - git submodule update --init - name: integration-contacts-menu - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1011,7 +1001,7 @@ steps: commands: - git submodule update --init - name: integration-favorites - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1036,7 +1026,7 @@ steps: commands: - git submodule update --init - name: integration-provisioning-v2 - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1061,7 +1051,7 @@ steps: commands: - git submodule update --init - name: integration-webdav-related - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1086,7 +1076,7 @@ steps: commands: - git submodule update --init - name: integration-sharees-features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1111,7 +1101,7 @@ steps: commands: - git submodule update --init - name: integration-sharees-v2-features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1136,7 +1126,7 @@ steps: commands: - git submodule update --init - name: integration-sharing-v1 - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1161,7 +1151,7 @@ steps: commands: - git submodule update --init - name: integration-sharing-v1-part2 - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1186,7 +1176,7 @@ steps: commands: - git submodule update --init - name: integration-sharing-v1-part3 - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1217,7 +1207,7 @@ steps: # build them. - git clone --depth 1 https://github.com/nextcloud/spreed apps/spreed - name: integration-sharing-v1-video-verification - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1242,7 +1232,7 @@ steps: commands: - git submodule update --init - name: integration-setup-features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - cd build/integration @@ -1266,7 +1256,7 @@ steps: commands: - git submodule update --init - name: integration-filesdrop-features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1291,7 +1281,7 @@ steps: commands: - git submodule update --init - name: integration-transfer-ownership-features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1316,7 +1306,7 @@ steps: commands: - git submodule update --init - name: integration-ldap-features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1341,7 +1331,7 @@ steps: commands: - git submodule update --init - name: integration-ldap-openldap-features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1382,7 +1372,7 @@ steps: commands: - git submodule update --init - name: integration-ldap-openldap-uid-features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1424,7 +1414,7 @@ steps: commands: - git submodule update --init - name: integration-ldap-openldap-numerical-id-features - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1465,7 +1455,7 @@ steps: commands: - git submodule update --init - name: integration-trashbin - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1490,7 +1480,7 @@ steps: commands: - git submodule update --init - name: integration-remote-api - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1515,7 +1505,7 @@ steps: commands: - git submodule update --init - name: integration-download - image: ghcr.io/nextcloud/continuous-integration-integration-php7.3:latest + image: ghcr.io/nextcloud/continuous-integration-integration-php7.4:latest commands: - bash tests/drone-run-integration-tests.sh || exit 0 - ./occ maintenance:install --admin-pass=admin --data-dir=/dev/shm/nc_int @@ -1540,7 +1530,7 @@ steps: commands: - git submodule update --init - name: acceptance-access-levels - image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.3:acceptance-php7.3-3 + image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest commands: - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-access-levels --selenium-server selenium:4444 allow-git-repository-modifications features/access-levels.feature @@ -1570,7 +1560,7 @@ steps: commands: - git submodule update --init - name: acceptance-app-files - image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.3:acceptance-php7.3-3 + image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest commands: - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature @@ -1600,7 +1590,7 @@ steps: commands: - git submodule update --init - name: acceptance-app-files-sharing - image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.3:acceptance-php7.3-3 + image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest commands: - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing.feature @@ -1630,7 +1620,7 @@ steps: commands: - git submodule update --init - name: acceptance-app-files-sharing-link - image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.3:acceptance-php7.3-3 + image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest commands: - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-sharing-link --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-sharing-link.feature @@ -1660,7 +1650,7 @@ steps: commands: - git submodule update --init - name: acceptance-app-files-tags - image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.3:acceptance-php7.3-3 + image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest commands: - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files-tags --selenium-server selenium:4444 allow-git-repository-modifications features/app-files-tags.feature @@ -1690,7 +1680,7 @@ steps: commands: - git submodule update --init - name: acceptance-app-theming - image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.3:acceptance-php7.3-3 + image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest commands: - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-theming --selenium-server selenium:4444 allow-git-repository-modifications features/app-theming.feature @@ -1720,7 +1710,7 @@ steps: commands: - git submodule update --init - name: acceptance-header - image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.3:acceptance-php7.3-3 + image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest commands: - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-header --selenium-server selenium:4444 allow-git-repository-modifications features/header.feature @@ -1750,7 +1740,7 @@ steps: commands: - git submodule update --init - name: acceptance-login - image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.3:acceptance-php7.3-3 + image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest commands: - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-login --selenium-server selenium:4444 allow-git-repository-modifications features/login.feature @@ -1780,7 +1770,7 @@ steps: commands: - git submodule update --init - name: acceptance-users - image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.3:acceptance-php7.3-3 + image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest commands: - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-users --selenium-server selenium:4444 allow-git-repository-modifications features/users.feature @@ -1810,7 +1800,7 @@ steps: commands: - git submodule update --init - name: acceptance-apps - image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.3:acceptance-php7.3-3 + image: ghcr.io/nextcloud/continuous-integration-acceptance-php7.4:latest commands: - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-apps --selenium-server selenium:4444 allow-git-repository-modifications features/apps.feature @@ -1979,7 +1969,7 @@ steps: commands: - git submodule update --init - name: memcache-memcached - image: nextcloudci/php7.3-memcached:php7.3-memcached-3 + image: ghcr.io/nextcloud/continuous-integration-php7.4-memcached:latest commands: - phpenmod xdebug - service memcached restart diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index df24664ab8f..eb117a2ab9a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -6,7 +6,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php-versions: ['7.3', '7.4', '8.0', '8.1'] + php-versions: ['7.4', '8.0', '8.1'] name: php${{ matrix.php-versions }} lint steps: - name: Checkout diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml index 4fcfc7ff04e..8d09578cf4e 100644 --- a/.github/workflows/oci.yml +++ b/.github/workflows/oci.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - php-versions: [ '7.3', '7.4', '8.0', '8.1'] + php-versions: [ '7.4', '8.0', '8.1'] databases: [ 'oci' ] name: php${{ matrix.php-versions }}-${{ matrix.databases }} diff --git a/build/integration/features/bootstrap/CommentsContext.php b/build/integration/features/bootstrap/CommentsContext.php index afd9b31bc24..ad2d752b4dd 100644 --- a/build/integration/features/bootstrap/CommentsContext.php +++ b/build/integration/features/bootstrap/CommentsContext.php @@ -175,7 +175,7 @@ class CommentsContext implements \Behat\Behat\Context\Context { if ($res->getStatusCode() === 207) { $service = new Sabre\Xml\Service(); $this->response = $service->parse($res->getBody()->getContents()); - $this->commentId = (int)$this->response[0]['value'][2]['value'][0]['value'][0]['value']; + $this->commentId = (int) ($this->response[0]['value'][2]['value'][0]['value'][0]['value'] ?? 0); } } diff --git a/build/integration/features/bootstrap/Sharing.php b/build/integration/features/bootstrap/Sharing.php index 1e399456054..deff350475b 100644 --- a/build/integration/features/bootstrap/Sharing.php +++ b/build/integration/features/bootstrap/Sharing.php @@ -679,14 +679,14 @@ trait Sharing { * @When save last share id */ public function saveLastShareId() { - $this->savedShareId = $this->lastShareData['data']['id']; + $this->savedShareId = ($this->lastShareData['data']['id'] ?? null); } /** * @Then share ids should match */ public function shareIdsShouldMatch() { - if ($this->savedShareId !== $this->lastShareData['data']['id']) { + if ($this->savedShareId !== ($this->lastShareData['data']['id'] ?? null)) { throw new \Exception('Expected the same link share to be returned'); } } diff --git a/composer.json b/composer.json index 70cba1623c6..69ac5821c92 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "optimize-autoloader": true, "sort-packages": true, "platform": { - "php": "7.3" + "php": "7.4" }, "allow-plugins": { "bamarni/composer-bin-plugin": true diff --git a/composer.lock b/composer.lock index 2a97ac5ad88..3ba083dbed0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "eb074699155bba86b710218a07fe659b", + "content-hash": "8333c8a239fe5ccec285dfbccc17cca4", "packages": [], "packages-dev": [ { @@ -74,7 +74,7 @@ }, "platform-dev": [], "platform-overrides": { - "php": "7.3" + "php": "7.4" }, "plugin-api-version": "2.1.0" } diff --git a/lib/versioncheck.php b/lib/versioncheck.php index 3e840ff5b46..8477442935a 100644 --- a/lib/versioncheck.php +++ b/lib/versioncheck.php @@ -25,10 +25,10 @@ declare(strict_types=1); * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -// Show warning if a PHP version below 7.3 is used, -if (PHP_VERSION_ID < 70300) { +// Show warning if a PHP version below 7.4 is used, +if (PHP_VERSION_ID < 70400) { http_response_code(500); - echo 'This version of Nextcloud requires at least PHP 7.3<br/>'; + echo 'This version of Nextcloud requires at least PHP 7.4<br/>'; echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.'; exit(1); } diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index 958c3246abb..de598569c39 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -1,7 +1,7 @@ { "config": { "platform": { - "php": "7.3" + "php": "7.4" } }, "require": { diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index ec188f867c3..dc81cb08e05 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/composer.lock @@ -2155,7 +2155,7 @@ "platform": [], "platform-dev": [], "platform-overrides": { - "php": "7.3" + "php": "7.4" }, "plugin-api-version": "2.2.0" } diff --git a/vendor-bin/psalm/composer.json b/vendor-bin/psalm/composer.json index e03c935cb99..1eaba74d07a 100644 --- a/vendor-bin/psalm/composer.json +++ b/vendor-bin/psalm/composer.json @@ -4,7 +4,7 @@ }, "config": { "platform": { - "php": "7.3" + "php": "7.4" }, "allow-plugins": { "composer/package-versions-deprecated": true diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock index faa325c5601..25e514cc708 100644 --- a/vendor-bin/psalm/composer.lock +++ b/vendor-bin/psalm/composer.lock @@ -2137,7 +2137,7 @@ "platform": [], "platform-dev": [], "platform-overrides": { - "php": "7.3" + "php": "7.4" }, "plugin-api-version": "2.2.0" } |