X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=composer.json;h=bc5568bcbd6001becd74c5161a116be114967710;hb=406e0961a325fdd359e7edf8fe7e92b2373a4787;hp=f7226e719a3e087bc27ea0e2872b7ae281e78c98;hpb=5d73950a7163a46f1bce91dea0f79fad269f1cb2;p=civicrm-core.git diff --git a/composer.json b/composer.json index f7226e719a..bc5568bcbd 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "Civi\\": ["tests/phpunit/"] }, "psr-4": { - "Civi\\": [".", "setup/src/"] + "Civi\\": [".", "Civi/", "setup/src/"] } }, "include-path": ["vendor/tecnickcom"], @@ -54,7 +54,7 @@ "symfony/process": "~3.0 || ~4.4", "psr/log": "~1.0", "symfony/finder": "~3.0 || ~4.4", - "tecnickcom/tcpdf" : "6.2.*", + "tecnickcom/tcpdf" : "6.3.*", "totten/ca-config": "~17.05", "zetacomponents/base": "1.9.*", "zetacomponents/mail": "1.9.*", @@ -75,7 +75,9 @@ "league/csv": "^9.2", "tplaner/when": "~3.0.0", "xkerman/restricted-unserialize": "~1.1", - "typo3/phar-stream-wrapper": "^2 || ^3.0" + "typo3/phar-stream-wrapper": "^2 || ^3.0", + "brick/money": "~0.4", + "ext-intl": "*" }, "scripts": { "post-install-cmd": [ @@ -242,6 +244,9 @@ "Support PHPUnit 6+": "https://github.com/php-cache/integration-tests/commit/1ec7362962185df91d3d749bc3fa7e7b99cb9fc7.patch", "Add tests for binary data round trip": "https://github.com/php-cache/integration-tests/commit/89cd7068e83aa776774bfc44f6bcba858c085616.patch" }, + "electrolinux/phpquery": { + "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/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" },