chore(vendors): Update to 2.0 branch

Elgg · Nov 29, 2015 · 2d70f71 · 2d70f71
1 parent 9690911
commit 2d70f71
Show file tree

Hide file tree

Showing 4 changed files with 209 additions and 142 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,9 +2,9 @@
 !.gitignore
 !.travis.yml
 !.tx
-settings.php
-cache
-
+/settings.php
+/elgg-config/settings.php
+/cache
 /mod
 /vendor
 

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "elgg/community_web_services": "dev-master",
         "elgg/dbvalidator": "dev-master",
         "elgg/drop_unvalidated": "dev-master",
-        "elgg/elgg": "dev-master",
+        "elgg/elgg": "2.0.x-dev",
         "elgg/login_as": "~1.9",
         "elgg/opensearch": "dev-master",
         "elgg/showcase": "dev-master",
@@ -36,9 +36,9 @@
         "phpunit/phpunit": "^4.7"
     },
     "scripts": {
-        "post-install-cmd": "\\Elgg\\Composer\\PostUpdate::execute",
-        "post-update-cmd": "\\Elgg\\Composer\\PostUpdate::execute",
-        "test": "phpunit tests",
+        "post-install-cmd": "\\Elgg\\Composer\\PostInstall::execute",
+        "post-package-update": "\\Elgg\\Composer\\PostUpdate::execute",
+        "test": "phpunit",
         "translations:update": "tx pull -a --mode=reviewed --minimum-perc=100"
     },
     "repositories": [