Merge pull request #17176 from eileenmcnaughton/batch1

[civicrm-core.git] / composer.json

diff --git a/composer.json b/composer.json
index 8d94f744f9b3eb11bd14833b3f1723dd443bca03..6e414e4c6650460f441f4b5f84a5354cd0dcae2f 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -29,20 +29,20 @@
     "psr-0": {
       "PHPUnit_": ["packages/"],
       "Civi": "",
-      "Civi\\": [".", "tests/phpunit/"]
+      "Civi\\": ["tests/phpunit/"]
     },
     "psr-4": {
-      "Civi\\": ["setup/src/"]
+      "Civi\\": [".", "setup/src/"]
     }
   },
   "include-path": ["vendor/tecnickcom"],
   "config": {
     "platform": {
-      "php": "7.0.10"
+      "php": "7.1"
     }
   },
   "require": {
-    "php": "~7.0",
+    "php": "~7.1",
     "cache/integration-tests": "~0.16.0",
     "dompdf/dompdf" : "0.8.*",
     "electrolinux/phpquery": "^0.9.6",
@@ -70,11 +70,12 @@
     "psr/simple-cache": "~1.0.1",
     "cweagans/composer-patches": "~1.0",
     "pear/log": "1.13.1",
-    "katzien/php-mime-type": "2.1.0",
+    "adrienrn/php-mimetyper": "0.2.2",
     "civicrm/composer-downloads-plugin": "^2.0",
     "league/csv": "^9.2",
     "tplaner/when": "~3.0.0",
-    "xkerman/restricted-unserialize": "~1.1"
+    "xkerman/restricted-unserialize": "~1.1",
+    "typo3/phar-stream-wrapper": "^2 || ^3.0"
   },
   "scripts": {
     "post-install-cmd": [
@@ -200,7 +201,7 @@
       },
       "google-code-prettify": {
         "url": "https://github.com/tcollard/google-code-prettify/archive/v1.0.5.zip",
-        "ignore": ["closure-compiler", "js-modules", "tests", "yui-compressor", "Makefile"]
+        "ignore": ["closure-compiler", "js-modules", "tests", "yui-compressor", "Makefile", "examples", "*.html", "run_prettify*js"]
       },
       "jquery": {
         "url": "https://github.com/civicrm/jquery/archive/1.12.4-civicrm-1.2.zip"
@@ -209,7 +210,7 @@
         "url": "https://github.com/components/jqueryui/archive/1.12.1.zip"
       },
       "jquery-validation": {
-        "url": "https://github.com/jquery-validation/jquery-validation/archive/1.13.1.zip",
+        "url": "https://github.com/jquery-validation/jquery-validation/archive/1.19.1.zip",
         "ignore": [".*", "node_modules", "bower_components", "test", "demo", "lib"]
       },
       "jstree": {
@@ -223,9 +224,6 @@
       "phantomjs-polyfill": {
         "url": "https://github.com/conversocial/phantomjs-polyfill/archive/v0.0.2.zip"
       },
-      "qunit": {
-        "url": "https://github.com/jquery/qunit/archive/v1.10.0.zip"
-      },
       "select2": {
         "url": "https://github.com/colemanw/select2/archive/v3.5-civicrm-1.0.zip"
       },
@@ -244,6 +242,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"
       },
+      "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"
+      },
       "pear/net_smtp": {
         "Add in CiviCRM custom error message for CRM-8744": "https://raw.githubusercontent.com/civicrm/civicrm-core/a6a0ff13d2a155ad962529595dceaef728116f96/tools/scripts/composer/patches/net-smtp-patch.patch"
       },