Merge pull request #17176 from eileenmcnaughton/batch1

[civicrm-core.git] / composer.json

diff --git a/composer.json b/composer.json
index 4aaba8d29860355c7ba98a414a177f2f7ddf2c4b..6e414e4c6650460f441f4b5f84a5354cd0dcae2f 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -29,10 +29,10 @@
     "psr-0": {
       "PHPUnit_": ["packages/"],
       "Civi": "",
-      "Civi\\": [".", "tests/phpunit/"]
+      "Civi\\": ["tests/phpunit/"]
     },
     "psr-4": {
-      "Civi\\": ["setup/src/"]
+      "Civi\\": [".", "setup/src/"]
     }
   },
   "include-path": ["vendor/tecnickcom"],
@@ -75,7 +75,7 @@
     "league/csv": "^9.2",
     "tplaner/when": "~3.0.0",
     "xkerman/restricted-unserialize": "~1.1",
-    "typo3/phar-stream-wrapper": "^3.0"
+    "typo3/phar-stream-wrapper": "^2 || ^3.0"
   },
   "scripts": {
     "post-install-cmd": [
@@ -201,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", "demo.html"]
+        "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"