Merge pull request #1262 from DANS-KNAW/v2.13-maintenance

Allow plugin robloach/component-installer, because it is required by components/handlebars.js
NatLibFi · Feb 17, 2022 · 68449a2 · 68449a2
2 parents 5b9a75c + 75c962e
commit 68449a2
Show file tree

Hide file tree

Showing 3 changed files with 5,241 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,9 +6,10 @@ components
 plugins/*
 !README
 composer.phar
-composer.lock
 tests/jena-fuseki*
 .vagrant
 .project
 .DS_Store
 .phpunit.result.cache
+/.idea
+
diff --git a/composer.json b/composer.json
@@ -61,7 +61,7 @@
     "easyrdf/easyrdf": "1.1.*",
     "etdsolutions/waypoints": "4.0.0",
     "symfony/polyfill-php80": "1.*",
-    "twig/twig": "2.13.*",
+    "twig/twig": "2.14.*",
     "twig/extensions": "1.5.*",
     "twitter/bootstrap": "3.3.*",
     "twitter/typeahead.js": "v0.10.5",
@@ -88,5 +88,10 @@
   },
   "autoload": {
     "classmap": ["controller/", "model/", "model/sparql/"]
+  },
+  "config": {
+    "allow-plugins": {
+      "robloach/component-installer": true
+    }
   }
 }