Moved PHP dependencies to composer.json

millinon · Feb 18, 2017 · 4057a62 · 4057a62
1 parent 1156cfd
commit 4057a62
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@ credentials.ini
 *.swp
 .hhconfig
 node_modules/
+composer.phar
+composer.lock
diff --git a/composer.json b/composer.json
@@ -0,0 +1,9 @@
+{
+    "require": {
+        "aws/aws-sdk-php": "^3.22",
+        "facebook/xhp-lib": "2.x"
+    },
+    "config": {
+        "vendor-dir": "www/include/vendor"
+    }
+}
diff --git a/www/error.hh b/www/error.hh
@@ -1,7 +1,5 @@
 <?hh
 
-require_once ('vendor/facebook/xhp-lib/init.php');
-
 require_once ('html/header.hh');
 
 require_once ('html/footer.hh');

diff --git a/www/include/.gitignore b/www/include/.gitignore
@@ -0,0 +1 @@
+vendor/
diff --git a/www/include/aws.hh b/www/include/aws.hh
@@ -1,7 +1,5 @@
 <?hh
 
-require_once ("aws.phar");
-
 if (!include_once('config/aws_config.hh')) {
   require_once ('config/aws_config.hh.example');
 }

diff --git a/www/include/aws.phar b/www/include/aws.phar
diff --git a/www/index.hh b/www/index.hh
@@ -1,7 +1,5 @@
 <?hh
 
-require_once ('vendor/facebook/xhp-lib/init.php');
-
 require_once ('html/header.hh');
 require_once ('html/footer.hh');
 

diff --git a/www/main.hh b/www/main.hh
@@ -3,6 +3,7 @@
 set_include_path(get_include_path().PATH_SEPARATOR.__DIR__.'/include');
 
 require_once ('helpers.hh');
+require_once ('vendor/autoload.php');
 
 function main(): void {
 

diff --git a/www/result.hh b/www/result.hh
@@ -1,7 +1,5 @@
 <?hh
 
-require_once ('vendor/facebook/xhp-lib/init.php');
-
 require_once ('html/header.hh');
 require_once ('html/footer.hh');
 

diff --git a/www/vendor/facebook/xhp-lib b/www/vendor/facebook/xhp-lib