summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Wurst <ChristophWurst@users.noreply.github.com>2020-05-13 11:08:18 +0200
committerGitHub <noreply@github.com>2020-05-13 11:08:18 +0200
commitbe15a23de80740e5083a49a46eecd3df5d0709df (patch)
tree0ad66733c3b3f570c29c12c9cfafdede15780deb
parent7c15c63b05eb4a3e4ff8b8871480707f3b97bc65 (diff)
parent002780d4c3c9d672c0488eed23b1a222e2c7cb65 (diff)
downloadnextcloud-server-be15a23de80740e5083a49a46eecd3df5d0709df.tar.gz
nextcloud-server-be15a23de80740e5083a49a46eecd3df5d0709df.zip
Merge pull request #20946 from nextcloud/enhancement/ext-json-composer
Declare ext-json as dependency in composer.json
-rw-r--r--composer.json3
-rw-r--r--composer.lock6
2 files changed, 7 insertions, 2 deletions
diff --git a/composer.json b/composer.json
index ee73b60f431..937df706202 100644
--- a/composer.json
+++ b/composer.json
@@ -11,6 +11,9 @@
"OCP\\": "lib/public"
}
},
+ "require": {
+ "ext-json": "*"
+ },
"require-dev": {
"jakub-onderka/php-parallel-lint": "^0.9.2",
"jakub-onderka/php-console-highlighter": "^0.3.2",
diff --git a/composer.lock b/composer.lock
index 1d12f54a5fc..c62d71353bd 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": "8b37c8b04970af89937957aad3c18a12",
+ "content-hash": "c6266c06daad42dd49f2bd3d5288467d",
"packages": [],
"packages-dev": [
{
@@ -1711,7 +1711,9 @@
"stability-flags": [],
"prefer-stable": false,
"prefer-lowest": false,
- "platform": [],
+ "platform": {
+ "ext-json": "*"
+ },
"platform-dev": [],
"plugin-api-version": "1.1.0"
}