X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=composer.json;h=d4839ccbde0cac60403c6e090388dadd276deb6a;hb=fa78ca246cec8463a237e6e4cb1b94f81282110e;hp=6e15bd0388dd5fe9b76d69abf8dd117d6f7f838d;hpb=40df867c2bcf1c86a7901acca978fafce5258e64;p=civicrm-core.git diff --git a/composer.json b/composer.json index 6e15bd0388..d4839ccbde 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ } }, "require": { - "php": "~7.2", + "php": "~7.2 || ~8", "cache/integration-tests": "~0.17.0", "dompdf/dompdf" : "~1.0.0", "firebase/php-jwt": ">=3 <6", @@ -83,7 +83,7 @@ "brick/money": "~0.4", "ext-intl": "*", "pear/mail_mime": "~1.10", - "pear/db": "1.10", + "pear/db": "1.11", "civicrm/composer-compile-lib": "~0.3 || ~1.0", "ext-json": "*" }, @@ -136,8 +136,8 @@ "url": "https://github.com/angular-ui/bootstrap-bower/archive/2.5.0.zip" }, "angular-file-upload": { - "url": "https://github.com/nervgh/angular-file-upload/archive/v1.1.6.zip", - "ignore": ["examples"] + "url": "https://github.com/nervgh/angular-file-upload/archive/2.6.1.zip", + "ignore": ["examples", "src"] }, "angular-jquery-dialog-service": { "url": "https://github.com/totten/angular-jquery-dialog-service/archive/v0.8.0-civicrm-1.0.zip" @@ -216,7 +216,7 @@ "ignore": [".*", "*.json", "*.md", "Makefile", "*/*"] }, "monaco-editor": { - "url": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.16.2.tgz", + "url": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.25.2.tgz", "path": "bower_components/monaco-editor", "ignore": ["dev", "esm"] }, @@ -260,6 +260,10 @@ "smartmenus": { "url": "https://github.com/vadikom/smartmenus/archive/1.1.0.zip", "ignore": [".gitignore", "Gruntfile.js"] + }, + "sms-counter": { + "url": "https://github.com/danxexe/sms-counter/archive/master.zip", + "ignore": ["examples"] } }, "patches": { @@ -270,7 +274,7 @@ "PHP7.4 Fix for array access using {} instead of []": "https://raw.githubusercontent.com/civicrm/civicrm-core/fe45bdfc4f3e3d3deb27e3d853cdbc7f616620a9/tools/scripts/composer/patches/php74_array_access_fix_phpquery.patch" }, "pear/db": { - "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/a48a43c2b5f6d694fff1cfb99d522c5d9e2459a0/tools/scripts/composer/pear_db_civicrm_changes.patch" + "Apply CiviCRM Customisations for the pear:db package": "https://raw.githubusercontent.com/civicrm/civicrm-core/2ad420c394/tools/scripts/composer/pear_db_civicrm_changes.patch" }, "pear/mail": { "Apply CiviCRM Customisations for CRM-1367 and CRM-5946": "https://raw.githubusercontent.com/civicrm/civicrm-core/36319938a5bf26c1e7e2110a26a65db6a5979268/tools/scripts/composer/patches/pear-mail.patch"