Merge branch 'master' into 'master'

[faas#30] updating orm library for PHP 7.x

See merge request !3

Dockerfile

@@ -26,12 +26,14 @@ RUN cd /opt/rr3 && bash install.sh && \
     cp email-default.php email.php && \
     cp memcached-default.php memcached.php
 
-COPY ./conf/etc/registry/config.php /opt/rr3/application/config/config.php
-COPY ./conf/etc/registry/database.php /opt/rr3/application/config/database.php
+COPY ./conf/etc/registry/application/config/config.php /opt/rr3/application/config/config.php
+COPY ./conf/etc/registry/application/config/database.php /opt/rr3/application/config/database.php
+COPY ./conf/etc/registry/application/composer.json /opt/rr3/application/composer.json
 
 RUN cp /opt/codeigniter/index.php /opt/rr3/index.php && \
     sed -i 's#$system_path = \x27system\x27;#$system_path = \x27/opt/codeigniter/system\x27;#' /opt/rr3/index.php && \
     cd /opt/rr3/application && \
+    composer update && \
     composer install
 
 EXPOSE 80

conf/etc/registry/application/composer.json

+{
+    "name": "edugate/resourceregistry",
+    "description": "Federation(s) (SAML)  management",
+    "license": "MIT",
+    "require": {
+        "doctrine/orm": "2.5.*",
+        "zendframework/zend-permissions-acl": "^2.6",
+        "mtdowling/cron-expression": "1.1.*",
+        "phpseclib/phpseclib": "2.0.*",
+        "lcobucci/jwt": "3.2.*",
+        "php-amqplib/php-amqplib": "2.6.*"
+    },
+    "require-dev": {
+        "phpmd/phpmd": "^2.6"
+    }
+}