diff --git a/.drone.star b/.drone.star
index cb80ec6495f9..ad9f9c7165a6 100644
--- a/.drone.star
+++ b/.drone.star
@@ -30,7 +30,7 @@ THEGEEKLAB_DRONE_GITHUB_COMMENT = "thegeeklab/drone-github-comment:1"
TOOLHIPPIE_CALENS = "toolhippie/calens:latest"
WEBHIPPIE_REDIS = "webhippie/redis:latest"
-DEFAULT_PHP_VERSION = "7.4"
+DEFAULT_PHP_VERSION = "7.4-ubuntu20.04"
DEFAULT_NODEJS_VERSION = "14"
dir = {
@@ -57,7 +57,7 @@ config = {
"phpunit": {
"mostDatabases": {
"phpVersions": [
- "7.3",
+ DEFAULT_PHP_VERSION,
],
# Gather coverage for all databases except Oracle
"coverage": True,
@@ -79,7 +79,7 @@ config = {
},
"slowDatabases": {
"phpVersions": [
- "7.3",
+ DEFAULT_PHP_VERSION,
],
# Oracle takes a long time to start and run
# So do not collect coverage for that
@@ -89,18 +89,8 @@ config = {
"oracle",
],
},
- "reducedDatabases": {
- "phpVersions": [
- DEFAULT_PHP_VERSION,
- ],
- "databases": [
- "sqlite",
- "mariadb:10.2",
- ],
- },
"external-samba-windows": {
"phpVersions": [
- "7.3",
DEFAULT_PHP_VERSION,
],
"databases": [
@@ -120,7 +110,6 @@ config = {
},
"external-other": {
"phpVersions": [
- "7.3",
DEFAULT_PHP_VERSION,
],
"databases": [
@@ -537,7 +526,7 @@ def dependencies(ctx):
return pipelines
default = {
- "phpVersions": ["7.3"],
+ "phpVersions": [DEFAULT_PHP_VERSION],
}
if "defaults" in config:
@@ -875,7 +864,7 @@ def phan(ctx):
return pipelines
default = {
- "phpVersions": ["7.3", DEFAULT_PHP_VERSION],
+ "phpVersions": [DEFAULT_PHP_VERSION],
"logLevel": "2",
}
@@ -946,7 +935,7 @@ def litmus():
return pipelines
default = {
- "phpVersions": ["7.3", DEFAULT_PHP_VERSION],
+ "phpVersions": [DEFAULT_PHP_VERSION],
"logLevel": "2",
"useHttps": True,
}
@@ -1097,7 +1086,7 @@ def dav():
return pipelines
default = {
- "phpVersions": ["7.3", DEFAULT_PHP_VERSION],
+ "phpVersions": [DEFAULT_PHP_VERSION],
"logLevel": "2",
}
@@ -1286,7 +1275,7 @@ def phpTests(ctx, testType, withCoverage):
# The default PHP unit test settings for a PR.
# Note: do not run Oracle by default in PRs.
prDefault = {
- "phpVersions": ["7.3", DEFAULT_PHP_VERSION],
+ "phpVersions": [DEFAULT_PHP_VERSION],
"databases": [
"sqlite",
"mariadb:10.2",
@@ -1318,7 +1307,7 @@ def phpTests(ctx, testType, withCoverage):
# The default PHP unit test settings for the cron job (usually runs nightly).
cronDefault = {
- "phpVersions": ["7.3", DEFAULT_PHP_VERSION],
+ "phpVersions": [DEFAULT_PHP_VERSION],
"databases": [
"sqlite",
"mariadb:10.2",
@@ -1663,6 +1652,11 @@ def acceptance(ctx):
for federatedServerVersion in params["federatedServerVersions"]:
for browser in params["browsers"]:
for phpVersion in params["phpVersions"]:
+ # Get the first 3 characters of the PHP version (7.4 or 8.0 etc)
+ # And use that for constructing the pipeline name
+ # That helps shorten pipeline names when using owncloud-ci images
+ # that have longer names like 7.4-ubuntu20.04
+ phpMinorVersion = phpVersion[0:3]
for db in params["databases"]:
for runPart in range(1, params["numberOfParts"] + 1):
debugPartsEnabled = (len(params["skipExceptParts"]) != 0)
@@ -1684,7 +1678,7 @@ def acceptance(ctx):
keyString = "-" + category if params["includeKeyInMatrixName"] else ""
partString = "" if params["numberOfParts"] == 1 else "-%d-%d" % (params["numberOfParts"], runPart)
federatedServerVersionString = "-" + federatedServerVersion.replace("daily-", "").replace("-qa", "") if (federatedServerVersion != "") else ""
- name = "%s%s%s%s%s-%s-php%s" % (alternateSuiteName, keyString, partString, federatedServerVersionString, browserString, getShortDbNameAndVersion(db), phpVersion)
+ name = "%s%s%s%s%s-%s-php%s" % (alternateSuiteName, keyString, partString, federatedServerVersionString, browserString, getShortDbNameAndVersion(db), phpMinorVersion)
maxLength = 50
nameLength = len(name)
if nameLength > maxLength:
diff --git a/apps/files_external/3rdparty/composer.json b/apps/files_external/3rdparty/composer.json
index d8d2d1226bd5..10b1e65d7bda 100644
--- a/apps/files_external/3rdparty/composer.json
+++ b/apps/files_external/3rdparty/composer.json
@@ -7,14 +7,14 @@
"optimize-autoloader": true,
"classmap-authoritative": true,
"platform": {
- "php": "7.2.5"
+ "php": "7.4"
}
},
"replace": {
"guzzlehttp/guzzle": "*"
},
"require": {
- "php": ">=7.2",
+ "php": ">=7.4",
"icewind/smb": "3.5.4",
"icewind/streams": "0.7.6",
"google/apiclient": "2.12.6",
diff --git a/apps/files_external/3rdparty/composer.lock b/apps/files_external/3rdparty/composer.lock
index f166c64bea28..a813b5505af5 100644
--- a/apps/files_external/3rdparty/composer.lock
+++ b/apps/files_external/3rdparty/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": "5de868b2b735826f70b2b624718c2f3c",
+ "content-hash": "dd922d044682c0e26eaa4c28135b68c3",
"packages": [
{
"name": "firebase/php-jwt",
@@ -1034,11 +1034,11 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=7.2"
+ "php": ">=7.4"
},
"platform-dev": [],
"platform-overrides": {
- "php": "7.2.5"
+ "php": "7.4"
},
"plugin-api-version": "2.3.0"
}
diff --git a/apps/files_external/3rdparty/composer/installed.php b/apps/files_external/3rdparty/composer/installed.php
index 3d3de5f458b4..0841b1519dc3 100644
--- a/apps/files_external/3rdparty/composer/installed.php
+++ b/apps/files_external/3rdparty/composer/installed.php
@@ -1,22 +1,22 @@
array(
- 'name' => 'files_external/3rdparty',
- 'pretty_version' => 'dev-master',
- 'version' => 'dev-master',
- 'reference' => 'f286ca1849f54f90a5ca2f32cb7f683d63131311',
+ 'pretty_version' => '1.0.0+no-version-set',
+ 'version' => '1.0.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
+ 'reference' => NULL,
+ 'name' => 'files_external/3rdparty',
'dev' => true,
),
'versions' => array(
'files_external/3rdparty' => array(
- 'pretty_version' => 'dev-master',
- 'version' => 'dev-master',
- 'reference' => 'f286ca1849f54f90a5ca2f32cb7f683d63131311',
+ 'pretty_version' => '1.0.0+no-version-set',
+ 'version' => '1.0.0.0',
'type' => 'library',
'install_path' => __DIR__ . '/../',
'aliases' => array(),
+ 'reference' => NULL,
'dev_requirement' => false,
),
'firebase/php-jwt' => array(
diff --git a/apps/files_external/3rdparty/composer/platform_check.php b/apps/files_external/3rdparty/composer/platform_check.php
index a8b98d5ceb1e..580fa9609554 100644
--- a/apps/files_external/3rdparty/composer/platform_check.php
+++ b/apps/files_external/3rdparty/composer/platform_check.php
@@ -4,8 +4,8 @@
$issues = array();
-if (!(PHP_VERSION_ID >= 70205)) {
- $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.5". You are running ' . PHP_VERSION . '.';
+if (!(PHP_VERSION_ID >= 70400)) {
+ $issues[] = 'Your Composer dependencies require a PHP version ">= 7.4.0". You are running ' . PHP_VERSION . '.';
}
if ($issues) {
diff --git a/composer.json b/composer.json
index 3f3d4389f239..f929fd489160 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
"optimize-autoloader": true,
"classmap-authoritative": false,
"platform": {
- "php": "7.3"
+ "php": "7.4"
},
"allow-plugins": {
"bamarni/composer-bin-plugin": true,
@@ -34,7 +34,7 @@
"roave/security-advisories": "dev-master"
},
"require": {
- "php": ">=7.3",
+ "php": ">=7.4",
"doctrine/dbal": "^2.10",
"phpseclib/phpseclib": "^3.0",
"opis/closure": "^3.5",
diff --git a/composer.lock b/composer.lock
index fa57d0c1163c..4b7298f343bf 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": "a29dcf3f8a348fdddb696f0f47211f50",
+ "content-hash": "78738ee7fbc10c6e9528faf642ed872b",
"packages": [
{
"name": "bantu/ini-get-wrapper",
@@ -161,42 +161,6 @@
],
"time": "2022-04-01T19:23:25+00:00"
},
- {
- "name": "container-interop/container-interop",
- "version": "1.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/container-interop/container-interop.git",
- "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
- "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
- "shasum": ""
- },
- "require": {
- "psr/container": "^1.0"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "Interop\\Container\\": "src/Interop/Container/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
- "homepage": "https://github.com/container-interop/container-interop",
- "support": {
- "issues": "https://github.com/container-interop/container-interop/issues",
- "source": "https://github.com/container-interop/container-interop/tree/master"
- },
- "abandoned": "psr/container",
- "time": "2017-02-14T19:40:03+00:00"
- },
{
"name": "deepdiver/zipstreamer",
"version": "2.0.0",
@@ -1233,45 +1197,41 @@
},
{
"name": "laminas/laminas-filter",
- "version": "2.12.0",
+ "version": "2.19.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-filter.git",
- "reference": "0fc5dcd27dc22dba1a2544123684c67768fc5f88"
+ "reference": "06322d90fad3c18dc4646f26d92c8b5557ee195e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/0fc5dcd27dc22dba1a2544123684c67768fc5f88",
- "reference": "0fc5dcd27dc22dba1a2544123684c67768fc5f88",
+ "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/06322d90fad3c18dc4646f26d92c8b5557ee195e",
+ "reference": "06322d90fad3c18dc4646f26d92c8b5557ee195e",
"shasum": ""
},
"require": {
- "laminas/laminas-stdlib": "^3.3",
- "laminas/laminas-zendframework-bridge": "^1.0",
- "php": "^7.3 || ~8.0.0"
+ "laminas/laminas-servicemanager": "^3.14.0",
+ "laminas/laminas-stdlib": "^3.13.0",
+ "php": "^7.4 || ~8.0.0 || ~8.1.0"
},
"conflict": {
- "laminas/laminas-validator": "<2.10.1"
- },
- "replace": {
- "zendframework/zend-filter": "^2.9.2"
+ "laminas/laminas-validator": "<2.10.1",
+ "zendframework/zend-filter": "*"
},
"require-dev": {
- "laminas/laminas-coding-standard": "~1.0.0",
- "laminas/laminas-crypt": "^3.2.1",
- "laminas/laminas-servicemanager": "^3.3",
- "laminas/laminas-uri": "^2.6",
- "pear/archive_tar": "^1.4.3",
- "phpspec/prophecy-phpunit": "^2.0",
- "phpunit/phpunit": "^9.3",
- "psalm/plugin-phpunit": "^0.15.1",
- "psr/http-factory": "^1.0",
- "vimeo/psalm": "^4.6"
+ "laminas/laminas-coding-standard": "~2.4.0",
+ "laminas/laminas-crypt": "^3.5.1",
+ "laminas/laminas-uri": "^2.9.1",
+ "pear/archive_tar": "^1.4.14",
+ "phpspec/prophecy-phpunit": "^2.0.1",
+ "phpunit/phpunit": "^9.5.24",
+ "psalm/plugin-phpunit": "^0.17.0",
+ "psr/http-factory": "^1.0.1",
+ "vimeo/psalm": "^4.27.0"
},
"suggest": {
"laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters",
"laminas/laminas-i18n": "Laminas\\I18n component for filters depending on i18n functionality",
- "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for using the filter chain functionality",
"laminas/laminas-uri": "Laminas\\Uri component, for the UriNormalize filter",
"psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters"
},
@@ -1311,41 +1271,41 @@
"type": "community_bridge"
}
],
- "time": "2021-10-24T21:01:15+00:00"
+ "time": "2022-09-20T11:05:37+00:00"
},
{
"name": "laminas/laminas-inputfilter",
- "version": "2.12.1",
+ "version": "2.21.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-inputfilter.git",
- "reference": "461a7a27b70bd440f925a31221b7a5348cd0d0fd"
+ "reference": "8668227246d19564f339643f0f2aedcdff66612b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/461a7a27b70bd440f925a31221b7a5348cd0d0fd",
- "reference": "461a7a27b70bd440f925a31221b7a5348cd0d0fd",
+ "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/8668227246d19564f339643f0f2aedcdff66612b",
+ "reference": "8668227246d19564f339643f0f2aedcdff66612b",
"shasum": ""
},
"require": {
- "laminas/laminas-filter": "^2.9.1",
- "laminas/laminas-servicemanager": "^3.3.1",
+ "laminas/laminas-filter": "^2.13",
+ "laminas/laminas-servicemanager": "^3.16.0",
"laminas/laminas-stdlib": "^3.0",
- "laminas/laminas-validator": "^2.11",
- "laminas/laminas-zendframework-bridge": "^1.0",
- "php": "^7.3 || ~8.0.0"
+ "laminas/laminas-validator": "^2.15",
+ "php": "^7.4 || ~8.0.0 || ~8.1.0"
},
- "replace": {
- "zendframework/zend-inputfilter": "^2.10.1"
+ "conflict": {
+ "zendframework/zend-inputfilter": "*"
},
"require-dev": {
- "laminas/laminas-coding-standard": "~1.0.0",
- "laminas/laminas-db": "^2.12",
- "phpspec/prophecy-phpunit": "^2.0",
- "phpunit/phpunit": "^9.4.2",
- "psalm/plugin-phpunit": "^0.15.1",
+ "ext-json": "*",
+ "laminas/laminas-coding-standard": "~2.4.0",
+ "laminas/laminas-db": "^2.15.0",
+ "phpunit/phpunit": "^9.5.24",
+ "psalm/plugin-phpunit": "^0.17.0",
"psr/http-message": "^1.0",
- "vimeo/psalm": "^4.6"
+ "vimeo/psalm": "^4.27.0",
+ "webmozart/assert": "^1.11"
},
"suggest": {
"psr/http-message-implementation": "PSR-7 is required if you wish to validate PSR-7 UploadedFileInterface payloads"
@@ -1386,51 +1346,50 @@
"type": "community_bridge"
}
],
- "time": "2021-11-27T14:17:43+00:00"
+ "time": "2022-09-20T10:03:09+00:00"
},
{
"name": "laminas/laminas-servicemanager",
- "version": "3.7.0",
+ "version": "3.16.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-servicemanager.git",
- "reference": "2b0aee477fdbd3191af7c302b93dbc5fda0626f4"
+ "reference": "863c66733740cd36ebf5e700f4258ef2c68a2a24"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/2b0aee477fdbd3191af7c302b93dbc5fda0626f4",
- "reference": "2b0aee477fdbd3191af7c302b93dbc5fda0626f4",
+ "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/863c66733740cd36ebf5e700f4258ef2c68a2a24",
+ "reference": "863c66733740cd36ebf5e700f4258ef2c68a2a24",
"shasum": ""
},
"require": {
- "container-interop/container-interop": "^1.2",
"laminas/laminas-stdlib": "^3.2.1",
- "laminas/laminas-zendframework-bridge": "^1.0",
- "php": "^7.3 || ~8.0.0",
+ "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
"psr/container": "^1.0"
},
"conflict": {
+ "ext-psr": "*",
"laminas/laminas-code": "<3.3.1",
- "zendframework/zend-code": "<3.3.1"
+ "zendframework/zend-code": "<3.3.1",
+ "zendframework/zend-servicemanager": "*"
},
"provide": {
- "container-interop/container-interop-implementation": "^1.2",
"psr/container-implementation": "^1.0"
},
"replace": {
- "zendframework/zend-servicemanager": "^3.4.0"
+ "container-interop/container-interop": "^1.2.0"
},
"require-dev": {
"composer/package-versions-deprecated": "^1.0",
- "laminas/laminas-coding-standard": "~2.2.0",
- "laminas/laminas-container-config-test": "^0.3",
+ "laminas/laminas-coding-standard": "~2.3.0",
+ "laminas/laminas-container-config-test": "^0.7",
"laminas/laminas-dependency-plugin": "^2.1.2",
- "mikey179/vfsstream": "^1.6.8",
- "ocramius/proxy-manager": "^2.2.3",
- "phpbench/phpbench": "^1.0.4",
+ "mikey179/vfsstream": "^1.6.10@alpha",
+ "ocramius/proxy-manager": "^2.11",
+ "phpbench/phpbench": "^1.1",
"phpspec/prophecy-phpunit": "^2.0",
- "phpunit/phpunit": "^9.4",
- "psalm/plugin-phpunit": "^0.16.1",
+ "phpunit/phpunit": "^9.5.5",
+ "psalm/plugin-phpunit": "^0.17.0",
"vimeo/psalm": "^4.8"
},
"suggest": {
@@ -1442,6 +1401,9 @@
],
"type": "library",
"autoload": {
+ "files": [
+ "src/autoload.php"
+ ],
"psr-4": {
"Laminas\\ServiceManager\\": "src/"
}
@@ -1475,34 +1437,35 @@
"type": "community_bridge"
}
],
- "time": "2021-07-24T19:33:07+00:00"
+ "time": "2022-07-27T14:58:17+00:00"
},
{
"name": "laminas/laminas-stdlib",
- "version": "3.11.0",
+ "version": "3.13.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-stdlib.git",
- "reference": "aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f"
+ "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f",
- "reference": "aad7d2b11ba0069ba0d9b40f6dde3c2fa664b57f",
+ "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/66a6d03c381f6c9f1dd988bf8244f9afb9380d76",
+ "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76",
"shasum": ""
},
"require": {
- "php": "^7.3 || ~8.0.0 || ~8.1.0"
+ "php": "^7.4 || ~8.0.0 || ~8.1.0"
},
"conflict": {
"zendframework/zend-stdlib": "*"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.3.0",
- "phpbench/phpbench": "^1.0",
- "phpunit/phpunit": "^9.3.7",
+ "phpbench/phpbench": "^1.2.6",
+ "phpstan/phpdoc-parser": "^0.5.4",
+ "phpunit/phpunit": "^9.5.23",
"psalm/plugin-phpunit": "^0.17.0",
- "vimeo/psalm": "^4.7"
+ "vimeo/psalm": "^4.26"
},
"type": "library",
"autoload": {
@@ -1534,55 +1497,51 @@
"type": "community_bridge"
}
],
- "time": "2022-07-27T12:28:58+00:00"
+ "time": "2022-08-24T13:56:50+00:00"
},
{
"name": "laminas/laminas-validator",
- "version": "2.19.0",
+ "version": "2.25.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-validator.git",
- "reference": "4875d4e58b6f728981bb767a60530540f82ee1df"
+ "reference": "42de39b78e73b321db7d948cf8530a2764f8b9aa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/4875d4e58b6f728981bb767a60530540f82ee1df",
- "reference": "4875d4e58b6f728981bb767a60530540f82ee1df",
+ "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/42de39b78e73b321db7d948cf8530a2764f8b9aa",
+ "reference": "42de39b78e73b321db7d948cf8530a2764f8b9aa",
"shasum": ""
},
"require": {
- "container-interop/container-interop": "^1.1",
- "laminas/laminas-stdlib": "^3.10",
- "php": "^7.3 || ~8.0.0 || ~8.1.0"
+ "laminas/laminas-servicemanager": "^3.12.0",
+ "laminas/laminas-stdlib": "^3.13",
+ "php": "^7.4 || ~8.0.0 || ~8.1.0"
},
"conflict": {
"zendframework/zend-validator": "*"
},
"require-dev": {
- "laminas/laminas-cache": "^2.6.1",
- "laminas/laminas-coding-standard": "~2.2.1",
- "laminas/laminas-db": "^2.7",
- "laminas/laminas-filter": "^2.6",
- "laminas/laminas-http": "^2.14.2",
- "laminas/laminas-i18n": "^2.6",
- "laminas/laminas-math": "^2.6",
- "laminas/laminas-servicemanager": "^2.7.11 || ^3.0.3",
- "laminas/laminas-session": "^2.8",
- "laminas/laminas-uri": "^2.7",
+ "laminas/laminas-coding-standard": "^2.4.0",
+ "laminas/laminas-db": "^2.15.0",
+ "laminas/laminas-filter": "^2.18.0",
+ "laminas/laminas-http": "^2.16.0",
+ "laminas/laminas-i18n": "^2.17.0",
+ "laminas/laminas-session": "^2.13.0",
+ "laminas/laminas-uri": "^2.9.1",
"phpspec/prophecy-phpunit": "^2.0",
- "phpunit/phpunit": "^9.5.5",
- "psalm/plugin-phpunit": "^0.15.0",
+ "phpunit/phpunit": "^9.5.24",
+ "psalm/plugin-phpunit": "^0.17.0",
"psr/http-client": "^1.0",
"psr/http-factory": "^1.0",
"psr/http-message": "^1.0",
- "vimeo/psalm": "^4.3"
+ "vimeo/psalm": "^4.27.0"
},
"suggest": {
"laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator",
"laminas/laminas-filter": "Laminas\\Filter component, required by the Digits validator",
"laminas/laminas-i18n": "Laminas\\I18n component to allow translation of validation error messages",
"laminas/laminas-i18n-resources": "Translations of validator messages",
- "laminas/laminas-math": "Laminas\\Math component, required by the Csrf validator",
"laminas/laminas-servicemanager": "Laminas\\ServiceManager component to allow using the ValidatorPluginManager and validator chains",
"laminas/laminas-session": "Laminas\\Session component, ^2.8; required by the Csrf validator",
"laminas/laminas-uri": "Laminas\\Uri component, required by the Uri and Sitemap\\Loc validators",
@@ -1624,69 +1583,7 @@
"type": "community_bridge"
}
],
- "time": "2022-06-09T21:49:40+00:00"
- },
- {
- "name": "laminas/laminas-zendframework-bridge",
- "version": "1.4.1",
- "source": {
- "type": "git",
- "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
- "reference": "88bf037259869891afce6504cacc4f8a07b24d0f"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/88bf037259869891afce6504cacc4f8a07b24d0f",
- "reference": "88bf037259869891afce6504cacc4f8a07b24d0f",
- "shasum": ""
- },
- "require": {
- "php": "^7.3 || ~8.0.0 || ~8.1.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^9.3",
- "psalm/plugin-phpunit": "^0.15.1",
- "squizlabs/php_codesniffer": "^3.5",
- "vimeo/psalm": "^4.6"
- },
- "type": "library",
- "extra": {
- "laminas": {
- "module": "Laminas\\ZendFrameworkBridge"
- }
- },
- "autoload": {
- "files": [
- "src/autoload.php"
- ],
- "psr-4": {
- "Laminas\\ZendFrameworkBridge\\": "src//"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "description": "Alias legacy ZF class names to Laminas Project equivalents.",
- "keywords": [
- "ZendFramework",
- "autoloading",
- "laminas",
- "zf"
- ],
- "support": {
- "forum": "https://discourse.laminas.dev/",
- "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues",
- "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom",
- "source": "https://github.com/laminas/laminas-zendframework-bridge"
- },
- "funding": [
- {
- "url": "https://funding.communitybridge.org/projects/laminas-project",
- "type": "community_bridge"
- }
- ],
- "time": "2021-12-21T14:34:37+00:00"
+ "time": "2022-09-20T11:33:19+00:00"
},
{
"name": "league/flysystem",
@@ -2577,20 +2474,20 @@
},
{
"name": "psr/container",
- "version": "1.1.1",
+ "version": "1.1.2",
"source": {
"type": "git",
"url": "https://github.com/php-fig/container.git",
- "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+ "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
- "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+ "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+ "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
"shasum": ""
},
"require": {
- "php": ">=7.2.0"
+ "php": ">=7.4.0"
},
"type": "library",
"autoload": {
@@ -2619,9 +2516,9 @@
],
"support": {
"issues": "https://github.com/php-fig/container/issues",
- "source": "https://github.com/php-fig/container/tree/1.1.1"
+ "source": "https://github.com/php-fig/container/tree/1.1.2"
},
- "time": "2021-03-05T17:36:06+00:00"
+ "time": "2021-11-05T16:50:12+00:00"
},
{
"name": "psr/http-client",
@@ -3181,25 +3078,25 @@
},
{
"name": "sabre/uri",
- "version": "2.2.4",
+ "version": "2.3.2",
"source": {
"type": "git",
"url": "https://github.com/sabre-io/uri.git",
- "reference": "c0c9af9f7754e60a49ebd760e1708adc6d1510c0"
+ "reference": "eceb4a1b8b680b45e215574222d6ca00be541970"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sabre-io/uri/zipball/c0c9af9f7754e60a49ebd760e1708adc6d1510c0",
- "reference": "c0c9af9f7754e60a49ebd760e1708adc6d1510c0",
+ "url": "https://api.github.com/repos/sabre-io/uri/zipball/eceb4a1b8b680b45e215574222d6ca00be541970",
+ "reference": "eceb4a1b8b680b45e215574222d6ca00be541970",
"shasum": ""
},
"require": {
- "php": "^7.1 || ^8.0"
+ "php": "^7.4 || ^8.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "~2.19.3",
- "phpstan/phpstan": "^0.12",
- "phpunit/phpunit": "^7.5 || ^8.5 || ^9.0"
+ "friendsofphp/php-cs-fixer": "^3.9",
+ "phpstan/phpstan": "^1.8",
+ "phpunit/phpunit": "^9.0"
},
"type": "library",
"autoload": {
@@ -3234,7 +3131,7 @@
"issues": "https://github.com/sabre-io/uri/issues",
"source": "https://github.com/fruux/sabre-uri"
},
- "time": "2022-09-19T12:25:28+00:00"
+ "time": "2022-09-19T11:58:52+00:00"
},
{
"name": "sabre/vobject",
@@ -7191,12 +7088,12 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
- "php": ">=7.3",
+ "php": ">=7.4",
"ext-json": "*"
},
"platform-dev": [],
"platform-overrides": {
- "php": "7.3"
+ "php": "7.4"
},
"plugin-api-version": "2.3.0"
}
diff --git a/console.php b/console.php
index 52925ca81779..5fc1bb86d515 100644
--- a/console.php
+++ b/console.php
@@ -33,10 +33,10 @@
\define('OC_CONSOLE', 1);
-// Show warning if a PHP version below 7.3.0 is used, this has to happen here
-// because base.php will already use 7.3 syntax.
-if (\version_compare(PHP_VERSION, '7.3.0') === -1) {
- echo 'This version of ownCloud requires at least PHP 7.3.0'.PHP_EOL;
+// Show warning if a PHP version below 7.4.0 is used, this has to happen here
+// because base.php will already use 7.4 syntax.
+if (\version_compare(PHP_VERSION, '7.4.0') === -1) {
+ echo 'This version of ownCloud requires at least PHP 7.4.0'.PHP_EOL;
echo 'You are currently running PHP ' . PHP_VERSION . '. Please update your PHP version.'.PHP_EOL;
exit(1);
}
diff --git a/index.php b/index.php
index 102fd357a5d9..f621554800f9 100644
--- a/index.php
+++ b/index.php
@@ -27,10 +27,10 @@
*
*/
-// Show warning if a PHP version below 7.3.0 is used, this has to happen here
-// because base.php will already use 7.3 syntax.
-if (\version_compare(PHP_VERSION, '7.3.0') === -1) {
- echo 'This version of ownCloud requires at least PHP 7.3.0
';
+// Show warning if a PHP version below 7.4.0 is used, this has to happen here
+// because base.php will already use 7.4 syntax.
+if (\version_compare(PHP_VERSION, '7.4.0') === -1) {
+ echo 'This version of ownCloud requires at least PHP 7.4.0
';
echo 'You are currently running PHP ' . PHP_VERSION . '. Please update your PHP version.';
return;
}
diff --git a/sonar-project.properties b/sonar-project.properties
index 52d4f82fdd38..39670188ab33 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -30,7 +30,7 @@ sonar.pullrequest.branch=${env.SONAR_PULL_REQUEST_BRANCH}
sonar.pullrequest.key=${env.SONAR_PULL_REQUEST_KEY}
# Properties specific to language plugins:
-sonar.php.coverage.reportPaths=results/clover-phpunit-php7.3-mariadb10.2.xml,results/clover-phpunit-php7.3-mariadb10.3.xml,results/clover-phpunit-php7.3-mariadb10.4.xml,results/clover-phpunit-php7.3-mariadb10.5.xml,results/clover-phpunit-php7.3-mysql5.5.xml,results/clover-phpunit-php7.3-mysql5.7.xml,results/clover-phpunit-php7.3-mysql8.0.xml,results/clover-phpunit-php7.3-postgres10.3.xml,results/clover-phpunit-php7.3-postgres9.4.xml,clover-phpunit-php7.3-sqlite-owncloud-owncloud.xml,clover-phpunit-php7.3-sqlite-owncloud.xml,results/clover-phpunit-php7.3-sqlite-samba-samba.xml,results/clover-phpunit-php7.3-sqlite-samba.xml,results/clover-phpunit-php7.3-sqlite-sftp-sftp.xml,results/clover-phpunit-php7.3-sqlite-sftp.xml,results/clover-phpunit-php7.3-sqlite-webdav-webdav.xml,results/clover-phpunit-php7.3-sqlite-webdav.xml,results/clover-phpunit-php7.3-sqlite-windows-windows.xml,results/clover-phpunit-php7.3-sqlite-windows.xml,results/clover-phpunit-php7.3-sqlite.xml,results/clover-phpunit-php7.4-mariadb10.2.xml,results/clover-phpunit-php7.4-sqlite.xml
+sonar.php.coverage.reportPaths=results/clover-phpunit-php7.4-mariadb10.2.xml,results/clover-phpunit-php7.4-mariadb10.3.xml,results/clover-phpunit-php7.4-mariadb10.4.xml,results/clover-phpunit-php7.4-mariadb10.5.xml,results/clover-phpunit-php7.4-mysql5.5.xml,results/clover-phpunit-php7.4-mysql5.7.xml,results/clover-phpunit-php7.4-mysql8.0.xml,results/clover-phpunit-php7.4-postgres10.3.xml,results/clover-phpunit-php7.4-postgres9.4.xml,clover-phpunit-php7.4-sqlite-owncloud-owncloud.xml,clover-phpunit-php7.4-sqlite-owncloud.xml,results/clover-phpunit-php7.4-sqlite-samba-samba.xml,results/clover-phpunit-php7.4-sqlite-samba.xml,results/clover-phpunit-php7.4-sqlite-sftp-sftp.xml,results/clover-phpunit-php7.4-sqlite-sftp.xml,results/clover-phpunit-php7.4-sqlite-webdav-webdav.xml,results/clover-phpunit-php7.4-sqlite-webdav.xml,results/clover-phpunit-php7.4-sqlite-windows-windows.xml,results/clover-phpunit-php7.4-sqlite-windows.xml,results/clover-phpunit-php7.4-sqlite.xml,results/clover-phpunit-php7.4-mariadb10.2.xml,results/clover-phpunit-php7.4-sqlite.xml
sonar.javascript.lcov.reportPaths=results/lcov.info
# Exclude translation, dependency, 3rd-party and test files