Merge pull request #319 from jasonmunro/composer-issue-311

Composer issue 311

.gitignore

@@ -17,3 +17,4 @@ tests/phpunit/clover.xml
 tests/phpunit/coveralls-upload.json
 tests/phpunit/data/foo.txt
 scripts/test.php
+/vendor/

.travis/setup.sh

@@ -76,6 +76,7 @@ setup_cypht() {
         sed -i "s/'host'/'socket'/" tests/phpunit/mocks.php
     fi
     mv creds.py tests/selenium/
+    composer install
     php ./scripts/config_gen.php
 }
 

INSTALL

@@ -3,7 +3,8 @@ Requirements
 
 Cypht requires at least PHP 5.4, with the OpenSSL and cURL extensions. You will
 also need PDO support if using any databases features. Testing is done on
-Debian and Ubuntu platforms with Nginx, Apache, standard PHP, and HHVM.
+Debian and Ubuntu platforms with Nginx, Apache, standard PHP, and HHVM. We also
+use Composer to manage our few PHP dependencies.
 
 
 1. Download and prepare the code
@@ -40,6 +41,9 @@ wget https://github.com/jasonmunro/cypht/archive/master.zip
 # unpack the archive
 unzip master.zip
 
+# run composer
+cd cypht-master && composer install && cd ..
+
 # create a vanilla ini file
 cp cypht-master/hm3.sample.ini cypht-master/hm3.ini
 

composer.json

@@ -0,0 +1,41 @@
+{
+    "name": "jason-munro/cypht",
+    "type": "application",
+    "description": "Lightweight Open Source webmail written in PHP and JavaScript",
+    "keywords": ["php", "webmail", "webmail-client", "imap", "pop3", "smtp", "news-reader", "rss", "atom", "e-mail", "jmap"],
+    "homepage": "https://cypht.org",
+    "license": "GPLV2",
+    "authors":[
+        {
+            "name": "Jason Munro",
+            "email": "jason@cypht.org",
+            "homepage": "http://jasonmunro.net",
+            "role": "Project author and admin"
+        }
+    ],
+    "require": {
+        "paragonie/random_compat": "2.0.18",
+        "html2text/html2text": "4.2.1",
+        "erusev/parsedown": "1.8.0-beta-5",
+        "christian-riesen/base32": "1.3.2",
+        "ezyang/htmlpurifier": "4.10.0",
+        "codeitnowin/barcode": "3.0.3",
+
+        "php": ">=5.4",
+        "ext-mbstring": "*",
+        "ext-json": "*",
+        "ext-curl": "*",
+        "ext-openssl": "*",
+        "ext-session": "*"
+    },
+    "suggest": {
+        "ext-PDO": "To use database features, this needs to be installed",
+        "ext-redis": "To use Redis for caching, this needs to be installed",
+        "ext-gd": "To use 2fa, this needs to be installed for the QR code display",
+        "ext-memcached": "To use Memcached for caching, this needs to be installed",
+        "ext-gnupg": "To use the PGP module set, this needs to be installed"
+    },
+    "config": {
+    	"optimize-autoloader": true
+    }
+}

lib/framework.php

@@ -35,7 +35,7 @@
 
 /* load random bytes polyfill if needed */
 if (!function_exists('random_bytes')) {
-    require APP_PATH.'third_party/random_compat/lib/random.php';
+    require APP_PATH.'vendor/paragonie/random_compat/lib/random.php';
 }
 
 /* check for and load the correct libsodium interface */