projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #19844 from seamuslee001/php74_membership_api_fix
[civicrm-core.git]
/
composer.json
diff --git
a/composer.json
b/composer.json
index f50143f6733ee3095f7fc316330d41e3114790ae..604bf273ce73e85cb20d3ae17f694154168cbab8 100644
(file)
--- a/
composer.json
+++ b/
composer.json
@@
-45,6
+45,7
@@
"php": "~7.2",
"cache/integration-tests": "~0.17.0",
"dompdf/dompdf" : "~0.8",
"php": "~7.2",
"cache/integration-tests": "~0.17.0",
"dompdf/dompdf" : "~0.8",
+ "firebase/php-jwt": ">=3 <6",
"electrolinux/phpquery": "^0.9.6",
"symfony/config": "~3.0 || ~4.4",
"symfony/polyfill-iconv": "~1.0",
"electrolinux/phpquery": "^0.9.6",
"symfony/config": "~3.0 || ~4.4",
"symfony/polyfill-iconv": "~1.0",
@@
-83,7
+84,8
@@
"ext-intl": "*",
"pear/mail_mime": "~1.10",
"pear/db": "1.10",
"ext-intl": "*",
"pear/mail_mime": "~1.10",
"pear/db": "1.10",
- "civicrm/composer-compile-lib": "~0.3 || ~1.0"
+ "civicrm/composer-compile-lib": "~0.3 || ~1.0",
+ "ext-json": "*"
},
"scripts": {
"post-install-cmd": [
},
"scripts": {
"post-install-cmd": [
@@
-128,7
+130,7
@@
"path": "bower_components/{$id}"
},
"angular": {
"path": "bower_components/{$id}"
},
"angular": {
- "url": "https://github.com/angular/bower-angular/archive/v1.8.
0
.zip"
+ "url": "https://github.com/angular/bower-angular/archive/v1.8.
2
.zip"
},
"angular-bootstrap": {
"url": "https://github.com/angular-ui/bootstrap-bower/archive/2.5.0.zip"
},
"angular-bootstrap": {
"url": "https://github.com/angular-ui/bootstrap-bower/archive/2.5.0.zip"
@@
-229,7
+231,7
@@
"url": "https://github.com/components/jqueryui/archive/1.12.1.zip"
},
"jquery-validation": {
"url": "https://github.com/components/jqueryui/archive/1.12.1.zip"
},
"jquery-validation": {
- "url": "https://github.com/jquery-validation/jquery-validation/archive/1.19.
1
.zip",
+ "url": "https://github.com/jquery-validation/jquery-validation/archive/1.19.
3
.zip",
"ignore": [".*", "node_modules", "bower_components", "test", "demo", "lib"]
},
"json-formatter": {
"ignore": [".*", "node_modules", "bower_components", "test", "demo", "lib"]
},
"json-formatter": {