add custom data to table

2019-09-05 15:49:02 +05:30
12505 changed files with 168785 additions and 918651 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,5 +0,0 @@
-// Use this file as a starting point for your project's .eslintrc.
-// Copy this file, and add rule overrides as needed.
-{
-  "extends": "airbnb"
-}
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,17 @@
-/.settings
-/.buildpath
-/.project
+.settings
+.buildpath
+.project
 .idea/
-/build
-/deployment/clients/dev/data/*
-/deployment/clients/test/data/*
-/deployment/clients/local/data/*
-/.vagrant
-keys.tags.pub
-keys.dev.pub
-/app/config.php
-/app/icehrm.key
-/app/data/*.*
-/app/data/keys/*
-!/app/data/index.php
-!/app/data/.htaccess
-icehrm.key
+build
+deployment/clients/dev/data/
+deployment/clients/test/data/
+deployment/clients/local/data/
+.vagrant
+app/config.php
+app/data/*
 cache.properties
 node_modules/*
-test/frontend/node_modules/*
 web/dist/*.map
 web/admin/dist/*.map
 web/modules/dist/*.map
-test/frontend/cypress/videos/*
-test/frontend/cypress/screenshots/*
 .gitkeep
-web/node_modules
-/frontend/node_modules/*
-docker/development/db_data
-docker/prod/db_data
-docker/prod/app_data
-docker/testing/db_data
-!deployment/vagrant/ssl/icehrm.key
-/web/dist/vendor.js.map
-/web/dist/admin-bundle.js.map
-/web/dist/modules-bundle.js.map
--- a/.swp
+++ b/.swp
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ install:
 script: ant build-ci
 language: php
 php:
+  - '5.6'
  - '7.0'
  - '7.1'
  - '7.2'
--- a/64
+++ b/64
@@ -1,64 +0,0 @@
-FROM alpine:3.11
-LABEL Maintainer="Thilina, Pituwala <thilina@icehrm.com>" \
-      Description="IceHrm Docker Container with Nginx 1.16 & PHP-FPM 7.3 based on Alpine Linux."
-
-ENV PHPIZE_DEPS \
-		autoconf \
-		dpkg-dev dpkg \
-		file \
-		g++ \
-		gcc \
-		libc-dev \
-		make \
-		pkgconf \
-		musl-dev \
-		re2c \
-		php7-dev \
-		php7-pear
-
-RUN apk --no-cache add bind-tools
-
-# Install packages
-RUN apk --no-cache add php php-fpm php-opcache php-mysqli php-json php-openssl php-curl \
-    php-zlib php-xml php-phar php-intl php-dom php-xmlreader php-ctype php-session \
-    php-mbstring php-gd php7-ldap nginx supervisor curl
-
-# Install xdebug
-RUN apk add --no-cache $PHPIZE_DEPS \
-    && pecl install xdebug-2.9.5
-
-# Configure nginx
-COPY docker/development/config/nginx.conf /etc/nginx/nginx.conf
-# Remove default server definition
-RUN rm /etc/nginx/conf.d/default.conf
-
-# Configure PHP-FPM
-COPY docker/development/config/fpm-pool.conf /etc/php7/php-fpm.d/www.conf
-COPY docker/development/config/php.ini /etc/php7/conf.d/custom.ini
-
-# Configure supervisord
-COPY docker/development/config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-# Setup document root
-RUN mkdir -p /var/www/html
-
-# Make sure files/folders needed by the processes are accessable when they run under the nobody user
-RUN chown -R nobody.nobody /var/www/html && \
-  chown -R nobody.nobody /run && \
-  chown -R nobody.nobody /var/lib/nginx && \
-  chown -R nobody.nobody /var/log/nginx
-
-# Switch to use a non-root user from here on
-USER nobody
-
-# Add application
-WORKDIR /var/www/html
-
-# Expose the port nginx is reachable on
-EXPOSE 8080
-
-# Let supervisord start nginx & php-fpm
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
-
-# Configure a healthcheck to validate that everything is up&running
-HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:8080/fpm-ping
--- a/49
+++ b/49
@@ -1,49 +0,0 @@
-FROM alpine:3.11
-LABEL Maintainer="Thilina, Pituwala <thilina@icehrm.com>" \
-      Description="IceHrm Docker Container with Nginx 1.16 & PHP-FPM 7.3 based on Alpine Linux."
-
-# Install packages
-RUN apk --no-cache add php7 php7-fpm php7-opcache php7-mysqli php7-json php7-openssl php7-curl \
-    php7-zlib php7-xml php7-phar php7-intl php7-dom php7-xmlreader php7-ctype php7-session \
-    php7-mbstring php7-gd php7-ldap nginx supervisor curl
-
-# Configure nginx
-COPY docker/prod/config/nginx.conf /etc/nginx/nginx.conf
-# Remove default server definition
-RUN rm /etc/nginx/conf.d/default.conf
-
-# Configure PHP-FPM
-COPY docker/prod/config/fpm-pool.conf /etc/php7/php-fpm.d/www.conf
-COPY docker/prod/config/php.ini /etc/php7/conf.d/custom.ini
-
-# Configure supervisord
-COPY docker/prod/config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-# Setup document root
-RUN mkdir -p /var/www/html
-
-# Make sure files/folders needed by the processes are accessable when they run under the nobody user
-RUN chown -R nobody.nobody /var/www/html && \
-  chown -R nobody.nobody /run && \
-  chown -R nobody.nobody /var/lib/nginx && \
-  chown -R nobody.nobody /var/log/nginx
-
-# Switch to use a non-root user from here on
-USER nobody
-
-# Add application
-WORKDIR /var/www/html
-COPY --chown=nobody ./app /var/www/html/app/
-COPY --chown=nobody ./core /var/www/html/core/
-COPY --chown=nobody ./web /var/www/html/web/
-COPY --chown=nobody ./index.php /var/www/html/index.php
-COPY --chown=nobody ./docker/prod/config/config.php /var/www/html/app/config.php
-
-# Expose the port nginx is reachable on
-EXPOSE 8070
-
-# Let supervisord start nginx & php-fpm
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
-
-# Configure a healthcheck to validate that everything is up&running
-HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:8071/fpm-ping
--- a/50
+++ b/50
@@ -1,50 +0,0 @@
-FROM alpine:3.11
-LABEL Maintainer="Thilina, Pituwala <thilina@icehrm.com>" \
-      Description="IceHrm Docker Container with Nginx 1.16 & PHP-FPM 7.3 based on Alpine Linux."
-
-# Install packages
-RUN apk --no-cache add php7 php7-fpm php7-opcache php7-mysqli php7-json php7-openssl php7-curl \
-    php7-zlib php7-xml php7-phar php7-intl php7-dom php7-xmlreader php7-ctype php7-session \
-    php7-mbstring php7-gd php7-ldap nginx supervisor curl
-
-# Configure nginx
-COPY docker/testing/config/nginx.conf /etc/nginx/nginx.conf
-# Remove default server definition
-RUN rm /etc/nginx/conf.d/default.conf
-
-# Configure PHP-FPM
-COPY docker/testing/config/fpm-pool.conf /etc/php7/php-fpm.d/www.conf
-COPY docker/testing/config/php.ini /etc/php7/conf.d/custom.ini
-
-# Configure supervisord
-COPY docker/testing/config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-# Setup document root
-RUN mkdir -p /var/www/html
-
-# Make sure files/folders needed by the processes are accessable when they run under the nobody user
-RUN chown -R nobody.nobody /var/www/html && \
-  chown -R nobody.nobody /run && \
-  chown -R nobody.nobody /var/lib/nginx && \
-  chown -R nobody.nobody /var/log/nginx
-
-# Switch to use a non-root user from here on
-USER nobody
-
-# Add application
-WORKDIR /var/www/html
-COPY --chown=nobody ./app /var/www/html/app/
-COPY --chown=nobody ./core /var/www/html/core/
-COPY --chown=nobody ./web /var/www/html/web/
-COPY --chown=nobody ./index.php /var/www/html/index.php
-COPY --chown=nobody ./docker/testing/config/config.php /var/www/html/app/config.php
-COPY --chown=nobody ./docker/testing/config/reset-db.php /var/www/html/app/reset-db.php
-
-# Expose the port nginx is reachable on
-EXPOSE 8090
-
-# Let supervisord start nginx & php-fpm
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
-
-# Configure a healthcheck to validate that everything is up&running
-HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:8091/fpm-ping
--- a/31
+++ b/31
@@ -1,31 +0,0 @@
-FROM alpine:3.11
-LABEL Maintainer="Thilina, Pituwala <thilina@icehrm.com>" \
-      Description="IceHrm Docker Container with Nginx 1.16 & PHP-FPM 7.3 based on Alpine Linux."
-
-ARG EXE_ENV
-
-RUN apk upgrade --available
-
-RUN apk add --no-cache tini openrc busybox-initscripts
-
-
-# Install packages
-RUN apk --no-cache add php7 php7-opcache php7-mysqli php7-json php7-openssl php7-curl \
-    php7-zlib php7-xml php7-phar php7-intl php7-dom php7-xmlreader php7-ctype php7-session \
-    php7-mbstring php7-gd curl
-
-# Setup document root
-RUN mkdir -p /var/www/html
-
-# Add application
-WORKDIR /var/www/html
-COPY ./app /var/www/html/app/
-COPY ./core /var/www/html/core/
-COPY ./web /var/www/html/web/
-COPY ./index.php /var/www/html/index.php
-COPY ./docker/$EXE_ENV/config/config.php /var/www/html/app/config.php
-
-
-COPY ./docker/worker/config/ice-cron /etc/crontabs/root
-
-CMD /usr/sbin/crond -f -l 8
--- a/30
+++ b/30
@@ -1,15 +1,21 @@
-IceHrm is a web based human resource management software
-    Copyright (C) 2020  Thilina, Pituwala
+MIT License

-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+Copyright (c) 2016 Thilina Hasantha

-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:

-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/35
+++ b/35
@@ -1,33 +1,26 @@
-Vagrant.configure("2") do |config|
-    config.vm.box = "icehrm/icehrm"
-    config.vm.box_version = "1.0.0"
-    config.vm.network "private_network", ip: "192.168.10.12"
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+  config.vm.box = "thilinah/jessie64_isotope"
+  config.vm.box_version = "0.0.1"
+  config.vm.network "private_network", ip: "192.168.40.40"
  config.vm.synced_folder ".", "/vagrant", type: "nfs"

  config.vm.provider "virtualbox" do |vb|
    vb.memory = "1024"
    vb.cpus = "2"
-      vb.name = "icehrm-os.test"
+    vb.name = "icehrm.open"
  end

+
  config.vm.provision "shell", inline: <<-SHELL
-    	sudo rm /etc/nginx/ssl/icehrm.*
-        sudo ln -s /vagrant/deployment/vagrant/ssl/icehrm.crt /etc/nginx/ssl/icehrm.crt
-        sudo ln -s /vagrant/deployment/vagrant/ssl/icehrm.key /etc/nginx/ssl/icehrm.key
-
-        sudo rm /etc/nginx/sites-enabled/default
-        sudo ln -s /vagrant/deployment/vagrant/sites-available/default /etc/nginx/sites-enabled/default
-
-        sed -i 's/PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config
-
-        sudo service nginx restart
-        sudo chmod 755 -R /var/log
+    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50
+    sudo apt-get update
+    chmod ugo+x /vagrant/deployment/vagrant/runonce.sh
+    sh /vagrant/deployment/vagrant/runonce.sh
  SHELL

-    config.vm.hostname = "icehrm.os"
+  config.vm.hostname = "icehrm.open"

-    config.hostsupdater.aliases = [
-        "icehrm.os"
-     ]
 end
-
--- a/app/data/.htaccess
+++ b/app/data/.htaccess
@@ -1,2 +0,0 @@
-order deny,allow
-deny from all
--- a/app/data/index.php
+++ b/app/data/index.php
@@ -1 +0,0 @@
-<?php
--- a/app/fileupload-new.php
+++ b/app/fileupload-new.php
@@ -1,3 +0,0 @@
-<?php
-include ('config.php');
-include (APP_BASE_PATH.'fileupload-new.php');
--- a/app/index.php
+++ b/app/index.php
@@ -17,13 +17,6 @@ if($group == 'admin' || $group == 'modules'){
 	$name = str_replace("..","",$name);	
 	$name = str_replace("/","",$name);
 	include APP_BASE_PATH.'/'.$group.'/'.$name.'/index.php';
-}else if ($group == 'extension'){
-    $name = str_replace("..","",$name);
-    $name = str_replace("/","",$name);
-    $moduleName = $name;
-    $moduleGroup = 'extensions';
-    $extensionIndex = APP_BASE_PATH.'/../extensions/'.$name.'/web/index.php';
-    include APP_BASE_PATH.'extensions/wrapper.php';
 }else{
 	exit();
 }
--- a/app/install/index.php
+++ b/app/install/index.php
@@ -19,10 +19,7 @@ $isConfigFileWriteable = is_writable(CLIENT_APP_PATH."config.php");
 error_log("Config writable ".$isConfigFileWriteable);
 error_log("Config exists ".file_exists(CLIENT_APP_PATH."config.php"));
 if(!$isConfigFileWriteable){
-	$errorMap[] = array("important","Configuration file [".CLIENT_APP_PATH."config.php] is not writable","Make this file writable",array(
-	        "sudo touch ".CLIENT_APP_PATH."config.php","sudo chmod 755 ".CLIENT_APP_PATH."config.php",
-	        "sudo chown -R ".shell_exec('whoami')." ".CLIENT_APP_PATH,
-    ));
+	$errorMap[] = array("important","Configuration file [".CLIENT_APP_PATH."config.php] is not writable","Make this file writable",array("sudo touch ".CLIENT_APP_PATH."config.php","sudo chmod 777 ".CLIENT_APP_PATH."config.php"));				
 }

 $isConfigSampleFileExists = file_exists(CLIENT_APP_PATH."config.sample.php");
@@ -51,7 +48,7 @@ if(!$isDataFolderExists){
 		unlink(CLIENT_APP_PATH."data/test.txt");
 	}
 	if(!$isDataFolderWritable){
-		$errorMap[] = array("important","Data folder is not writable","Provide wirte permission to the web server user to ".CLIENT_APP_PATH."data",array("sudo chmod 755 ".CLIENT_APP_PATH."data"));
+		$errorMap[] = array("important","Data folder is not writable","Provide wirte permission to the web server user to ".CLIENT_APP_PATH."data",array("sudo chmod 777 ".CLIENT_APP_PATH."data"));		
 	}
 }

--- a/bin/export-plural-rules
+++ b/bin/export-plural-rules
@@ -1 +0,0 @@
-../core/lib/composer/vendor/gettext/languages/bin/export-plural-rules
--- a/bin/markdown
+++ b/bin/markdown
@@ -1 +0,0 @@
-../core/lib/composer/vendor/cebe/markdown/bin/markdown
--- a/bin/pdepend
+++ b/bin/pdepend
@@ -1 +0,0 @@
-../core/lib/composer/vendor/pdepend/pdepend/src/bin/pdepend
--- a/bin/phpcb
+++ b/bin/phpcb
@@ -1 +0,0 @@
-../core/lib/composer/vendor/mayflower/php-codebrowser/bin/phpcb
--- a/bin/phpcbf
+++ b/bin/phpcbf
@@ -1 +0,0 @@
-../core/lib/composer/vendor/squizlabs/php_codesniffer/scripts/phpcbf
--- a/bin/phpcpd
+++ b/bin/phpcpd
@@ -1 +0,0 @@
-../core/lib/composer/vendor/sebastian/phpcpd/composer/bin/phpcpd
--- a/bin/phpcs
+++ b/bin/phpcs
@@ -1 +0,0 @@
-../core/lib/composer/vendor/squizlabs/php_codesniffer/scripts/phpcs
--- a/bin/phploc
+++ b/bin/phploc
@@ -1 +0,0 @@
-../core/lib/composer/vendor/phploc/phploc/phploc
--- a/bin/phpmd
+++ b/bin/phpmd
@@ -1 +0,0 @@
-../core/lib/composer/vendor/phpmd/phpmd/src/bin/phpmd
--- a/bin/phpunit
+++ b/bin/phpunit
@@ -1 +0,0 @@
-../core/lib/composer/vendor/phpunit/phpunit/phpunit
--- a/bin/release
+++ b/bin/release
@@ -1 +0,0 @@
-../core/lib/composer/vendor/consolidation/self-update/scripts/release
--- a/bin/robo
+++ b/bin/robo
@@ -1 +0,0 @@
-../core/lib/composer/vendor/consolidation/robo/robo
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="icehrm" default="build">
 <!-- By default, we assume all tools to be on the $PATH -->
- <property name="toolsdir" value="${basedir}/bin/"/>
+ <property name="toolsdir" value="${basedir}/tools/"/>
 <property name="destination" value="${basedir}/build/app"/>
 <property name="testdir" value="${basedir}/build/test"/>
 <property name="origin" value="${basedir}"/>
@@ -225,15 +225,10 @@
 	  <fileset dir="${origin}">
 	    <include name="**/*"/>
        <exclude name="node_modules/**"/>
-        <exclude name="web/node_modules/**"/>
-        <exclude name="web/admin/**"/>
-        <exclude name="web/modules/**"/>
+        <exclude name="web/admin/src/**"/>
+        <exclude name="web/modules/src/**"/>
        <exclude name="web/api/**"/>
        <exclude name="web/api-common/**"/>
-        <exclude name="web/components/**"/>
-        <exclude name="web/themecss/**"/>
-        <exclude name="web/themejs/**"/>
-        <exclude name="docs/**"/>
 	  </fileset>
 	</copy>

--- a/core/.htaccess
+++ b/core/.htaccess
@@ -1,2 +0,0 @@
-order deny,allow
-deny from all
--- a/core/admin/attendance/index.php
+++ b/core/admin/attendance/index.php
@@ -53,20 +53,16 @@ $mapAttendance = \Classes\SettingsManager::getInstance()->getSetting('Attendance
                <div class="row" style="background: #f3f4f5; padding: 10px;">
                    <div id="attendnaceCanvasPunchInTimeWraper" class="col-sm-6" style="text-align: center;">
                        <b>In: </b><span id="attendnaceCanvasPunchInTime"></span>
-                        <br/>
-                        IP Address: <span id="punchInIp"></span>
                    </div>
                    <div id="attendnaceCanvasPunchOutTimeWrapper" class="col-sm-6" style="text-align: center;">
                        <b>Out: </b><span id="attendnaceCanvasPunchOutTime"></span>
-                        <br/>
-                        IP Address: <span id="punchOutIp"></span>
                    </div>
                </div>
                <div id="attendancePhoto" class="row" style="background: #f3f4f5; padding: 10px;display:none;">
-					<div id="attendnaceCanvasInWrapper" class="col-sm-6" style="text-align: center;">
+                    <div class="col-sm-6" style="text-align: center;">

                    </div>
-					<div id="attendnaceCanvasOutWrapper" class="col-sm-6" style="text-align: center;">
+                    <div class="col-sm-6" style="text-align: center;">

                    </div>
                </div>
@@ -79,10 +75,13 @@ $mapAttendance = \Classes\SettingsManager::getInstance()->getSetting('Attendance
                    </div>
                    <div class="col-sm-6" style="text-align: center;">
                        <span>Location: <span id="punchInLocation"></span></span>
-
+                        <br/>
+                        IP Address: <span id="punchInIp"></span>
                    </div>
                    <div class="col-sm-6" style="text-align: center;">
                        <span>Location: <span id="punchOutLocation"></span></span>
+                        <br/>
+                        IP Address: <span id="punchOutIp"></span>
                    </div>
                </div>
            </div>
--- a/core/admin/charts/LICENSE.txt
+++ b/core/admin/charts/LICENSE.txt
@@ -1,44 +0,0 @@
-ICEHRM END USER LICENSE AGREEMENT
-NOTICE TO ALL USERS: BY PURCHASING THE MODULE, YOU (EITHER AN INDIVIDUAL OR A SINGLE ENTITY) CONSENT TO BE BOUND BY AND BECOME A PARTY TO THIS AGREEMENT.
-
-All references to "Software" herein shall be deemed to include the software license with which you will be provided by Gamonoid Media Pvt Ltd, as part of the Software.
-
-1. LICENSE GRANT. Subject to the payment of the applicable licence fees, and subject to the terms and conditions of this Agreement, ICEHRM hereby grants to you a non-exclusive, non-transferable right to use one copy of the specified version of the Software and the accompanying documentation (the "Documentation") for the term of this Agreement solely for your own internal business purposes. You may install one copy of the Software for production use.
-.
-2. USE. The Software is licensed as a single product; it may not be used on more than one ICEHRM Server at a time. The Software is "in use" on a Server when its installed on a Server. You shall not, nor permit any third party to copy (other than as expressly permitted herein). You shall not rent, lease or lend the Software to any other person, nor transfer or sub-licence your licence rights to any other person.
-
-3. TERM. This Agreement is effective until terminated as set forth herein. This Agreement will terminate automatically if you fail to comply with any of the conditions, limitations or other requirements described herein. Upon any termination of this Agreement, you must immediately destroy all copies of the Software and the Documentation. You may terminate this Agreement at any point by destroying all copies of the Software and the Documentation.
-
-4. SUPPORT. Gamonoid Media Pvt Ltd will provide you support according to the support agreement subscribed by the company.
-
-5. OWNERSHIP RIGHTS. The Software is protected by copyright laws. ICEHRM and Gamonoid Media Pvt Ltd own and retain all right, title and interest in and to the Software, including all copyrights, patents, trademarks and other intellectual property rights therein. Your possession, installation, or use of the Software does not transfer to you any title to the intellectual property in the Software, and you will not acquire any rights to the Software except as expressly set forth in this Agreement.
-
-6. LIMITED WARRANTY. You may not rent, lease, loan or resell the Software. You may not permit third parties to benefit from the use or functionality of the Software via a timesharing, service bureau or other arrangement, except to the extent such use is specified in the applicable list price or product packaging for the Software. You may not transfer any of the rights granted to you under this Agreement. You may not modify, or create derivative works based upon, the Software in whole or in part. You may not copy the Software or Documentation except as expressly permitted in Section 1 above. You may not remove any proprietary notices or labels on the Software. All rights not expressly set forth hereunder are reserved by ICEHRM. ICEHRM reserves the right to periodically conduct audits upon advance written notice to verify compliance with the terms of this Agreement.
-
-7. WARRANTY and DISCLAIMER. 
-
-(i) Gamonoid Media Pvt Ltd. warrants that for 30 days from first download or installation the Software will perform substantially in accordance with the functionality described in the Documentation (http://blog.icehrm.com) when operated properly and in the manner specified in the Documentation. 
-
-(ii) You accept all responsibility for the selection of this Software to meet your requirements. 
-
-(iii) Gamonoid Media Pvt Ltd. does not warrant that the Software and/or the Documentation will be suitable for such requirements nor that any use will be uninterrupted and error free.
-
-(iv) The warranty in (i) shall not apply if you (a) make or cause to be made any modifications to this Software, (b) use the Software in a manner for which it was not intended or (c) use the Software other than as permitted under this Agreement. 
-
-(vii) The warranties and conditions stated in this Agreement are in lieu of all other conditions, warranties or other terms concerning the supply or purported supply of, failure to supply or delay in supplying the Software or the Documentation which might but for this paragraph (vii) have effect between the ICEHRM and you or would otherwise be implied into or incorporated into this Agreement or any collateral contract, whether by statute, common law or otherwise, all of which are hereby excluded (including, without limitation, the implied conditions, warranties or other terms as to satisfactory quality, fitness for purpose or as to the use of reasonable skill and care).
-
-8. LIMITATION of LIABILITY. Gamonoid Media Pvt Ltd. shall have no liability (whether in contract, tort, restitution or otherwise) for any of the following losses or damage (whether such losses or damage were foreseen, foreseeable, known or otherwise): 
- Loss of revenue; 
- Loss of actual or anticipated profits (including for loss of profits on contracts); 
- Loss of the use of money; 
- Loss of anticipated savings; 
- Loss of business; 
- Loss of opportunity; 
- Loss of goodwill; 
- Loss of reputation; 
- Loss of, damage to or corruption of data; 
-or 
-Any indirect or consequential loss or damage howsoever caused (including, for the avoidance of doubt, where such loss or damage is of the type specified in paragraph (ii), (a) to (ii), (i). 
-The ICEHRM liability (whether in contract, tort, restitution or otherwise) arising out of or in connection with the supply of the Software shall in no circumstances exceed a sum equal to the amount equally paid by you for the Software.
-The construction and interpretation of this Agreement shall be governed in accordance with the laws of Sri Lanka. The parties hereby submit to the jurisdiction of the courts of Sri Lanka save that ICEHRM as claimant shall be entitled to initiate proceedings in any court of competent jurisdiction.
-This Agreement contains the entire understanding of the parties with respect to the subject matter hereof and supersedes all and any prior understandings, undertakings and promises between you and ICEHRM, whether oral or in writing, which have been given or may be implied from anything written or said in negotiations between us or our representatives prior to this Agreement and all prior agreements between the parties relating to the matters aforesaid shall cease to have effect as from the Effective Date.
--- a/core/admin/charts/README.txt
+++ b/core/admin/charts/README.txt
@@ -1,7 +0,0 @@
-This module is licensed under IceHrm Commercial License, which can be found in LICENSE.txt.
-You are allowed to make any modification required to these module, but only allowed to use
-the module in one production server (even with modifications).
-
-Installation
------------
-Copy this module into <icehrm path>/admin/ directory
--- a/core/admin/charts/index.php
+++ b/core/admin/charts/index.php
@@ -1,57 +0,0 @@
-<?php
-
-$moduleName = 'charts';
-$moduleGroup = 'admin';
-define('MODULE_PATH',dirname(__FILE__));
-include APP_BASE_PATH.'header.php';
-include APP_BASE_PATH.'modulejslibs.inc.php';
-?>
-
-<link href="<?=BASE_URL.'js/nvd3/src/nv.d3.css?v='.$jsVersion?>" rel="stylesheet" type="text/css">
-
-<script src="<?=BASE_URL.'js/nvd3/lib/d3.v3.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/nv.d3.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/tooltip.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/utils.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/legend.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/axis.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/multiBar.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/discreteBar.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/src/models/discreteBarChart.js?v='.$jsVersion?>"></script>
-<script src="<?=BASE_URL.'js/nvd3/stream_layers.js?v='.$jsVersion?>"></script>
-
-<style type="text/css">
-svg .tooltip { opacity: 1; }
-</style>
-
-<div class="span9">
-
-
-	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-		<li class="active"><a id="tabAttendanceGraph" href="#tabPageAttendanceGraph"><?=t('Attendance Graph')?></a></li>
-		<li><a id="tabTimeUtilizationGraph" href="#tabPageTimeUtilizationGraph"><?=t('Hours in Office vs Hours Worked Graph')?></a></li>
-	</ul>
-
-	<div class="tab-content">
-		<div class="tab-pane active reviewBlock with-3d-shadow with-transitions" id="tabPageAttendanceGraph" style="height: 500px;position: relative;">
-			<svg></svg>
-		</div>
-		<div class="tab-pane reviewBlock with-3d-shadow with-transitions" id="tabPageTimeUtilizationGraph" style="height: 500px;position: relative;">
-			<svg></svg>
-		</div>
-	</div>
-
-</div>
-<script>
-var modJsList = new Array();
-modJsList['tabAttendanceGraph'] = new AttendanceGraphAdapter('AttendanceGraph');
-modJsList['tabAttendanceGraph'].setShowAddNew(false);
-
-modJsList['tabTimeUtilizationGraph'] = new TimeUtilizationGraphAdapter('TimeUtilizationGraph');
-modJsList['tabTimeUtilizationGraph'].setShowAddNew(false);
-
-var modJs = modJsList['tabAttendanceGraph'];
-
-</script>
-
-<?php include APP_BASE_PATH.'footer.php';?>
--- a/core/admin/charts/meta.json
+++ b/core/admin/charts/meta.json
@@ -1,13 +0,0 @@
-{
-    "label": "Time and Attendance",
-    "menu": "Insights",
-    "order": "1",
-    "icon": "fa-user-clock",
-    "user_levels": [
-        "Admin",
-        "Manager"
-    ],
-    "permissions": [],
-    "model_namespace": "\\Charts\\Common\\Model",
-    "manager": "\\Charts\\Admin\\Api\\ChartsAdminManager"
-}
--- a/core/admin/clients/index.php
+++ b/core/admin/clients/index.php
@@ -1,51 +0,0 @@
-<?php
-/*
- Copyright (c) 2020 [Glacies UG, Berlin, Germany] (http://glacies.de)
- Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
- */
-
-use Classes\PermissionManager;
-use Clients\Common\Model\Client;
-
-$moduleName = 'clients';
-$moduleGroup = 'admin';
-define('MODULE_PATH', dirname(__FILE__));
-include APP_BASE_PATH . 'header.php';
-include APP_BASE_PATH . 'modulejslibs.inc.php';
-?><div class="span9">
-
-    <ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-        <li class="active"><a id="tabClient" href="#tabPageClient"><?= t('Clients') ?></a></li>
-    </ul>
-
-    <div class="tab-content">
-        <div class="tab-pane active" id="tabPageClient">
-            <div id="ClientTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="ClientForm"></div>
-            <div id="ClientFilterForm"></div>
-        </div>
-    </div>
-
-</div>
-<?php
-$moduleData = [
-    'user_level' => $user->user_level,
-    'permissions' => [
-        'Client' => PermissionManager::checkGeneralAccess(new Client()),
-    ]
-];
-?>
-    <script>
-      var data = <?= json_encode($moduleData) ?>;
-      var modJsList = [];
-
-      modJsList['tabClient'] = new ClientAdapter('Client');
-
-      modJsList.tabClient.setObjectTypeName('Client');
-      modJsList.tabClient.setAccess(data.permissions.Client);
-      modJsList.tabClient.setDataPipe(new IceDataPipe(modJsList.tabClient));
-      modJsList.tabClient.setRemoteTable(true);
-
-      var modJs = modJsList['tabClient'];
-    </script>
-<?php include APP_BASE_PATH . 'footer.php'; ?>
--- a/core/admin/clients/meta.json
+++ b/core/admin/clients/meta.json
@@ -1,20 +0,0 @@
-{
-    "label": "Clients",
-    "menu": "Admin",
-    "order": "52",
-    "icon": "fa-user-circle",
-    "user_levels": [
-        "Admin",
-        "Manager"
-    ],
-    "dashboardPosition": 4,
-    "permissions": {
-        "Manager": {
-            "Add Clients": "Yes",
-            "Edit Clients": "Yes",
-            "Delete Clients": "No"
-        }
-    },
-    "model_namespace": "\\Clients\\Common\\Model",
-    "manager": "\\Clients\\Admin\\Api\\ClientsAdminManager"
-}
--- a/core/admin/company_structure/index.php
+++ b/core/admin/company_structure/index.php
@@ -4,10 +4,6 @@
 Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
 */

-use Classes\BaseService;
-use Classes\PermissionManager;
-use Company\Common\Model\CompanyStructure;
-
 $moduleName = 'company_structure';
 $moduleGroup = 'admin';
 define('MODULE_PATH',dirname(__FILE__));
@@ -48,9 +44,12 @@ path.link {

 	<div class="tab-content">
 		<div class="tab-pane active" id="tabPageCompanyStructure">
-			<div id="CompanyStructureTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="CompanyStructureForm"></div>
-            <div id="CompanyStructureFilterForm"></div>
+			<div id="CompanyStructure" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="CompanyStructureForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane reviewBlock" id="tabPageCompanyGraph" style="overflow-x: scroll;">

@@ -58,16 +57,24 @@ path.link {
 	</div>

 </div>
-<?php
-$moduleData = [
-    'user_level' => $user->user_level,
-    'customFields' => BaseService::getInstance()->getCustomFields("CompanyStructure"),
-    'permissions' => [
-        'CompanyStructure' => PermissionManager::checkGeneralAccess(new CompanyStructure()),
-    ]
-];
-?>
 <script>
-  initAdminCompanyStructure(<?=json_encode($moduleData)?>);
+var modJsList = new Array();
+modJsList['tabCompanyStructure'] 	= new CompanyStructureAdapter('CompanyStructure');
+
+<?php if(isset($modulePermissions['perm']['Add Company Structure']) && $modulePermissions['perm']['Add Company Structure'] == "No"){?>
+modJsList['tabCompanyStructure'].setShowAddNew(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Delete Company Structure']) && $modulePermissions['perm']['Delete Company Structure'] == "No"){?>
+modJsList['tabCompanyStructure'].setShowDelete(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Edit Company Structure']) && $modulePermissions['perm']['Edit Company Structure'] == "No"){?>
+modJsList['tabCompanyStructure'].setShowEdit(false);
+<?php }?>
+
+
+modJsList['tabCompanyGraph'] = new CompanyGraphAdapter('CompanyStructure');
+
+var modJs = modJsList['tabCompanyStructure'];
+
 </script>
 <?php include APP_BASE_PATH.'footer.php';?>
--- a/core/admin/connection/index.php
+++ b/core/admin/connection/index.php
@@ -1,59 +0,0 @@
-<?php
-use Classes\StatsHelper;
-use Connection\Common\ConnectionService;
-
-$moduleName = 'connection';
-$moduleGroup = 'admin';
-define('MODULE_PATH',dirname(__FILE__));
-include APP_BASE_PATH.'header.php';
-include APP_BASE_PATH.'modulejslibs.inc.php';
-
-$isIceHrmPro = false;
-if (class_exists('\\Classes\\ProVersion')) {
-    $data = \Classes\ProVersion::$data;
-    $isIceHrmPro = true;
-    $data = json_decode($data, true);
-}
-
-$employeeCount = StatsHelper::getEmployeeCount();
-$userCount = StatsHelper::getUserCount();
-$connectionService = new ConnectionService();
-?><div class="span9">
-
-    <ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-        <li class="active"><a id="tabConnection" href="#tabConnection"><?=t('Connection')?></a></li>
-    </ul>
-
-    <div class="tab-content">
-        <div class="tab-pane active" id="tabConnection">
-            <div class="reviewBlock" data-content="List">
-                <div id="connectionData"></div>
-            </div>
-        </div>
-    </div>
-
-</div>
-<div id="dataGroup"></div>
-<?php
-$moduleData = [
-    'user_level' => $user->user_level,
-    'components' => [
-            'employeeCount' => [
-                    'isIceHrmPro' => $isIceHrmPro,
-                    'count' => $employeeCount,
-                    'allowed' => $isIceHrmPro ? intval($data['employees']) : 'N/A',
-                    'validUntil' => $data['licenseActivated'],
-                    'licenseId' => $data['key'],
-            ],
-            'systemData' => [
-                    'data' => $connectionService->getSystemReport(),
-                    'issues' => $connectionService->getSystemErrors(),
-            ],
-    ]
-];
-?>
-<script>
-  initAdminConnection(<?=json_encode($moduleData)?>);
-</script>
-<?php include APP_BASE_PATH.'footer.php';?>
-
--- a/core/admin/connection/meta.json
+++ b/core/admin/connection/meta.json
@@ -1,12 +0,0 @@
-{
-    "label": "Ice Connect",
-    "menu": "System",
-    "order": "9",
-    "icon": "fa-wifi",
-    "user_levels": [
-        "Admin"
-    ],
-    "permissions": [],
-    "model_namespace": "\\Connection\\Common\\Model",
-    "manager": "\\Connection\\Admin\\Api\\ConnectionAdminManager"
-}
--- a/core/admin/custom_fields/index.php
+++ b/core/admin/custom_fields/index.php
@@ -1,42 +0,0 @@
-<?php
-
-use Classes\BaseService;
-use Classes\PermissionManager;
-use FieldNames\Common\Model\CustomField;
-
-$moduleName = 'assets';
-$moduleGroup = 'admin';
-define('MODULE_PATH',dirname(__FILE__));
-include APP_BASE_PATH.'header.php';
-include APP_BASE_PATH.'modulejslibs.inc.php';
-$modelClasses = BaseService::getInstance()->getCustomFieldClassMap();
-?><div class="span9">
-
-    <ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-        <li class="active"><a id="tabCustomField" href="#tabPageCustomField"><?=t('Custom Fields')?></a></li>
-    </ul>
-
-    <div class="tab-content">
-        <div class="tab-pane active" id="tabPageCustomField">
-            <div id="CustomFieldTable" class="reviewBlock" data-content="List"></div>
-            <div id="CustomFieldForm"></div>
-            <div id="CustomFieldFilterForm"></div>
-        </div>
-    </div>
-
-</div>
-<div id="dataGroup"></div>
-<?php
-$moduleData = [
-    'user_level' => $user->user_level,
-    'types' => $modelClasses,
-    'permissions' => [
-        'CustomField' => PermissionManager::checkGeneralAccess(new CustomField()),
-    ]
-];
-?>
-<script>
-  initAdminCustomFields(<?=json_encode($moduleData)?>);
-</script>
-<?php include APP_BASE_PATH.'footer.php';?>
-
--- a/core/admin/custom_fields/meta.json
+++ b/core/admin/custom_fields/meta.json
@@ -1,12 +0,0 @@
-{
-    "label": "Custom Fields",
-    "menu": "Admin",
-    "order": "892",
-    "icon": "fa-code",
-    "user_levels": [
-        "Admin"
-    ],
-    "permissions": [],
-    "model_namespace": "\\FieldNames\\Common\\Model",
-    "manager": "\\CustomField\\Admin\\Api\\CustomFieldAdminManager"
-}
--- a/core/admin/dashboard/index.php
+++ b/core/admin/dashboard/index.php
@@ -4,16 +4,16 @@
 Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
 */

-use Classes\BaseService;
-use Classes\LanguageManager;
-
 $moduleName = 'dashboard';
 $moduleGroup = 'admin';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
+?><div class="span9">
+    <div class="row">

-$moduleManagers = BaseService::getInstance()->getModuleManagers();
+        <?php
+        $moduleManagers = \Classes\BaseService::getInstance()->getModuleManagers();
        $dashBoardList = array();
        foreach($moduleManagers as $moduleManagerObj){

@@ -22,7 +22,7 @@ foreach($moduleManagers as $moduleManagerObj){
                continue;
            }

-    $allowed = BaseService::getInstance()->isModuleAllowedForUser($moduleManagerObj);
+            $allowed = \Classes\BaseService::getInstance()->isModuleAllowedForUser($moduleManagerObj);

            if(!$allowed){
                continue;
@@ -37,52 +37,16 @@ foreach($moduleManagers as $moduleManagerObj){

        ksort($dashBoardList);

-$dashboardList1  =[];
-$dashboardList2  =[];
        foreach($dashBoardList as $k=>$v){
-    if (count($dashboardList1) === 4 ) {
-        $dashboardList2[] = $v;
-    } else {
-        $dashboardList1[] = $v;
-    }
+            echo \Classes\LanguageManager::translateTnrText($v);
        }
+        ?>
+    </div>

-?><div class="span9">
-    <div class="row">
-        <?php
-        foreach($dashboardList1 as $v){
-            echo LanguageManager::translateTnrText($v);
-        }
-        ?>
-    </div>
-    <div class="row">
-        <div class="col-lg-4 col-xs-12">
-            <div id="EmployeeOnlineOfflineChartLoader" style="width:100%;"></div>
-            <div id="EmployeeOnlineOfflineChart" style="display:none;box-shadow: 0 1px 3px rgba(0,0,0,.12), 0 1px 2px rgba(0,0,0,.24);border: none;margin-bottom: 20px;"></div>
-        </div>
-        <div class="col-lg-4 col-xs-12">
-            <div id="EmployeeDistributionChartLoader" style="width:100%;"></div>
-            <div id="EmployeeDistributionChart" style="display:none;box-shadow: 0 1px 3px rgba(0,0,0,.12), 0 1px 2px rgba(0,0,0,.24);border: none;margin-bottom: 20px;"></div>
-        </div>
-        <div class="col-lg-4 col-xs-12">
-            <div id="TaskListLoader" style="width:100%;"></div>
-            <div id="TaskListWrap" style="display: none;box-shadow: 0 1px 3px rgba(0,0,0,.12), 0 1px 2px rgba(0,0,0,.24);border: none;margin-bottom: 20px; padding:25px;">
-                <h4>Tasks to Attend</h4>
-                <div id="TaskList" style="margin-left: 10px; margin-top: 30px;"></div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <?php
-        foreach($dashboardList2 as $v){
-            echo LanguageManager::translateTnrText($v);
-        }
-        ?>
-    </div>

 </div>
 <script>
-    var modJsList = [];
+    var modJsList = new Array();

    modJsList['tabDashboard'] = new DashboardAdapter('Dashboard','Dashboard');

--- a/core/admin/documents/dashboard.html
+++ b/core/admin/documents/dashboard.html
@@ -1,19 +0,0 @@
-<div class="col-lg-3 col-xs-12">
-
-    <div class="small-box bg-green">
-        <div class="inner">
-            <h3>
-                <t>Document</t>
-            </h3>
-            <p id="numberOfDocuments">
-                <t>Management</t>
-            </p>
-        </div>
-        <div class="icon">
-            <i class="ion ion-document"></i>
-        </div>
-        <a href="#_moduleLink_#" class="small-box-footer" id="documentLink">
-            <t>Manage</t> <t>Documents</t> <i class="fa fa-arrow-circle-right"></i>
-        </a>
-    </div>
-</div>
--- a/core/admin/documents/emailTemplates/documentExpireEmailTemplate.html
+++ b/core/admin/documents/emailTemplates/documentExpireEmailTemplate.html
@@ -1,8 +0,0 @@
-Dear #_employee_#,<br/><br/>
-Following documents listed under your profile will be soon be expired<br/>
-Please login and take necessary actions.
-<br/>
-<hr/>
-#_documents_#
-IceHrm Url: <a href="#_url_#">#_url_#</a>
-<br/>
--- a/core/admin/documents/index.php
+++ b/core/admin/documents/index.php
@@ -1,66 +0,0 @@
-<?php
-/*
- Copyright (c) 2018 [Glacies UG, Berlin, Germany] (http://glacies.de)
- Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
- */
-
-$moduleName = 'documents';
-$moduleGroup = 'admin';
-define('MODULE_PATH',dirname(__FILE__));
-include APP_BASE_PATH.'header.php';
-include APP_BASE_PATH.'modulejslibs.inc.php';
-$activeStr = '';
-if($user->user_level == "Manager"){
-    $activeStr = 'active';
-}
-
-$moduleBuilder = new \Classes\ModuleBuilder\ModuleBuilder();
-if($user->user_level == "Admin") {
-    $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
-        'CompanyDocument',
-        'CompanyDocument',
-        'Company Documents',
-        'CompanyDocumentAdapter',
-        '',
-        '',
-        true
-    ));
-    $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
-        'Document',
-        'Document',
-        'Document Types',
-        'DocumentAdapter',
-        '',
-        '',
-        false
-    ));
-    $options1 = array();
-    $options1['setRemoteTable'] = 'true';
-    $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
-        'EmployeeDocument',
-        'EmployeeDocument',
-        'Employee Documents',
-        'EmployeeDocumentAdapter',
-        '',
-        '',
-        false,
-        $options1
-    ));
-}else{
-    $options1 = array();
-    $options1['setRemoteTable'] = 'true';
-    $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
-        'EmployeeDocument',
-        'EmployeeDocument',
-        'Employee Documents',
-        'EmployeeDocumentAdapter',
-        '',
-        '',
-        ($user->user_level != "Admin"),
-        $options1
-    ));
-}
-
-echo \Classes\UIManager::getInstance()->renderModule($moduleBuilder);
-
-include APP_BASE_PATH.'footer.php';
--- a/core/admin/documents/meta.json
+++ b/core/admin/documents/meta.json
@@ -1,14 +0,0 @@
-{
-    "label": "Document Management",
-    "menu": "Employees",
-    "order": "2",
-    "icon": "fa-file-alt",
-    "user_levels": [
-        "Admin",
-        "Manager"
-    ],
-    "dashboardPosition": 13,
-    "permissions": [],
-    "model_namespace": "\\Documents\\Common\\Model",
-    "manager": "\\Documents\\Admin\\Api\\DocumentsAdminManager"
-}
--- a/core/admin/employees/index.php
+++ b/core/admin/employees/index.php
@@ -1,14 +1,5 @@
 <?php

-use Classes\PermissionManager;
-use Dependents\Common\Model\EmployeeDependent;
-use EmergencyContacts\Common\Model\EmergencyContact;
-use Employees\Common\Model\Employee;
-use Qualifications\Common\Model\EmployeeCertification;
-use Qualifications\Common\Model\EmployeeEducation;
-use Qualifications\Common\Model\EmployeeLanguage;
-use Qualifications\Common\Model\EmployeeSkill;
-
 $moduleName = 'employees';
 $moduleGroup = 'admin';
 define('MODULE_PATH',dirname(__FILE__));
@@ -19,84 +10,126 @@ $customFields = \Classes\BaseService::getInstance()->getCustomFields("Employee")
 ?><div class="span9">

 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
+        <?php if($user->user_level != "Admin"){
+        ?>
+		    <li class="active"><a id="tabEmployee" href="#tabPageEmployee"><?=t('Employees (Direct Reports)')?></a></li>
+        <?php }else{ ?>
            <li class="active"><a id="tabEmployee" href="#tabPageEmployee"><?=t('Employees')?></a></li>
+        <?php }?>
+
+        <?php if ($user->user_level == "Admin") { ?>
 		<li><a id="tabEmployeeSkill" href="#tabPageEmployeeSkill"><?=t('Skills')?></a></li>
 		<li><a id="tabEmployeeEducation" href="#tabPageEmployeeEducation"><?=t('Education')?></a></li>
 		<li><a id="tabEmployeeCertification" href="#tabPageEmployeeCertification"><?=t('Certifications')?></a></li>
 		<li><a id="tabEmployeeLanguage" href="#tabPageEmployeeLanguage"><?=t('Languages')?></a></li>
 		<li><a id="tabEmployeeDependent" href="#tabPageEmployeeDependent"><?=t('Dependents')?></a></li>
-		<li><a id="tabEmergencyContact" href="#tabPageEmergencyContact"><?=t('Contacts')?></a></li>
-        <li><a id="tabTerminatedEmployee" href="#tabPageTerminatedEmployee"><?=t('Deactivated')?></a></li>
-        <li><a id="tabArchivedEmployee" href="#tabPageArchivedEmployee"><?=t('Archived')?></a></li>
+		<li><a id="tabEmergencyContact" href="#tabPageEmergencyContact"><?=t('Emergency Contacts')?></a></li>
+            <?php if (class_exists('\\Documents\\Admin\\Api\\DocumentsAdminManager')) {?>
+                <li><a id="tabEmployeeDocument" href="#tabPageEmployeeDocument"><?=t('Documents')?></a></li>
+            <?php } ?>
+        <?php }?>
+        <?php if ($user->user_level == "Admin"){ ?>
+        <li class="dropdown">
+            <a href="#" id="terminatedEmployeeMenu" class="dropdown-toggle" data-toggle="dropdown" aria-controls="terminatedEmployeeMenu-contents"><?=t('Deactivated Employees')?> <span class="caret"></span></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="terminatedEmployeeMenu" id="terminatedEmployeeMenu-contents">
+                <li><a id="tabTerminatedEmployee" href="#tabPageTerminatedEmployee"><?=t('Temporarily Deactivated Employees')?></a></li>
+                <li><a id="tabArchivedEmployee" href="#tabPageArchivedEmployee"><?=t('Terminated Employee Data')?></a></li>
+            </ul>
+        </li>
+        <?php } ?>
+
 	</ul>

 	<div class="tab-content">
 		<div class="tab-pane active" id="tabPageEmployee">
-			<div id="EmployeeTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="EmployeeForm"></div>
-            <div id="EmployeeFilterForm"></div>
+			<div id="Employee" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="EmployeeForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPageEmployeeSkill">
-			<div id="EmployeeSkillTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-			<div id="EmployeeSkillForm"></div>
-			<div id="EmployeeSkillFilterForm"></div>
+			<div id="EmployeeSkill" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="EmployeeSkillForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPageEmployeeEducation">
-			<div id="EmployeeEducationTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="EmployeeEducationForm"></div>
-            <div id="EmployeeEducationFilterForm"></div>
+			<div id="EmployeeEducation" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="EmployeeEducationForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPageEmployeeCertification">
-			<div id="EmployeeCertificationTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="EmployeeCertificationForm"></div>
-            <div id="EmployeeCertificationFilterForm"></div>
+			<div id="EmployeeCertification" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="EmployeeCertificationForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPageEmployeeLanguage">
-			<div id="EmployeeLanguageTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="EmployeeLanguageForm"></div>
-            <div id="EmployeeLanguageFilterForm"></div>
+			<div id="EmployeeLanguage" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="EmployeeLanguageForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPageEmployeeDependent">
-			<div id="EmployeeDependentTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="EmployeeDependentForm"></div>
-            <div id="EmployeeDependentFilterForm"></div>
+			<div id="EmployeeDependent" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="EmployeeDependentForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPageEmergencyContact">
-			<div id="EmergencyContactTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="EmergencyContactForm"></div>
-            <div id="EmergencyContactFilterForm"></div>
+			<div id="EmergencyContact" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="EmergencyContactForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>

 		<div class="tab-pane" id="tabPageArchivedEmployee">
-			<div id="ArchivedEmployeeTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="ArchivedEmployeeForm"></div>
-            <div id="ArchivedEmployeeFilterForm"></div>
-		</div>
-		<div class="tab-pane" id="tabPageTerminatedEmployee">
-			<div id="TerminatedEmployeeTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="TerminatedEmployeeForm"></div>
-            <div id="TerminatedEmployeeFilterForm"></div>
+			<div id="ArchivedEmployee" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
 			</div>
+			<div id="ArchivedEmployeeForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">

 			</div>
 		</div>
-<div id="dataGroup"></div>
-<?php
-$moduleData = [
-    'user_level' => $user->user_level,
-    'customFields' => $customFields,
-    'permissions' => [
-        'Employee' => PermissionManager::checkGeneralAccess(new Employee()),
-        'EmployeeSkill' => PermissionManager::checkGeneralAccess(new EmployeeSkill()),
-        'EmployeeEducation' => PermissionManager::checkGeneralAccess(new EmployeeEducation()),
-        'EmployeeCertification' => PermissionManager::checkGeneralAccess(new EmployeeCertification()),
-        'EmployeeLanguage' => PermissionManager::checkGeneralAccess(new EmployeeLanguage()),
-        'EmployeeDependent' => PermissionManager::checkGeneralAccess(new EmployeeDependent()),
-        'EmergencyContact' => PermissionManager::checkGeneralAccess(new EmergencyContact()),
-    ]];
-?>
+		<div class="tab-pane" id="tabPageTerminatedEmployee">
+			<div id="TerminatedEmployee" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="TerminatedEmployeeForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
+		</div>
+        <?php if (class_exists('\\Documents\\Admin\\Api\\DocumentsAdminManager')) {?>
+            <div class="tab-pane" id="tabPageEmployeeDocument">
+                <div id="EmployeeDocument" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+                </div>
+                <div id="EmployeeDocumentForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+                </div>
+            </div>
+        <?php } ?>
+
+	</div>
+
+</div>
 <script>
-var modJsList = [];
+var modJsList = new Array();
 <?php if($user->user_level != "Admin"){ ?>
 modJsList['tabEmployee'] = new EmployeeAdapter('Employee','Employee',{"status":"Active"});
 modJsList['tabEmployee'].setShowAddNew(false);
@@ -104,12 +137,6 @@ modJsList['tabEmployee'].setShowDelete(false);
 <?php }else{ ?>
 modJsList['tabEmployee'] = new EmployeeAdapter('Employee','Employee',{"status":"Active"});
 <?php } ?>
-modJsList['tabEmployee'].setObjectTypeName('Employee');
-modJsList['tabEmployee'].setModalType(EmployeeAdapter.MODAL_TYPE_STEPS);
-modJsList['tabEmployee'].setDataPipe(new IceDataPipe(modJsList['tabEmployee']));
-modJsList['tabEmployee'].setAccess(<?=json_encode($moduleData['permissions']['Employee'])?>);
-modJsList['tabEmployee'].enableLocalStorage();
-$(document).ready(() => modJsList['tabEmployee'].initForm());

 modJsList['tabEmployee'].setRemoteTable(true);
 modJsList['tabEmployee'].setFieldNameMap(<?=json_encode($fieldNameMap)?>);
@@ -117,66 +144,45 @@ modJsList['tabEmployee'].setCustomFields(<?=json_encode($customFields)?>);

 modJsList['tabEmployeeSkill'] = new EmployeeSkillAdapter('EmployeeSkill');
 modJsList['tabEmployeeSkill'].setRemoteTable(true);
-modJsList['tabEmployeeSkill'].setObjectTypeName('Employee Skill');
-modJsList['tabEmployeeSkill'].setDataPipe(new IceDataPipe(modJsList['tabEmployeeSkill']));
-modJsList['tabEmployeeSkill'].setAccess(<?=json_encode($moduleData['permissions']['EmployeeSkill'])?>);

 modJsList['tabEmployeeEducation'] = new EmployeeEducationAdapter('EmployeeEducation');
 modJsList['tabEmployeeEducation'].setRemoteTable(true);
-modJsList['tabEmployeeEducation'].setObjectTypeName('Employee Education');
-modJsList['tabEmployeeEducation'].setDataPipe(new IceDataPipe(modJsList['tabEmployeeEducation']));
-modJsList['tabEmployeeEducation'].setAccess(<?=json_encode($moduleData['permissions']['EmployeeEducation'])?>);

 modJsList['tabEmployeeCertification'] = new EmployeeCertificationAdapter('EmployeeCertification');
 modJsList['tabEmployeeCertification'].setRemoteTable(true);
-modJsList['tabEmployeeCertification'].setObjectTypeName('Employee Certification');
-modJsList['tabEmployeeCertification'].setDataPipe(new IceDataPipe(modJsList['tabEmployeeCertification']));
-modJsList['tabEmployeeCertification'].setAccess(<?=json_encode($moduleData['permissions']['EmployeeCertification'])?>);

 modJsList['tabEmployeeLanguage'] = new EmployeeLanguageAdapter('EmployeeLanguage');
 modJsList['tabEmployeeLanguage'].setRemoteTable(true);
-modJsList['tabEmployeeLanguage'].setObjectTypeName('Employee Language');
-modJsList['tabEmployeeLanguage'].setDataPipe(new IceDataPipe(modJsList['tabEmployeeLanguage']));
-modJsList['tabEmployeeLanguage'].setAccess(<?=json_encode($moduleData['permissions']['EmployeeLanguage'])?>);

 modJsList['tabEmployeeDependent'] = new EmployeeDependentAdapter('EmployeeDependent');
 modJsList['tabEmployeeDependent'].setRemoteTable(true);
-modJsList['tabEmployeeDependent'].setObjectTypeName('Employee Dependent');
-modJsList['tabEmployeeDependent'].setDataPipe(new IceDataPipe(modJsList['tabEmployeeDependent']));
-modJsList['tabEmployeeDependent'].setAccess(<?=json_encode($moduleData['permissions']['EmployeeDependent'])?>);

 modJsList['tabEmergencyContact'] = new EmergencyContactAdapter('EmergencyContact');
 modJsList['tabEmergencyContact'].setRemoteTable(true);
-modJsList['tabEmergencyContact'].setObjectTypeName('Emergency Contact');
-modJsList['tabEmergencyContact'].setDataPipe(new IceDataPipe(modJsList['tabEmergencyContact']));
-modJsList['tabEmergencyContact'].setAccess(<?=json_encode($moduleData['permissions']['EmergencyContact'])?>);

-//modJsList['tabEmployeeImmigration'] = new EmployeeImmigrationAdapter('EmployeeImmigration');
-//modJsList['tabEmployeeImmigration'].setRemoteTable(true);
-//modJsList['tabEmployeeImmigration'].setObjectTypeName('Employee Dependent');
-//modJsList['tabEmployeeImmigration'].setDataPipe(new IceDataPipe(modJsList['tabEmployeeDependent']));
-//modJsList['tabEmployeeImmigration'].setAccess(<?//=json_encode($moduleData['permissions']['EmployeeDependent'])?>//);
+modJsList['tabEmployeeImmigration'] = new EmployeeImmigrationAdapter('EmployeeImmigration');
+modJsList['tabEmployeeImmigration'].setRemoteTable(true);

 modJsList['tabArchivedEmployee'] = new ArchivedEmployeeAdapter('ArchivedEmployee');
 modJsList['tabArchivedEmployee'].setRemoteTable(true);
 modJsList['tabArchivedEmployee'].setShowAddNew(false);
-modJsList['tabArchivedEmployee'].setShowEdit(false);
-modJsList['tabArchivedEmployee'].setObjectTypeName('Archived Employee');
-modJsList['tabArchivedEmployee'].setDataPipe(new IceDataPipe(modJsList['tabArchivedEmployee']));
-modJsList['tabArchivedEmployee'].setAccess(<?=json_encode($moduleData['permissions']['Employee'])?>);

 modJsList['tabTerminatedEmployee'] = new TerminatedEmployeeAdapter('Employee','TerminatedEmployee',{"status":"Terminated"});
 modJsList['tabTerminatedEmployee'].setRemoteTable(true);
 modJsList['tabTerminatedEmployee'].setShowAddNew(false);
-modJsList['tabTerminatedEmployee'].setShowEdit(false);
-modJsList['tabTerminatedEmployee'].setObjectTypeName('Deactivated Employees');
-modJsList['tabTerminatedEmployee'].setDataPipe(new IceDataPipe(modJsList['tabTerminatedEmployee']));
-modJsList['tabTerminatedEmployee'].setAccess(<?=json_encode($moduleData['permissions']['Employee'])?>);

+<?php if (class_exists('\\Documents\\Admin\\Api\\DocumentsAdminManager')) {?>
+modJsList['tabEmployeeDocument'] = new EmployeeDocumentAdapter('EmployeeDocument','EmployeeDocument');
+modJsList['tabTerminatedEmployee'].setRemoteTable(true);
+<?php } ?>

 var modJs = modJsList['tabEmployee'];

+
+
 </script>
+
+
 <div class="modal" id="createUserModel" tabindex="-1" role="dialog" aria-labelledby="messageModelLabel" aria-hidden="true">
    <div class="modal-dialog">
        <div class="modal-content">
--- a/core/admin/fieldnames/index.php
+++ b/core/admin/fieldnames/index.php
@@ -13,6 +13,7 @@ include APP_BASE_PATH.'modulejslibs.inc.php';

 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
        <li class="active"><a id="tabEmployeeFieldName" href="#tabPageEmployeeFieldName"><?=t('Employee Field Names')?></a></li>
+        <li><a id="tabEmployeeCustomField" href="#tabPageEmployeeCustomField"><?=t('Employee Custom Fields')?></a></li>
 	</ul>

 	<div class="tab-content">
@@ -24,17 +25,29 @@ include APP_BASE_PATH.'modulejslibs.inc.php';

            </div>
        </div>
+        <div class="tab-pane" id="tabPageEmployeeCustomField">
+            <div id="EmployeeCustomField" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+            </div>
+            <div id="EmployeeCustomFieldForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+            </div>
+        </div>
 	</div>

 </div>
 <script>
-var modJsList = [];
+var modJsList = new Array();

 modJsList['tabEmployeeFieldName'] = new FieldNameAdapter('FieldNameMapping','EmployeeFieldName',{"type":"Employee"});
 modJsList['tabEmployeeFieldName'].setRemoteTable(true);
 modJsList['tabEmployeeFieldName'].setShowDelete(false);
 modJsList['tabEmployeeFieldName'].setShowAddNew(false);

+modJsList['tabEmployeeCustomField'] = new CustomFieldAdapter('CustomField','EmployeeCustomField',{"type":"Employee"},"display_order desc");
+modJsList['tabEmployeeCustomField'].setRemoteTable(true);
+modJsList['tabEmployeeCustomField'].setTableType("Employee");
+

 var modJs = modJsList['tabEmployeeFieldName'];

--- a/core/admin/fieldnames/meta.json
+++ b/core/admin/fieldnames/meta.json
@@ -1,5 +1,5 @@
 {
-    "label": "Employee Fields",
+    "label": "Employee Custom Fields",
    "menu": "Admin",
    "order": "83",
    "icon": "fa-ruler-horizontal",
--- a/core/admin/jobs/index.php
+++ b/core/admin/jobs/index.php
@@ -3,12 +3,6 @@
 Copyright (c) 2018 [Glacies UG, Berlin, Germany] (http://glacies.de)
 Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
 */
-
-use Classes\PermissionManager;
-use Employees\Common\Model\EmploymentStatus;
-use Jobs\Common\Model\JobTitle;
-use Jobs\Common\Model\PayGrade;
-
 $moduleName = 'jobs';
 $moduleGroup = 'admin';
 define('MODULE_PATH',dirname(__FILE__));
@@ -17,42 +11,47 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 ?><div class="span9">

 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-		<li class="active"><a id="tabJobTitle" href="#tabPageJobTitles"><?=t('Job Titles')?></a></li>
-		<li><a id="tabPayGrade" href="#tabPagePayGrades"><?=t('Pay Grades')?></a></li>
+		<li class="active"><a id="tabJobTitles" href="#tabPageJobTitles"><?=t('Job Titles')?></a></li>
+		<li><a id="tabPayGrades" href="#tabPagePayGrades"><?=t('Pay Grades')?></a></li>
 		<li><a id="tabEmploymentStatus" href="#tabPageEmploymentStatus"><?=t('Employment Status')?></a></li>
 	</ul>

 	<div class="tab-content">
 		<div class="tab-pane active" id="tabPageJobTitles">
-			<div id="JobTitleTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="JobTitleForm"></div>
-            <div id="JobTitleFilterForm"></div>
+			<div id="JobTitle" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="JobTitleForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPagePayGrades">
-			<div id="PayGradeTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="PayGradeForm"></div>
-            <div id="PayGradeFilterForm"></div>
+			<div id="PayGrade" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="PayGradeForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPageEmploymentStatus">
-			<div id="EmploymentStatusTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="EmploymentStatusForm"></div>
-            <div id="EmploymentStatusFilterForm"></div>
+			<div id="EmploymentStatus" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="EmploymentStatusForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 	</div>

 </div>
-<div id="dataGroup"></div>
-<?php
-$moduleData = [
-    'user_level' => $user->user_level,
-    'permissions' => [
-        'JobTitle' => PermissionManager::checkGeneralAccess(new JobTitle()),
-        'PayGrade' => PermissionManager::checkGeneralAccess(new PayGrade()),
-        'EmploymentStatus' => PermissionManager::checkGeneralAccess(new EmploymentStatus()),
-    ]
-];
-?>
 <script>
-  initAdminJobs(<?=json_encode($moduleData)?>);
+var modJsList = new Array();
+
+modJsList['tabJobTitles'] = new JobTitleAdapter('JobTitle');
+modJsList['tabPayGrades'] = new PayGradeAdapter('PayGrade');
+modJsList['tabEmploymentStatus'] = new EmploymentStatusAdapter('EmploymentStatus');
+
+var modJs = modJsList['tabJobTitles'];
+
 </script>
 <?php include APP_BASE_PATH.'footer.php';?>
--- a/core/admin/overtime/meta.json
+++ b/core/admin/overtime/meta.json
@@ -1,5 +1,5 @@
 {
-    "label": "Overtime",
+    "label": "Overtime Administration",
    "menu": "Admin",
    "order": "82",
    "icon": "fa-align-center",
--- a/core/admin/payroll/index.php
+++ b/core/admin/payroll/index.php
@@ -11,11 +11,11 @@ include APP_BASE_PATH.'modulejslibs.inc.php';
 </style>
 <div class="span9">
    <ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-        <li class="active"><a id="tabPayrollEmployee" href="#tabPagePayrollEmployee"><?=t('Payroll Employees')?></a></li>
+        <li class="active"><a id="tabPayrollEmployee" href="#tabPagePayrollEmployee"><?=t('Company Payroll')?></a></li>
        <li class=""><a id="tabPayroll" href="#tabPagePayroll"><?=t('Payroll Reports')?></a></li>
        <li class=""><a id="tabPayrollColumn" href="#tabPagePayrollColumn"><?=t('Payroll Columns')?></a></li>
-        <li class=""><a id="tabDeductionGroup" href="#tabPageDeductionGroup"><?=t('Payroll Groups')?></a></li>
-        <li class=""><a id="tabDeduction" href="#tabPageDeduction"><?=t('Saved Calculations')?></a></li>
+        <li class=""><a id="tabDeductionGroup" href="#tabPageDeductionGroup"><?=t('Calculation Groups')?></a></li>
+        <li class=""><a id="tabDeduction" href="#tabPageDeduction"><?=t('Calculation Methods')?></a></li>
        <li class=""><a id="tabPayslipTemplate" href="#tabPagePayslipTemplate"><?=t('Payslip Templates')?></a></li>
    </ul>

--- a/core/admin/projects/index.php
+++ b/core/admin/projects/index.php
@@ -4,65 +4,94 @@
 Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
 */

-use Classes\PermissionManager;
-use Projects\Common\Model\Project;
-use Projects\Common\Model\EmployeeProject;
-
 $moduleName = 'projects';
 $moduleGroup = 'admin';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
-
 ?><div class="span9">

-
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
-        <li class="active"><a id="tabProject" href="#tabPageProject"><?= t('Projects') ?></a></li>
+		<li class="active"><a id="tabClient" href="#tabPageClient"><?=t('Clients')?></a></li>
+		<li><a id="tabProject" href="#tabPageProject"><?=t('Projects')?></a></li>
 		<li><a id="tabEmployeeProject" href="#tabPageEmployeeProject"><?=t('Employee Projects')?></a></li>
 	</ul>

 	<div class="tab-content">
-        <div class="tab-pane active" id="tabPageProject">
-            <div id="ProjectTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="ProjectForm"></div>
-            <div id="ProjectFilterForm"></div>
+		<div class="tab-pane active" id="tabPageClient">
+			<div id="Client" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="ClientForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
+		</div>
+		<div class="tab-pane" id="tabPageProject">
+			<div id="Project" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="ProjectForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPageEmployeeProject">
-            <div id="EmployeeProjectTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="EmployeeProjectForm"></div>
-            <div id="EmployeeProjectFilterForm"></div>
+			<div id="EmployeeProject" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="EmployeeProjectForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 	</div>

 </div>
-<?php
-$moduleData = [
-    'user_level' => $user->user_level,
-    'permissions' => [
-        'Project' => PermissionManager::checkGeneralAccess(new Project()),
-        'EmployeeProject' => PermissionManager::checkGeneralAccess(new EmployeeProject()),
-    ]
-];
-?>
 <script>
-  var modJsList = [];
-  var data = <?= json_encode($moduleData) ?>;
+var modJsList = new Array();
+
+modJsList['tabClient'] = new ClientAdapter('Client','Client');
+
+<?php if(isset($modulePermissions['perm']['Add Clients']) && $modulePermissions['perm']['Add Clients'] == "No"){?>
+modJsList['tabClient'].setShowAddNew(false);
+<?php }?>
+
+<?php if(isset($modulePermissions['perm']['Delete Clients']) && $modulePermissions['perm']['Delete Clients'] == "No"){?>
+modJsList['tabClient'].setShowDelete(false);
+<?php }?>
+
+<?php if(isset($modulePermissions['perm']['Edit Clients']) && $modulePermissions['perm']['Edit Clients'] == "No"){?>
+modJsList['tabClient'].setShowSave(false);
+<?php }?>
+
 modJsList['tabProject'] = new ProjectAdapter('Project','Project');
-  modJsList.tabProject.setObjectTypeName('Project');
-  modJsList.tabProject.setAccess(data.permissions.Project);
-  modJsList.tabProject.setDataPipe(new IceDataPipe(modJsList.tabProject));
-  modJsList.tabProject.setRemoteTable(true);
+
+<?php if(isset($modulePermissions['perm']['Add Projects']) && $modulePermissions['perm']['Add Projects'] == "No"){?>
+modJsList['tabProject'].setShowAddNew(false);
+<?php }?>
+
+<?php if(isset($modulePermissions['perm']['Delete Projects']) && $modulePermissions['perm']['Delete Projects'] == "No"){?>
+modJsList['tabProject'].setShowDelete(false);
+<?php }?>
+
+<?php if(isset($modulePermissions['perm']['Edit Projects']) && $modulePermissions['perm']['Edit Projects'] == "No"){?>
+modJsList['tabProject'].setShowSave(false);
+<?php }?>
+

 modJsList['tabEmployeeProject'] = new EmployeeProjectAdapter('EmployeeProject','EmployeeProject');
+modJsList['tabEmployeeProject'].setRemoteTable(true);
+
+<?php if(isset($modulePermissions['perm']['Add Projects']) && $modulePermissions['perm']['Add Projects'] == "No"){?>
+modJsList['tabEmployeeProject'].setShowAddNew(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Delete Projects']) && $modulePermissions['perm']['Delete Projects'] == "No"){?>
+modJsList['tabEmployeeProject'].setShowDelete(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Edit Projects']) && $modulePermissions['perm']['Edit Projects'] == "No"){?>
+modJsList['tabEmployeeProject'].setShowEdit(false);
+<?php }?>


-  modJsList.tabEmployeeProject.setObjectTypeName('Employee Project');
-  modJsList.tabEmployeeProject.setAccess(data.permissions.EmployeeProject);
-  modJsList.tabEmployeeProject.setDataPipe(new IceDataPipe(modJsList.tabEmployeeProject));
-  modJsList.tabEmployeeProject.setRemoteTable(true);
-
-  var modJs = modJsList['tabProject'];
+var modJs = modJsList['tabClient'];

 </script>
 <?php include APP_BASE_PATH.'footer.php';?>
--- a/core/admin/projects/meta.json
+++ b/core/admin/projects/meta.json
@@ -1,5 +1,5 @@
 {
-    "label": "Projects",
+    "label": "Projects\/Client Setup",
    "menu": "Admin",
    "order": "51",
    "icon": "fa-list-alt",
@@ -12,7 +12,10 @@
        "Manager": {
            "Add Projects": "Yes",
            "Edit Projects": "Yes",
-            "Delete Projects": "No"
+            "Delete Projects": "No",
+            "Add Clients": "Yes",
+            "Edit Clients": "Yes",
+            "Delete Clients": "No"
        }
    },
    "model_namespace": "\\Projects\\Common\\Model",
--- a/core/admin/qualifications/index.php
+++ b/core/admin/qualifications/index.php
@@ -4,12 +4,6 @@
 Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
 */

-use Classes\PermissionManager;
-use Qualifications\Common\Model\Certification;
-use Qualifications\Common\Model\Education;
-use Qualifications\Common\Model\Language;
-use Qualifications\Common\Model\Skill;
-
 $moduleName = 'qualifications';
 $moduleGroup = 'admin';
 define('MODULE_PATH',dirname(__FILE__));
@@ -26,40 +20,92 @@ include APP_BASE_PATH.'modulejslibs.inc.php';

 	<div class="tab-content">
 		<div class="tab-pane active" id="tabPageSkill">
-			<div id="SkillTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-			<div id="SkillForm"></div>
-			<div id="SkillFilterForm"></div>
+			<div id="Skill" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="SkillForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPageEducation">
-			<div id="EducationTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="EducationForm"></div>
-            <div id="EducationFilterForm"></div>
+			<div id="Education" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="EducationForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPageCertification">
-			<div id="CertificationTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="CertificationForm"></div>
-            <div id="CertificationFilterForm"></div>
+			<div id="Certification" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="CertificationForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
+			</div>
 		</div>
 		<div class="tab-pane" id="tabPageLanguage">
-			<div id="LanguageTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="LanguageForm"></div>
-            <div id="LanguageFilterForm"></div>
+			<div id="Language" class="reviewBlock" data-content="List" style="padding-left:5px;">
+
+			</div>
+			<div id="LanguageForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">
+
 			</div>
 		</div>
 	</div>
-<div id="dataGroup"></div>
-<?php
-$moduleData = [
-    'user_level' => $user->user_level,
-    'permissions' => [
-        'Skill' => PermissionManager::checkGeneralAccess(new Skill()),
-        'Education' => PermissionManager::checkGeneralAccess(new Education()),
-        'Certification' => PermissionManager::checkGeneralAccess(new Certification()),
-        'Language' => PermissionManager::checkGeneralAccess(new Language()),
-    ]
-];
-?>
+
+</div>
 <script>
-  initAdminQualifications(<?=json_encode($moduleData)?>);
+var modJsList = new Array();
+
+modJsList['tabSkill'] = new SkillAdapter('Skill');
+<?php if(isset($modulePermissions['perm']['Add Skills']) && $modulePermissions['perm']['Add Skills'] == "No"){?>
+modJsList['tabSkill'].setShowAddNew(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Delete Skills']) && $modulePermissions['perm']['Delete Skills'] == "No"){?>
+modJsList['tabSkill'].setShowDelete(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Edit Skills']) && $modulePermissions['perm']['Edit Skills'] == "No"){?>
+modJsList['tabSkill'].setShowEdit(false);
+<?php }?>
+
+
+modJsList['tabEducation'] = new EducationAdapter('Education');
+<?php if(isset($modulePermissions['perm']['Add Education']) && $modulePermissions['perm']['Add Education'] == "No"){?>
+modJsList['tabEducation'].setShowAddNew(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Delete Education']) && $modulePermissions['perm']['Delete Education'] == "No"){?>
+modJsList['tabEducation'].setShowDelete(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Edit Education']) && $modulePermissions['perm']['Edit Education'] == "No"){?>
+modJsList['tabEducation'].setShowEdit(false);
+<?php }?>
+
+
+
+modJsList['tabCertification'] = new CertificationAdapter('Certification');
+<?php if(isset($modulePermissions['perm']['Add Certifications']) && $modulePermissions['perm']['Add Certifications'] == "No"){?>
+modJsList['tabCertification'].setShowAddNew(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Delete Certifications']) && $modulePermissions['perm']['Delete Certifications'] == "No"){?>
+modJsList['tabCertification'].setShowDelete(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Edit Certifications']) && $modulePermissions['perm']['Edit Certifications'] == "No"){?>
+modJsList['tabCertification'].setShowEdit(false);
+<?php }?>
+
+
+modJsList['tabLanguage'] = new LanguageAdapter('Language');
+<?php if(isset($modulePermissions['perm']['Add Languages']) && $modulePermissions['perm']['Add Languages'] == "No"){?>
+modJsList['tabLanguage'].setShowAddNew(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Delete Languages']) && $modulePermissions['perm']['Delete Languages'] == "No"){?>
+modJsList['tabLanguage'].setShowDelete(false);
+<?php }?>
+<?php if(isset($modulePermissions['perm']['Edit Languages']) && $modulePermissions['perm']['Edit Languages'] == "No"){?>
+modJsList['tabLanguage'].setShowEdit(false);
+<?php }?>
+
+var modJs = modJsList['tabSkill'];
+
 </script>
 <?php include APP_BASE_PATH.'footer.php';?>
--- a/core/admin/settings/index.php
+++ b/core/admin/settings/index.php
@@ -4,62 +4,43 @@
 Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
 */

-use Classes\ModuleBuilder\ModuleBuilder;
-use Classes\ModuleBuilder\ModuleTab;
-use Classes\UIManager;
-
 $moduleName = 'settings';
 $moduleGroup = 'admin';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';

-$moduleBuilder = new ModuleBuilder();
+$moduleBuilder = new \Classes\ModuleBuilder\ModuleBuilder();

 $options1 = array();
 $options1['setShowAddNew'] = 'false';
-$options1['setRemoteTable'] = 'true';

-$notCloud = !defined('IS_CLOUD') || IS_CLOUD == false;
-
-$moduleBuilder->addModuleOrGroup(new ModuleTab(
-    'CompanySetting','Setting','Company','SettingAdapter','{"category":"Company"}','name',true,$options1
+$moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
+    'CompanySetting','Setting','Company','SettingAdapter','{"name":["Company:"]}','name',true,$options1
 ));
-$moduleBuilder->addModuleOrGroup(new ModuleTab(
-    'SystemSetting','Setting','System','SettingAdapter','{"category":"System"}','name',false,$options1
+$moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
+    'SystemSetting','Setting','System','SettingAdapter','{"name":["System:"]}','name',false,$options1
 ));
-if ( $notCloud ) {
-    $moduleBuilder->addModuleOrGroup(new ModuleTab(
-        'EmailSetting', 'Setting', 'Email', 'SettingAdapter', '{"category":"Email"}', 'name', false, $options1
+if (!defined('CLOUD_INSTALLATION')) {
+    $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
+        'EmailSetting', 'Setting', 'Email', 'SettingAdapter', '{"name":["Email:"]}', 'name', false, $options1
    ));
 }
-if(defined('LEAVE_ENABLED') && LEAVE_ENABLED == true) {
-    $moduleBuilder->addModuleOrGroup(new ModuleTab(
-        'LeaveSetting', 'Setting', 'Leave', 'SettingAdapter', '{"category":"Leave"}', 'name', false, $options1
+$moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
+    'LeaveSetting','Setting','Leave / PTO','SettingAdapter','{"name":["Leave:"]}','name',false,$options1
 ));
-}
-
-$moduleBuilder->addModuleOrGroup(new ModuleTab(
-    'AttendanceSetting','Setting','Attendance','SettingAdapter','{"category":"Attendance"}','name',false,$options1
-));
-
 if(!defined('LDAP_ENABLED') || LDAP_ENABLED == true){
-    $moduleBuilder->addModuleOrGroup(new ModuleTab(
-        'LDAPSetting','Setting','LDAP','SettingAdapter','{"category":"LDAP"}','name',false,$options1
+    $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
+        'LDAPSetting','Setting','LDAP','SettingAdapter','{"name":["LDAP:"]}','name',false,$options1
    ));
 }
-
-if(!defined('SAML_ENABLED') || SAML_ENABLED == true){
-    $moduleBuilder->addModuleOrGroup(new ModuleTab(
-        'SAMLSetting','Setting','SAML','SettingAdapter','{"category":"SAML"}','name',false,$options1
+$moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
+    'AttendanceSetting','Setting','Attendance','SettingAdapter','{"name":["Attendance:"]}','name',false,$options1
 ));
-}
-
-
-$moduleBuilder->addModuleOrGroup(new ModuleTab(
-    'OtherSetting','Setting','Other','SettingAdapter','{"category":["Projects","Recruitment","Notifications","Expense","Travel","Api","Overtime"]}','name',false,$options1
+$moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
+    'OtherSetting','Setting','Other','SettingAdapter','{"name":["Projects:","Recruitment:","Notifications:","Expense:","Travel:","Api:","Overtime:"]}','name',false,$options1
 ));
-echo UIManager::getInstance()->renderModule($moduleBuilder);
+echo \Classes\UIManager::getInstance()->renderModule($moduleBuilder);
 ?>
 </div>
 <script>
--- a/core/admin/travel/index.php
+++ b/core/admin/travel/index.php
@@ -31,6 +31,22 @@ $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
    $travelRequestOptions
 ));

+if ($user->user_level === 'Admin') {
+    $travelCustomFieldOptions = [];
+    $travelCustomFieldOptions['setRemoteTable'] = 'true';
+    $travelCustomFieldOptions['setTableType'] = '\'EmployeeTravelRecord\'';
+
+    $moduleBuilder->addModuleOrGroup(new \Classes\ModuleBuilder\ModuleTab(
+        'TravelCustomField',
+        'CustomField',
+        'Custom Fields',
+        'CustomFieldAdapter',
+        '{"type":"EmployeeTravelRecord"}',
+        '',
+        false,
+        $travelCustomFieldOptions
+    ));
+}

 echo \Classes\UIManager::getInstance()->renderModule($moduleBuilder);

--- a/core/admin/users/index.php
+++ b/core/admin/users/index.php
@@ -4,24 +4,15 @@
 Developer: Thilina Hasantha (http://lk.linkedin.com/in/thilinah | https://github.com/thilinah)
 */

-use Classes\PermissionManager;
-use Users\Common\Model\UserRole;
-
 $moduleName = 'users';
 $moduleGroup = 'admin';
 define('MODULE_PATH',dirname(__FILE__));
 include APP_BASE_PATH.'header.php';
 include APP_BASE_PATH.'modulejslibs.inc.php';
 $csrf = \Classes\BaseService::getInstance()->generateCsrf('User');
-$modelClasses = array_keys(\Classes\BaseService::getInstance()->getModelClassMap());
-$modelClasses = array_map(function($item) {
-    return [ $item, $item ];
-}, $modelClasses);
-
 ?><div class="span9">
 	<ul class="nav nav-tabs" id="modTab" style="margin-bottom:0px;margin-left:5px;border-bottom: none;">
 		<li class="active"><a id="tabUser" href="#tabPageUser"><?=t('Users')?></a></li>
-		<li class=""><a id="tabUserRole" href="#tabPageUserRole"><?=t('Users Roles')?></a></li>
 	</ul>

 	<div class="tab-content">
@@ -33,38 +24,26 @@ $modelClasses = array_map(function($item) {

 			</div>
 		</div>
-        <div class="tab-pane" id="tabPageUserRole">
-            <div id="UserRoleTable" class="reviewBlock" data-content="List" style="padding-left:5px;"></div>
-            <div id="UserRoleForm"></div>
-            <div id="UserRoleFilterForm"></div>
-        </div>
+<!--        <div class="tab-pane" id="tabPageUserRole">-->
+<!--            <div id="UserRole" class="reviewBlock" data-content="List" style="padding-left:5px;">-->
+<!---->
+<!--            </div>-->
+<!--            <div id="UserRoleForm" class="reviewBlock" data-content="Form" style="padding-left:5px;display:none;">-->
+<!---->
+<!--            </div>-->
+<!--        </div>-->
 	</div>

 </div>
-<div id="dataGroup"></div>
-<?php
-$moduleData = [
-    'user_level' => $user->user_level,
-    'permissions' => [
-        'UserRole' => PermissionManager::checkGeneralAccess(new UserRole()),
-    ]];
-?>
 <script>
-var modJsList = [];
+var modJsList = new Array();
 modJsList['tabUser'] = new UserAdapter('User');
 modJsList['tabUser'].setCSRFRequired(true);
-modJsList['tabUser'].setRemoteTable(true);;
 <?php if(isset($_GET['action']) && $_GET['action'] == "new" && isset($_GET['object'])){?>
 modJsList['tabUser'].newInitObject = JSON.parse(Base64.decode('<?=$_GET['object']?>'));
 <?php }?>
 modJsList['tabUserRole'] = new UserRoleAdapter('UserRole');
-modJsList['tabUserRole'].setTables(<?=json_encode($modelClasses)?>);
-modJsList['tabUserRole'].setObjectTypeName('User Role');
-modJsList['tabUserRole'].setDataPipe(new IceDataPipe(modJsList['tabUserRole']));
-modJsList['tabUserRole'].setAccess(<?=json_encode($moduleData['permissions']['UserRole'])?>);
 var modJs = modJsList['tabUser'];

 </script>
-<div id="UserRoleFormReact"></div>
-<div id="dataGroup"></div>
 <?php include APP_BASE_PATH.'footer.php';?>
--- a/core/api-rest.php
+++ b/core/api-rest.php
@@ -1,47 +0,0 @@
-<?php
-define('CLIENT_PATH',dirname(__FILE__));
-include ("config.base.php");
-include ("include.common.php");
-include("server.includes.inc.php");
-
-if(\Classes\SettingsManager::getInstance()->getSetting('Api: REST Api Enabled') == '1') {
-
-    if (defined('SYM_CLIENT')) {
-        define('REST_API_PATH', '/'.SYM_CLIENT.'/');
-    } else if (!defined('REST_API_PATH')){
-        define('REST_API_PATH', '/');
-    }
-
-
-    \Utils\LogManager::getInstance()->info("Request: " . $_REQUEST);
-
-    if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
-        http_response_code(200);
-        exit();
-    }
-
-    $echoRoute = \Classes\Macaw::get(REST_API_PATH . 'echo', function () {
-        echo "Echo " . rand();
-    });
-
-    \Utils\LogManager::getInstance()->debug('Api registered URI: '.$echoRoute);
-
-    $moduleManagers = \Classes\BaseService::getInstance()->getModuleManagers();
-
-    foreach ($moduleManagers as $moduleManagerObj) {
-
-        $moduleManagerObj->setupRestEndPoints();
-    }
-    $uri = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
-    $method = $_SERVER['REQUEST_METHOD'];
-    \Utils\LogManager::getInstance()->debug('Api dispatch URI: '.$uri);
-    \Utils\LogManager::getInstance()->debug('Api dispatch method: '.$uri);
-    if (!defined('SYM_CLIENT')) {
-        //For hosted installations, dispatch will be done in app/index
-        \Classes\Macaw::dispatch();
-    }
-
-
-}else{
-    echo "REST Api is not enabled. Please set 'Api: REST Api Enabled' setting to true";
-}
--- a/core/api-url-based.php
+++ b/core/api-url-based.php
@@ -1,39 +0,0 @@
-<?php
-define('CLIENT_PATH',dirname(__FILE__));
-include ("config.base.php");
-include ("include.common.php");
-include("server.includes.inc.php");
-
-if(\Classes\SettingsManager::getInstance()->getSetting('Api: REST Api Enabled') == '1') {
-
-    if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
-        http_response_code(200);
-        exit();
-    }
-
-    define('REST_API_PATH', '/');
-
-    $echoRoute = \Classes\Macaw::get(REST_API_PATH . 'echo', function () {
-        echo "Echo " . rand();
-    });
-
-    \Utils\LogManager::getInstance()->debug('Api registered URI: '.$echoRoute);
-
-    $moduleManagers = \Classes\BaseService::getInstance()->getModuleManagers();
-
-    foreach ($moduleManagers as $moduleManagerObj) {
-
-        $moduleManagerObj->setupRestEndPoints();
-    }
-    $method = $_SERVER['REQUEST_METHOD'];
-    if (strtoupper($method) === 'GET') {
-        \Classes\IceRoute::dispatch($_GET['url'], $method);
-    } else {
-        $method = strtoupper($_REQUEST['method']);
-        \Classes\IceRoute::dispatch($_REQUEST['url'], $method);
-    }
-
-
-}else{
-    echo "REST Api is not enabled. Please set 'Api: REST Api Enabled' setting to true";
-}
--- a/core/config.base.php
+++ b/core/config.base.php
@@ -13,13 +13,14 @@ if(!defined('HOME_LINK_OTHERS')){
 }

 //Version
-define('VERSION', '29.0.0.OS');
-define('CACHE_VALUE', '29.0.0.OS.2020-04021509');
-define('VERSION_NUMBER', '290000');
-define('VERSION_DATE', '02/04/2021');
+define('VERSION', '26.6.0.OS');
+define('CACHE_VALUE', '26.6.0.OS');
+define('VERSION_NUMBER', '2660');
+define('VERSION_DATE', '23/07/2019');

 if(!defined('CONTACT_EMAIL')){define('CONTACT_EMAIL','icehrm@gamonoid.com');}
 if(!defined('KEY_PREFIX')){define('KEY_PREFIX','IceHrm');}
+if(!defined('APP_SEC')){define('APP_SEC','dbcs234d2saaqw');}

 define('UI_SHOW_SWITCH_PROFILE', true);
 define('CRON_LOG', ini_get('error_log'));
@@ -32,13 +33,6 @@ if(!defined('WK_HTML_PATH')){
 }
 define('ALL_CLIENT_BASE_PATH', '/var/www/icehrm.app/icehrmapp/');

-define('IS_CLOUD', false);
 define('LDAP_ENABLED', true);
-define('SAML_ENABLED', true);
-define('LEAVE_ENABLED', true);
 define('RECRUITMENT_ENABLED', false);
 define('APP_WEB_URL', 'https://icehrm.com');
-
-if (!defined('EXTENSIONS_URL')) {
-    define('EXTENSIONS_URL', str_replace('/web/', '/extensions/', BASE_URL));
-}
--- a/core/crons/cron.php
+++ b/core/crons/cron.php
@@ -5,15 +5,15 @@ $cron = new \Model\Cron();
 $crons = $cron->Find("status = ?",array('Enabled'));

 if(!$crons){
-    \Utils\LogManager::getInstance()->error(CLIENT_NAME." error :".$cron->ErrorMsg());
+    \Utils\LogManager::getInstance()->info(CLIENT_NAME." error :".$cron->ErrorMsg());
 }

-\Utils\LogManager::getInstance()->debug(CLIENT_NAME." cron count :".count($crons));
+\Utils\LogManager::getInstance()->info(CLIENT_NAME." cron count :".count($crons));
 foreach($crons as $cron){
    $iceCron = new \Classes\Cron\IceCron($cron);
-    \Utils\LogManager::getInstance()->debug(CLIENT_NAME." check cron :".$cron->name);
+    \Utils\LogManager::getInstance()->info(CLIENT_NAME." check cron :".$cron->name);
    if($iceCron->isRunNow()){
-        \Utils\LogManager::getInstance()->debug(CLIENT_NAME." execute cron :".$cron->name);
+        \Utils\LogManager::getInstance()->info(CLIENT_NAME." execute cron :".$cron->name);
        $iceCron->execute();
    }
 }
--- a/core/data.php
+++ b/core/data.php
@@ -17,14 +17,6 @@ $_REQUEST['sm'] = \Classes\BaseService::getInstance()->fixJSON($_REQUEST['sm']);
 $_REQUEST['cl'] = \Classes\BaseService::getInstance()->fixJSON($_REQUEST['cl']);
 $_REQUEST['ft'] = \Classes\BaseService::getInstance()->fixJSON($_REQUEST['ft']);

-// Domain aware input cleanup
-$cleaner = new \Classes\DomainAwareInputCleaner();
-$_REQUEST['t'] = $cleaner->cleanTableColumn($_REQUEST['t']);
-$_REQUEST['ft'] = $cleaner->cleanFilters($_REQUEST['ft']);
-$_REQUEST['ob'] = $cleaner->cleanOrderBy($_REQUEST['ob']);
-$_REQUEST['sSearch'] = $cleaner->cleanSearch($_REQUEST['sSearch']);
-$_REQUEST['cl'] = $cleaner->cleanColumns($_REQUEST['cl']);
-
 $columns = json_decode($_REQUEST['cl'], true);
 $columns[] = "id";
 $table = $_REQUEST['t'];
@@ -192,30 +184,8 @@ if (isset($rowCount) && !empty($rowCount)) {
 /*
 * Output
 */
-if (isset($_REQUEST['version']) && $_REQUEST['version'] === 'v2') {
-    $output = [
-        "totalRecords" => $totalRows,
-        "totalDisplayRecords" => $totalRows,
-        "objects" => []
-    ];

-    foreach ($data as $item) {
-        $row = new stdClass();
-        $colCount = count($columns);
-        for ($i = 0; $i < $colCount; $i++) {
-            $row->{$columns[$i]} = $item->{$columns[$i]};
-        }
-        $output['objects'][] = $row;
-    }
-
-    try {
-        echo \Classes\BaseService::getInstance()->safeJsonEncode($output);
-    } catch (Exception $e) {
-        \Utils\LogManager::getInstance()->error($e->getMessage());
-        \Utils\LogManager::getInstance()->notifyException($e);
-        echo json_encode(['status' => 'Error']);
-    }
-}else if (!isset($_REQUEST['objects'])) {
+if (!isset($_REQUEST['objects'])) {
    $output = array(
        "sEcho" => intval($_REQUEST['sEcho']),
        "iTotalRecords" => $totalRows,
@@ -237,7 +207,6 @@ if (isset($_REQUEST['version']) && $_REQUEST['version'] === 'v2') {
        echo \Classes\BaseService::getInstance()->safeJsonEncode($output);
    } catch (Exception $e) {
        \Utils\LogManager::getInstance()->error($e->getMessage());
-        \Utils\LogManager::getInstance()->notifyException($e);
        echo json_encode(['status' => 'Error']);
    }
 } else {
--- a/core/entry_footer.php
+++ b/core/entry_footer.php
@@ -15,12 +15,15 @@
 				modJsList[prop].setEmailTemplates(<?=json_encode($emailTemplates)?>);
 				<?php } ?>
 				modJsList[prop].setUser(<?=json_encode($user)?>);
-                //modJsList[prop].initFieldMasterData(null, modJs.loadingFunction);
-                modJsList[prop].initMasterDataReader();
-                modJsList[prop].masterDataReader.updateAllMasterData()
-                    .then(() => {
-                      modJs.loadingFunction();
-                    });
+                <?php if(isset($_REQUEST['action']) && $_REQUEST['action'] == "new"){?>
+                if(modJsList[prop].newInitObject == undefined || modJsList[prop].newInitObject == null){
+                    modJsList[prop].initFieldMasterData(null,modJsList[prop].renderForm);
+                }else{
+                    modJsList[prop].initFieldMasterData(null,modJsList[prop].renderForm, modJsList[prop].newInitObject);
+                }
+                <?php }else{?>
+                modJsList[prop].initFieldMasterData(null, modJs.loadingFunction);
+                <?php }?>
 				modJsList[prop].setBaseUrl('<?=BASE_URL?>');
 				modJsList[prop].setCurrentProfile(<?=json_encode($activeProfile)?>);
 				modJsList[prop].setInstanceId('<?=$baseService->getInstanceId()?>');
--- a/core/entry_header.php
+++ b/core/entry_header.php
@@ -39,7 +39,7 @@ $logoFileUrl = \Classes\UIManager::getInstance()->getCompanyLogoUrl();
        <script src="<?=BASE_URL?>js/bootstrap-datetimepicker.js"></script>
        <link href="<?=BASE_URL?>bower_components/flag-icon-css/css/flag-icon.min.css" rel="stylesheet">
        <!-- Can not bundle - End-->
-        <?php include 'modulejslibs.inc.php'; ?>
+        <script type="text/javascript" src="<?=BASE_URL.'admin/dist/candidates.js'?>?v=<?=$jsVersion?>"></script>
        <script>
          var baseUrl = '<?=CLIENT_BASE_URL?>service.php';
          var CLIENT_BASE_URL = '<?=CLIENT_BASE_URL?>';
--- a/core/fileupload.php
+++ b/core/fileupload.php
@@ -78,8 +78,8 @@ class qqFileUploader {
        }

        $size = $this->file->getSize();
-        \Utils\LogManager::getInstance()->debug('file size ='.$size);
-        \Utils\LogManager::getInstance()->debug('file size limit ='.$this->sizeLimit);
+        \Utils\LogManager::getInstance()->info('file size ='.$size);
+        \Utils\LogManager::getInstance()->info('file size limit ='.$this->sizeLimit);
        if ($size == 0) {
            return array('success'=>0,'error' => 'File is empty');
        }
@@ -127,6 +127,9 @@ if(empty($saveFileName) || $saveFileName == "_NEW_"){
    $saveFileName = str_replace(".", "-", $saveFileName);
 }

+$file = new \Model\File();
+$file->Load("name = ?",array($saveFileName));
+
 // list of valid extensions, ex. array("jpeg", "xml", "bmp")

 $allowedExtensions = explode(',', "csv,doc,xls,docx,xlsx,txt,ppt,pptx,rtf,pdf,xml,jpg,bmp,gif,png,jpeg");
@@ -139,13 +142,16 @@ $result = $uploader->handleUpload(CLIENT_BASE_PATH.'data/',$saveFileName);
 $uploadFilesToS3 = \Classes\SettingsManager::getInstance()->getSetting("Files: Upload Files to S3");
 $uploadFilesToS3Key = \Classes\SettingsManager::getInstance()->getSetting("Files: Amazon S3 Key for File Upload");
 $uploadFilesToS3Secret = \Classes\SettingsManager::getInstance()->getSetting(
-    "Files: Amazon S3 Secret for File Upload"
+    "Files: Amazone S3 Secret for File Upload"
 );
 $s3Bucket = \Classes\SettingsManager::getInstance()->getSetting("Files: S3 Bucket");
 $s3WebUrl = \Classes\SettingsManager::getInstance()->getSetting("Files: S3 Web Url");

 $uploadedToS3 = false;

+\Utils\LogManager::getInstance()->info(
+    $uploadFilesToS3."|".$uploadFilesToS3Key."|".$uploadFilesToS3Secret."|".$s3Bucket."|".$s3WebUrl."|".CLIENT_NAME
+);
 $localFile = CLIENT_BASE_PATH.'data/'.$result['filename'];
 $f_size = filesize($localFile);
 if($uploadFilesToS3.'' == '1' && !empty($uploadFilesToS3Key) && !empty($uploadFilesToS3Secret) &&
@@ -153,9 +159,9 @@ if($uploadFilesToS3.'' == '1' && !empty($uploadFilesToS3Key) && !empty($uploadFi


    $uploadname = CLIENT_NAME."/".$result['filename'];
-    \Utils\LogManager::getInstance()->debug("Upload file to s3:".$uploadname);
-    \Utils\LogManager::getInstance()->debug("Local file:".$localFile);
-    \Utils\LogManager::getInstance()->debug("Local file size:".$f_size);
+    \Utils\LogManager::getInstance()->info("Upload file to s3:".$uploadname);
+    \Utils\LogManager::getInstance()->info("Local file:".$localFile);
+    \Utils\LogManager::getInstance()->info("Local file size:".$f_size);


    $s3FileSys = new \Classes\S3FileSystem($uploadFilesToS3Key, $uploadFilesToS3Secret);
@@ -170,17 +176,10 @@ if($uploadFilesToS3.'' == '1' && !empty($uploadFilesToS3Key) && !empty($uploadFi
 }

 if($result['success'] == 1){
-    if ($_POST['file_group'] === 'profile_image' && !empty($_POST['user'])) {
-        \Classes\FileService::getInstance()->deleteProfileImage(intval($_POST['user']));
-    }
-
-    $file = new \Model\File();
-    $file->Load("name = ?",array($saveFileName));
    $file->name = $saveFileName;
    $file->filename = $result['filename'];
    $signInMappingField = SIGN_IN_ELEMENT_MAPPING_FIELD_NAME;
    $file->$signInMappingField = $_POST['user']=="_NONE_"?null:$_POST['user'];
-
    $file->file_group = $_POST['file_group'];
    $file->size = $f_size;
    $file->size_text = \Classes\FileService::getInstance()->getReadableSize($f_size);
@@ -188,7 +187,7 @@ if($result['success'] == 1){
    if($uploadedToS3){
        $result['data'] = $file_url;
    }else{
-        $result['data'] = \Classes\FileService::getInstance()->getLocalSecureUrl($result['filename']);
+        $result['data'] = CLIENT_BASE_URL.'data/'.$result['filename'];
    }
    $result['data'] .= "|".$saveFileName;
    $result['data'] .= "|".$file->id;
--- a/core/fileupload_page.php
+++ b/core/fileupload_page.php
@@ -22,8 +22,7 @@ if($_REQUEST['file_type']=="image"){
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<script type="text/javascript" src="<?=BASE_URL?>js/jquery.js"></script>
-<script type="text/javascript" src="<?=BASE_URL?>js/jquery.form.js"></script>
+<script type="text/javascript" src="<?=BASE_URL?>js/jquery-1.5.2.js"></script>
 <script type="text/javascript" src="<?=BASE_URL?>js/date.js"></script>
 <script type="text/javascript" src="<?=BASE_URL?>js/json2.js"></script>

--- a/core/footer.php
+++ b/core/footer.php
@@ -16,13 +16,26 @@
 				modJsList[prop].setEmailTemplates(<?=json_encode($emailTemplates)?>);
 				<?php } ?>
 				modJsList[prop].setUser(<?=json_encode(\Classes\BaseService::getInstance()->cleanUpUser($user))?>);
-                modJsList[prop].initSourceMappings();
+                <?php if(isset($_REQUEST['action']) && $_REQUEST['action'] == "new"){?>
+                if(modJsList[prop].newInitObject == undefined || modJsList[prop].newInitObject == null){
+                    modJsList[prop].initFieldMasterData(null,modJsList[prop].renderForm);
+                }else{
+                    modJsList[prop].initFieldMasterData(null,modJsList[prop].renderForm, modJsList[prop].newInitObject);
+                }
+                <?php }else{ ?>
+				if(modJsList[prop].initialFilter != null && modJsList[prop].initialFilter != undefined){
+					modJsList[prop].initFieldMasterData(null,modJsList[prop].setFilterExternal);
+				}else{
+					modJsList[prop].initFieldMasterData();
+				}
+
+                <?php } ?>
 				modJsList[prop].setBaseUrl('<?=BASE_URL?>');
-				modJsList[prop].setClientUrl('<?=CLIENT_BASE_URL?>');
 				modJsList[prop].setCurrentProfile(<?=json_encode($activeProfile)?>);
 				modJsList[prop].setInstanceId('<?=\Classes\BaseService::getInstance()->getInstanceId()?>');
 				modJsList[prop].setGoogleAnalytics(ga);
 				modJsList[prop].setNoJSONRequests('<?=\Classes\SettingsManager::getInstance()->getSetting("System: Do not pass JSON in request")?>');
+
 			}

 	    }
@@ -51,16 +64,7 @@
 				$(this).tab('show');
 				modJs = modJsList[$(this).attr('id')];
 				modJs.get([]);
-
-                // Do not load master data for new types of tables
-				if (!modJs.isV2) {
-                  if(modJs.initialFilter != null){
-                    modJs.initFieldMasterData(null,modJs.setFilterExternal);
-                  } else {
                modJs.initFieldMasterData();
-                  }
-                }
-
 				var helpLink = modJs.getHelpLink();
 				if(helpLink != null && helpLink != undefined){
 					$('.helpLink').attr('href',helpLink);
@@ -68,12 +72,8 @@
 				}else{
 					$('.helpLink').hide();
 				}
-			});

-			for (var modName in modJsList) {
-              modJsList[modName].setApiUrl('<?=$restApiBase?>');
-              modJsList[modName].setupApiClient($('#jt').attr('t'));
-            }
+			});

 			var tabName = window.location.hash.substr(1);

@@ -85,6 +85,7 @@
                <?php } ?>
 			}

+
 			notificationManager.getNotifications();

 			$("#delegationDiv").on('click', "#notifications", function(e) {
@@ -103,18 +104,7 @@
 				$('.helpLink').hide();
 			}

-          $(this).scrollTop(0);
-
 		});
-
-        if (!modJs.isV2) {
-          if(modJs.initialFilter != null){
-            modJs.initFieldMasterData(null,modJs.setFilterExternal);
-          } else {
-            modJs.initFieldMasterData();
-          }
-        }
-
 		var clientUrl = '<?=CLIENT_BASE_URL?>';

        var modulesInstalled = <?=json_encode(\Classes\BaseService::getInstance()->getModuleManagerNames())?>;
@@ -147,10 +137,8 @@


 	</script>
-	<?php
-        include 'popups.php';
-    ?>
+	<?php include 'popups.php';?>
    <script src="<?=BASE_URL?>js/bootstrap-datatable.js"></script>
-    <div id="jt" t="<?=$jwtService->create(3600)?>"></div>
+
    </body>
 </html>
--- a/core/header.php
+++ b/core/header.php
@@ -70,14 +70,6 @@ include('configureUIManager.php');

 $chatUserProfile = \Classes\UIManager::getInstance()->getCurrentProfile();

-if (defined('SYM_CLIENT')) {
-    $restApiBase = WEB_APP_BASE_URL.'/api/'.SYM_CLIENT.'/';
-} else if (defined('REST_API_BASE')){
-    $restApiBase = REST_API_BASE;
-} else {
-    $restApiBase = CLIENT_BASE_URL.'api/';
-}
-
 ?><!DOCTYPE html>
 <html>
 <head>
@@ -166,7 +158,7 @@ if (defined('SYM_CLIENT')) {
            <ul class="sidebar-menu">


-                <?php if($user->user_level == 'Admin' || $user->user_level == 'Manager' || $user->user_level == 'Restricted Admin' || $user->user_level == 'Restricted Manager'){?>
+                <?php if($user->user_level == 'Admin' || $user->user_level == 'Manager' || $user->user_level == 'Other'){?>

                    <?php foreach($adminModules as $menu){?>
                        <?php if(count($menu['menu']) == 0){continue;}?>
@@ -215,26 +207,6 @@ if (defined('SYM_CLIENT')) {

                <?php }?>

-                <?php foreach($extensions as $menu){?>
-                    <?php if(count($menu['menu']) == 0){continue;}?>
-                    <li  class="treeview" ref="<?="extension_".str_replace(" ", "_", $menu['name'])?>">
-                        <a href="#">
-                            <i class="fa <?=!isset($mainIcons[$menu['name']])?"fa-th":$mainIcons[$menu['name']];?>"></i></i> <span><?=\Classes\LanguageManager::tran($menu['name'])?></span>
-                            <i class="fa fa-angle-left pull-right"></i>
-                        </a>
-
-                        <ul class="treeview-menu" id="<?="extension_".str_replace(" ", "_", $menu['name'])?>">
-                            <?php foreach ($menu['menu'] as $item){?>
-                                <li>
-                                    <a data-turbolinks="true" href="<?=CLIENT_BASE_URL?>?g=extension&n=<?=$item['name']?>&m=<?="extension_".str_replace(" ", "_", $menu['name'])?>">
-                                        <i class="fa <?=!isset($item['icon'])?"fa-angle-double-right":$item['icon']?>"></i> <?=\Classes\LanguageManager::tran($item['label'])?>
-                                    </a>
-                                </li>
-                            <?php }?>
-                        </ul>
-                    </li>
-                <?php }?>
-
                <?php
                if(file_exists(CLIENT_PATH.'/third_party_meta.json')){
                    $tpModules = json_decode(file_get_contents(CLIENT_PATH.'/third_party_meta.json'),true);
@@ -277,6 +249,19 @@ if (defined('SYM_CLIENT')) {

    <!-- Right side column. Contains the navbar and content of the page -->
    <aside class="right-side">
+        <!-- Content Header (Page header) -->
+        <section class="content-header">
+            <h1>
+                <?=\Classes\LanguageManager::tran($meta['label'])?>
+                <small>
+                    <?=\Classes\LanguageManager::tran($meta['menu'])?>&nbsp;&nbsp
+                </small>
+            </h1>
+            <a href="#" class="helpLink" target="_blank"
+               style="display:none;color:#f4f4f4;font-size: 2.3rem;float: right;margin-top: -30px;text-shadow: 1px 1px 2px black, 0 0 25px #367fa9, 0 0 5px #367fa9;">
+                <i class="fa fa-question-circle"></i></a>
+        </section>
+
        <!-- Main content -->
        <section class="content">

--- a/core/include.common.php
+++ b/core/include.common.php
@@ -1,9 +1,4 @@
 <?php
-
-use Classes\Common\IceContainer;
-use Classes\LanguageManager;
-use Utils\InputCleaner;
-
 ini_set('display_errors', false);
 error_reporting(E_ERROR);
 require dirname(__FILE__).'/lib/composer/vendor/autoload.php';
@@ -13,11 +8,9 @@ require dirname(__FILE__).'/lib/composer/vendor/autoload.php';
 //$whoops->pushHandler(new \Whoops\Handler\PrettyPageHandler());
 //$whoops->register();

-$container = new IceContainer();
-
 function t($text)
 {
-	return LanguageManager::translateTnrText($text);
+	return \Classes\LanguageManager::translateTnrText($text);
 }

 if(!defined('TAGS_TO_PRESERVE')){define('TAGS_TO_PRESERVE','');}
@@ -25,9 +18,9 @@ $jsVersion = defined('CACHE_VALUE')?CACHE_VALUE:"v".VERSION;
 $cssVersion = defined('CACHE_VALUE')?CACHE_VALUE:"v".VERSION;

 if(!isset($_REQUEST['content']) || $_REQUEST['content'] != 'HTML'){
-    $_REQUEST = InputCleaner::cleanParameters($_REQUEST);
-    $_GET = InputCleaner::cleanParameters($_GET);
-    $_POST = InputCleaner::cleanParameters($_POST);
+    $_REQUEST = \Utils\InputCleaner::cleanParameters($_REQUEST);
+    $_GET = \Utils\InputCleaner::cleanParameters($_GET);
+    $_POST = \Utils\InputCleaner::cleanParameters($_POST);
 }

 date_default_timezone_set('Asia/Colombo');
--- a/core/includes.inc.php
+++ b/core/includes.inc.php
@@ -55,7 +55,6 @@ $fieldTemplates['colorpick'] = file_get_contents(CLIENT_PATH.'/templates/fields/
 $fieldTemplates['signature'] = file_get_contents(CLIENT_PATH.'/templates/fields/signature.html');
 $fieldTemplates['simplemde'] = file_get_contents(CLIENT_PATH.'/templates/fields/simplemde.html');
 $fieldTemplates['tinymce'] = file_get_contents(CLIENT_PATH.'/templates/fields/tinymce.html');
-$fieldTemplates['code'] = file_get_contents(CLIENT_PATH.'/templates/fields/code.html');

 $templates = array();
 $templates['formTemplate'] = file_get_contents(CLIENT_PATH.'/templates/form_template.html');
--- a/core/lang/al.po
+++ b/core/lang/al.po
--- a/core/lang/ar.po
+++ b/core/lang/ar.po
@@ -1960,30 +1960,3 @@ msgstr "تقديم التغذية الراجعة"

 msgid "Review Status"
 msgstr "مراجعة الحالة"
-
-msgid "Payroll Employees"
-msgstr "موظفي الرواتب"
-
-msgid "Payroll Groups"
-msgstr "مجموعات الرواتب"
-
-msgid "Saved Calculations"
-msgstr "الحسابات المحفوظة"
-
-msgid "Total Leave Days"
-msgstr "إجمالي أيام الإجازة"
-
-msgid "Actions"
-msgstr "أجراءات"
-
-msgid "Edit"
-msgstr "تعديل"
-
-msgid "View"
-msgstr "رأي"
-
-msgid "Delete"
-msgstr "حذف"
-
-msgid "Copy"
-msgstr "نسخ"
--- a/core/lang/de.po
+++ b/core/lang/de.po
@@ -1960,30 +1960,3 @@ msgstr "Rückmeldung geben"

 msgid "Review Status"
 msgstr "Überprüfen Sie den Status"
-
-msgid "Payroll Employees"
-msgstr "Mitarbeiter der Gehaltsabrechnung"
-
-msgid "Payroll Groups"
-msgstr "Gehaltsabrechnungs-Gruppen"
-
-msgid "Saved Calculations"
-msgstr "Gespeicherte Berechnungen"
-
-msgid "Total Leave Days"
-msgstr "Gesamturlaubstage"
-
-msgid "Actions"
-msgstr "Aktionen"
-
-msgid "Edit"
-msgstr "Bearbeiten"
-
-msgid "View"
-msgstr "Siehe"
-
-msgid "Delete"
-msgstr "Löschen"
-
-msgid "Copy"
-msgstr "Kopie"
--- a/core/lang/en.po
+++ b/core/lang/en.po
@@ -1960,30 +1960,3 @@ msgstr "Provide Feedback"

 msgid "Review Status"
 msgstr "Review Status"
-
-msgid "Payroll Employees"
-msgstr "Payroll Employees"
-
-msgid "Payroll Groups"
-msgstr "Payroll Groups"
-
-msgid "Saved Calculations"
-msgstr "Saved Calculations"
-
-msgid "Total Leave Days"
-msgstr "Total Leave Days"
-
-msgid "Actions"
-msgstr "Actions"
-
-msgid "Edit"
-msgstr "Edit"
-
-msgid "View"
-msgstr "View"
-
-msgid "Delete"
-msgstr "Delete"
-
-msgid "Copy"
-msgstr "Copy"
--- a/core/lang/es.po
+++ b/core/lang/es.po
@@ -1960,30 +1960,3 @@ msgstr "Suministre realimentación"

 msgid "Review Status"
 msgstr "Estado de revisión"
-
-msgid "Payroll Employees"
-msgstr "Empleados de la nómina"
-
-msgid "Payroll Groups"
-msgstr "Grupos de Nómina"
-
-msgid "Saved Calculations"
-msgstr "Cálculos guardados"
-
-msgid "Total Leave Days"
-msgstr "Total de días de permiso"
-
-msgid "Actions"
-msgstr "Acciones"
-
-msgid "Edit"
-msgstr "Edita"
-
-msgid "View"
-msgstr "Vea"
-
-msgid "Delete"
-msgstr "Eliminar"
-
-msgid "Copy"
-msgstr "Copia"
--- a/core/lang/fi.po
+++ b/core/lang/fi.po
@@ -1960,30 +1960,3 @@ msgstr "Antaa palautetta"

 msgid "Review Status"
 msgstr "Tarkista tila"
-
-msgid "Payroll Employees"
-msgstr "Palkanlaskennan työntekijät"
-
-msgid "Payroll Groups"
-msgstr "Palkanlaskentaryhmät"
-
-msgid "Saved Calculations"
-msgstr "Tallennetut laskelmat"
-
-msgid "Total Leave Days"
-msgstr "Kokonaislomapäivät"
-
-msgid "Actions"
-msgstr "Toiminnot"
-
-msgid "Edit"
-msgstr "Muokata"
-
-msgid "View"
-msgstr "Näytä"
-
-msgid "Delete"
-msgstr "Poistaa"
-
-msgid "Copy"
-msgstr "Kopio"
--- a/core/lang/fr.po
+++ b/core/lang/fr.po
@@ -1960,30 +1960,3 @@ msgstr "Fournir une réponse"

 msgid "Review Status"
 msgstr "Statut de la révision"
-
-msgid "Payroll Employees"
-msgstr "Salariés"
-
-msgid "Payroll Groups"
-msgstr "Groupes de paie"
-
-msgid "Saved Calculations"
-msgstr "Calculs sauvegardés"
-
-msgid "Total Leave Days"
-msgstr "Nombre total de jours de congé"
-
-msgid "Actions"
-msgstr "Actions"
-
-msgid "Edit"
-msgstr "Edit"
-
-msgid "View"
-msgstr "Voir"
-
-msgid "Delete"
-msgstr "Supprimer"
-
-msgid "Copy"
-msgstr "Copie"
--- a/core/lang/it.po
+++ b/core/lang/it.po
@@ -1960,30 +1960,3 @@ msgstr "Fornire un feedback"

 msgid "Review Status"
 msgstr "Verifica lo stato"
-
-msgid "Payroll Employees"
-msgstr "Personale dipendente"
-
-msgid "Payroll Groups"
-msgstr "Gruppi di lavoro"
-
-msgid "Saved Calculations"
-msgstr "Calcoli salvati"
-
-msgid "Total Leave Days"
-msgstr "Giorni di congedo totali"
-
-msgid "Actions"
-msgstr "Azioni"
-
-msgid "Edit"
-msgstr "Modifica"
-
-msgid "View"
-msgstr "Vedi"
-
-msgid "Delete"
-msgstr "Cancellare"
-
-msgid "Copy"
-msgstr "Copia"
--- a/core/lang/ja.po
+++ b/core/lang/ja.po
@@ -1960,30 +1960,3 @@ msgstr "フィードバックを提供します"

 msgid "Review Status"
 msgstr "審査ステータス"
-
-msgid "Payroll Employees"
-msgstr "給与計算従業員"
-
-msgid "Payroll Groups"
-msgstr "給与グループ"
-
-msgid "Saved Calculations"
-msgstr "保存された計算"
-
-msgid "Total Leave Days"
-msgstr "総休暇日数"
-
-msgid "Actions"
-msgstr "行動"
-
-msgid "Edit"
-msgstr "編集"
-
-msgid "View"
-msgstr "見る"
-
-msgid "Delete"
-msgstr "削除"
-
-msgid "Copy"
-msgstr "コピー"
--- a/core/lang/nl.po
+++ b/core/lang/nl.po
@@ -1960,30 +1960,3 @@ msgstr "Geef feedback"

 msgid "Review Status"
 msgstr "Status bekijken"
-
-msgid "Payroll Employees"
-msgstr "Loonlijstwerknemers"
-
-msgid "Payroll Groups"
-msgstr "Salarisgroepen"
-
-msgid "Saved Calculations"
-msgstr "Opgeslagen berekeningen"
-
-msgid "Total Leave Days"
-msgstr "Totaal aantal verlofdagen"
-
-msgid "Actions"
-msgstr "Acties"
-
-msgid "Edit"
-msgstr "Bewerk"
-
-msgid "View"
-msgstr "Bekijk"
-
-msgid "Delete"
-msgstr "Verwijder"
-
-msgid "Copy"
-msgstr "Kopieer"
--- a/core/lang/no.po
+++ b/core/lang/no.po
@@ -1960,30 +1960,3 @@ msgstr "Gi tilbakemelding"

 msgid "Review Status"
 msgstr "Review Status"
-
-msgid "Payroll Employees"
-msgstr "Lønnsansatte"
-
-msgid "Payroll Groups"
-msgstr "Lønnsgrupper"
-
-msgid "Saved Calculations"
-msgstr "Lagrede beregninger"
-
-msgid "Total Leave Days"
-msgstr "Totalt permisjonsdager"
-
-msgid "Actions"
-msgstr "Handlinger"
-
-msgid "Edit"
-msgstr "Redigere"
-
-msgid "View"
-msgstr "Utsikt"
-
-msgid "Delete"
-msgstr "Slett"
-
-msgid "Copy"
-msgstr "Kopiere"
--- a/core/lang/pl.po
+++ b/core/lang/pl.po
@@ -1960,30 +1960,3 @@ msgstr "Przekazać opinię"

 msgid "Review Status"
 msgstr "Status recenzji"
-
-msgid "Payroll Employees"
-msgstr "Lista płac Pracownicy"
-
-msgid "Payroll Groups"
-msgstr "Grupy płacowe"
-
-msgid "Saved Calculations"
-msgstr "Zaoszczędzone obliczenia"
-
-msgid "Total Leave Days"
-msgstr "Łącznie Dni Urlopu"
-
-msgid "Actions"
-msgstr "Działania"
-
-msgid "Edit"
-msgstr "Edycja"
-
-msgid "View"
-msgstr "Widok"
-
-msgid "Delete"
-msgstr "Skreślić"
-
-msgid "Copy"
-msgstr "Kopia"
--- a/core/lang/pt.po
+++ b/core/lang/pt.po
@@ -1960,30 +1960,3 @@ msgstr "Dar uma resposta"

 msgid "Review Status"
 msgstr "Status de revisão"
-
-msgid "Payroll Employees"
-msgstr "Folha de pagamento Colaboradores"
-
-msgid "Payroll Groups"
-msgstr "Grupos de folhas de pagamento"
-
-msgid "Saved Calculations"
-msgstr "Cálculos economizados"
-
-msgid "Total Leave Days"
-msgstr "Total de dias de férias"
-
-msgid "Actions"
-msgstr "Acções"
-
-msgid "Edit"
-msgstr "Editar"
-
-msgid "View"
-msgstr "Ver"
-
-msgid "Delete"
-msgstr "Eliminar"
-
-msgid "Copy"
-msgstr "Cópia"
--- a/core/lang/sr.po
+++ b/core/lang/sr.po
@@ -1960,30 +1960,3 @@ msgstr "Дају повратне информације"

 msgid "Review Status"
 msgstr "Статус прегледа"
-
-msgid "Payroll Employees"
-msgstr "Запослени са платним списковима"
-
-msgid "Payroll Groups"
-msgstr "Платне групе"
-
-msgid "Saved Calculations"
-msgstr "Сачуване калкулације"
-
-msgid "Total Leave Days"
-msgstr "Укупни дани одмора"
-
-msgid "Actions"
-msgstr "Акције"
-
-msgid "Edit"
-msgstr "Уредити"
-
-msgid "View"
-msgstr "Поглед"
-
-msgid "Delete"
-msgstr "Избриши"
-
-msgid "Copy"
-msgstr "Копирај"
--- a/core/lang/sv.po
+++ b/core/lang/sv.po
@@ -1960,30 +1960,3 @@ msgstr "Ge feedback"

 msgid "Review Status"
 msgstr "Granska status"
-
-msgid "Payroll Employees"
-msgstr "Löneanställda"
-
-msgid "Payroll Groups"
-msgstr "Lönegrupper"
-
-msgid "Saved Calculations"
-msgstr "Sparade beräkningar"
-
-msgid "Total Leave Days"
-msgstr "Totalt ledighet dagar"
-
-msgid "Actions"
-msgstr "Insatser"
-
-msgid "Edit"
-msgstr "Redigera"
-
-msgid "View"
-msgstr "Se"
-
-msgid "Delete"
-msgstr "Radera"
-
-msgid "Copy"
-msgstr "Kopiera"
--- a/core/lang/zh.po
+++ b/core/lang/zh.po
@@ -1960,30 +1960,3 @@ msgstr "提供反馈信息"

 msgid "Review Status"
 msgstr "审核状态"
-
-msgid "Payroll Employees"
-msgstr "薪资员工"
-
-msgid "Payroll Groups"
-msgstr "工资组"
-
-msgid "Saved Calculations"
-msgstr "保存的计算"
-
-msgid "Total Leave Days"
-msgstr "休假总天数"
-
-msgid "Actions"
-msgstr "动作"
-
-msgid "Edit"
-msgstr "编辑"
-
-msgid "View"
-msgstr "视图"
-
-msgid "Delete"
-msgstr "删除"
-
-msgid "Copy"
-msgstr "复制"
--- a/core/lib/composer/composer.json
+++ b/core/lib/composer/composer.json
@@ -1,11 +1,4 @@
 {
-    "config": {
-      "bin-dir": "../../../bin",
-      "process-timeout": 500,
-      "platform": {
-        "php": "7.0"
-      }
-    },
 	"require": {
    	"monolog/monolog": "^1.23",
        "twig/twig": "1.23.*",
@@ -18,19 +11,10 @@
 		"spomky-labs/base64url": "^1.0",
 		"cebe/markdown": "^1.2",
 		"neitanod/forceutf8": "^2.0",
-		"google/apiclient": "^2.2",
-		"predis/predis": "^1.1",
-        "firebase/php-jwt": "^5.2",
-        "pimple/pimple": "^3.2"
+		"google/apiclient": "^2.2"
    },
    "require-dev": {
-      "phpunit/phpunit": "~6",
-      "pdepend/pdepend": "2.5.*",
-      "phploc/phploc": "4.0.*",
-      "phpmd/phpmd": "2.3.*",
-      "sebastian/phpcpd": "1.4.*",
-      "mayflower/php-codebrowser": "~1.1",
-      "squizlabs/php_codesniffer": "2.*"
+      "phpunit/phpunit": "~6"
 	},
    "autoload": {
      "psr-4": {
--- a/core/lib/composer/composer.lock
+++ b/core/lib/composer/composer.lock
--- a/core/lib/composer/vendor/autoload.php
+++ b/core/lib/composer/vendor/autoload.php
@@ -4,4 +4,4 @@

 require_once __DIR__ . '/composer/autoload_real.php';

-return ComposerAutoloaderInit5bce11e11de2274869867527dbd4b40e::getLoader();
+return ComposerAutoloaderInit6d4a28cd96a5bc5d5b97781c062572d9::getLoader();
--- a/core/lib/composer/vendor/bin/export-plural-rules
+++ b/core/lib/composer/vendor/bin/export-plural-rules
@@ -0,0 +1,4 @@
+#!/usr/bin/env php
+<?php
+
+include 'export-plural-rules.php';
--- a/core/lib/composer/vendor/bin/export-plural-rules.php
+++ b/core/lib/composer/vendor/bin/export-plural-rules.php
@@ -0,0 +1,234 @@
+<?php
+use Gettext\Languages\Exporter\Exporter;
+use Gettext\Languages\Language;
+
+// Let's start by imposing that we don't accept any error or warning.
+// This is a really life-saving approach.
+error_reporting(E_ALL);
+set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+    Enviro::echoErr("$errstr\nFile: $errfile\nLine: $errline\nCode: $errno\n");
+    die(5);
+});
+
+require_once dirname(__DIR__).'/src/autoloader.php';
+
+// Parse the command line options
+Enviro::initialize();
+
+try {
+    if (isset(Enviro::$languages)) {
+        $languages = array();
+        foreach (Enviro::$languages as $languageId) {
+            $language = Language::getById($languageId);
+            if (!isset($language)) {
+                throw new Exception("Unable to find the language with id '$languageId'");
+            }
+            $languages[] = $language;
+        }
+    } else {
+        $languages = Language::getAll();
+    }
+    if (Enviro::$reduce) {
+        $languages = Enviro::reduce($languages);
+    }
+    if (isset(Enviro::$outputFilename)) {
+        echo call_user_func(array(Exporter::getExporterClassName(Enviro::$outputFormat), 'toFile'), $languages, Enviro::$outputFilename, array('us-ascii' => Enviro::$outputUSAscii));
+    } else {
+        echo call_user_func(array(Exporter::getExporterClassName(Enviro::$outputFormat), 'toString'), $languages, array('us-ascii' => Enviro::$outputUSAscii));
+    }
+} catch (Exception $x) {
+    Enviro::echoErr($x->getMessage()."\n");
+    Enviro::echoErr("Trace:\n");
+    Enviro::echoErr($x->getTraceAsString()."\n");
+    die(4);
+}
+
+die(0);
+
+/**
+ * Helper class to handle command line options.
+ */
+class Enviro
+{
+    /**
+     * Shall the output contain only US-ASCII characters?
+     * @var bool
+     */
+    public static $outputUSAscii;
+    /**
+     * The output format.
+     * @var string
+     */
+    public static $outputFormat;
+    /**
+     * Output file name.
+     * @var string
+     */
+    public static $outputFilename;
+    /**
+     * List of wanted language IDs; it not set: all languages will be returned.
+     * @var array|null
+     */
+    public static $languages;
+    /**
+     * Reduce the language list to the minimum common denominator.
+     * @var bool
+     */
+    public static $reduce;
+    /**
+     * Parse the command line options.
+     */
+    public static function initialize()
+    {
+        global $argv;
+        self::$outputUSAscii = false;
+        self::$outputFormat = null;
+        self::$outputFilename = null;
+        self::$languages = null;
+        self::$reduce = null;
+        $exporters = Exporter::getExporters();
+        if (isset($argv) && is_array($argv)) {
+            foreach ($argv as $argi => $arg) {
+                if ($argi === 0) {
+                    continue;
+                }
+                if (is_string($arg)) {
+                    $argLC = trim(strtolower($arg));
+                    switch ($argLC) {
+                        case '--us-ascii':
+                            self::$outputUSAscii = true;
+                            break;
+                        case '--reduce=yes':
+                            self::$reduce = true;
+                            break;
+                        case '--reduce=no':
+                            self::$reduce = false;
+                            break;
+                        default:
+                            if (preg_match('/^--output=.+$/', $argLC)) {
+                                if (isset(self::$outputFilename)) {
+                                    self::echoErr("The output file name has been specified more than once!\n");
+                                    self::showSyntax();
+                                    die(3);
+                                }
+                                list(, self::$outputFilename) = explode('=', $arg, 2);
+                                self::$outputFilename = trim(self::$outputFilename);
+                            } elseif (preg_match('/^--languages?=.+$/', $argLC)) {
+                                list(, $s) = explode('=', $arg, 2);
+                                $list = explode(',', $s);
+                                if (is_array(self::$languages)) {
+                                    self::$languages = array_merge(self::$languages, $list);
+                                } else {
+                                    self::$languages = $list;
+                                }
+                            } elseif (isset($exporters[$argLC])) {
+                                if (isset(self::$outputFormat)) {
+                                    self::echoErr("The output format has been specified more than once!\n");
+                                    self::showSyntax();
+                                    die(3);
+                                }
+                                self::$outputFormat = $argLC;
+                            } else {
+                                self::echoErr("Unknown option: $arg\n");
+                                self::showSyntax();
+                                die(2);
+                            }
+                            break;
+                    }
+                }
+            }
+        }
+        if (!isset(self::$outputFormat)) {
+            self::showSyntax();
+            die(1);
+        }
+        if (isset(self::$languages)) {
+            self::$languages = array_values(array_unique(self::$languages));
+        }
+        if (!isset(self::$reduce)) {
+            self::$reduce = isset(self::$languages) ? false : true;
+        }
+    }
+
+    /**
+     * Write out the syntax.
+     */
+    public static function showSyntax()
+    {
+        $exporters = array_keys(Exporter::getExporters(true));
+        self::echoErr("Syntax: php ".basename(__FILE__)." [--us-ascii] [--languages=<LanguageId>[,<LanguageId>,...]] [--reduce=yes|no] [--output=<file name>] <".implode('|', $exporters).">\n");
+        self::echoErr("Where:\n");
+        self::echoErr("--us-ascii : if specified, the output will contain only US-ASCII characters.\n");
+        self::echoErr("--languages: (or --language) export only the specified language codes.\n");
+        self::echoErr("             Separate languages with commas; you can also use this argument\n");
+        self::echoErr("             more than once; it's case insensitive and accepts both '_' and\n");
+        self::echoErr("             '-' as locale chunks separator (eg we accept 'it_IT' as well as\n");
+        self::echoErr("            'it-it').\n");
+        self::echoErr("--reduce   : if set to yes the output won't contain languages with the same\n");
+        self::echoErr("             base language and rules.\n For instance nl_BE ('Flemish') will be\n");
+        self::echoErr("             omitted because it's the same as nl ('Dutch').\n");
+        self::echoErr("             Defaults to 'no' --languages is specified, to 'yes' otherwise.\n");
+        self::echoErr("--output   : if specified, the output will be saved to <file name>. If not\n");
+        self::echoErr("             specified we'll output to standard output.\n");
+        self::echoErr("Output formats\n");
+        $len = max(array_map('strlen', $exporters));
+        foreach ($exporters as $exporter) {
+            self::echoErr(str_pad($exporter, $len).": ".Exporter::getExporterDescription($exporter)."\n");
+        }
+    }
+    /**
+     * Print a string to stderr.
+     * @param string $str The string to be printed out.
+     */
+    public static function echoErr($str)
+    {
+        $hStdErr = @fopen('php://stderr', 'a');
+        if ($hStdErr === false) {
+            echo $str;
+        } else {
+            fwrite($hStdErr, $str);
+            fclose($hStdErr);
+        }
+    }
+    /**
+     * Reduce a language list to the minimum common denominator.
+     * @param Language[] $languages
+     * @return Language[]
+     */
+    public static function reduce($languages)
+    {
+        for ($numChunks = 3; $numChunks >= 2; $numChunks--) {
+            $filtered = array();
+            foreach ($languages as $language) {
+                $chunks = explode('_', $language->id);
+                $compatibleFound = false;
+                if (count($chunks) === $numChunks) {
+                    $categoriesHash = serialize($language->categories);
+                    $otherIds = array();
+                    $otherIds[] = $chunks[0];
+                    for ($k = 2; $k < $numChunks; $k++) {
+                        $otherIds[] = $chunks[0].'_'.$chunks[$numChunks - 1];
+                    }
+
+                    foreach ($languages as $check) {
+                        foreach ($otherIds as $otherId) {
+                            if (($check->id === $otherId) && ($check->formula === $language->formula) && (serialize($check->categories) === $categoriesHash)) {
+                                $compatibleFound = true;
+                                break;
+                            }
+                        }
+                        if ($compatibleFound === true) {
+                            break;
+                        }
+                    }
+                }
+                if (!$compatibleFound) {
+                    $filtered[] = $language;
+                }
+            }
+            $languages = $filtered;
+        }
+
+        return $languages;
+    }
+}
--- a/core/lib/composer/vendor/bin/markdown
+++ b/core/lib/composer/vendor/bin/markdown
@@ -0,0 +1,170 @@
+#!/usr/bin/env php
+<?php
+/**
+ * @copyright Copyright (c) 2014 Carsten Brandt
+ * @license https://github.com/cebe/markdown/blob/master/LICENSE
+ * @link https://github.com/cebe/markdown#readme
+ */
+
+$composerAutoload = [
+	__DIR__ . '/../vendor/autoload.php', // standalone with "composer install" run
+	__DIR__ . '/../../../autoload.php',  // script is installed as a composer binary
+];
+foreach ($composerAutoload as $autoload) {
+	if (file_exists($autoload)) {
+		require($autoload);
+		break;
+	}
+}
+
+// Send all errors to stderr
+ini_set('display_errors', 'stderr');
+
+$flavor = 'cebe\\markdown\\Markdown';
+$flavors = [
+	'gfm'   => ['cebe\\markdown\\GithubMarkdown', __DIR__ . '/../GithubMarkdown.php'],
+	'extra' => ['cebe\\markdown\\MarkdownExtra',  __DIR__ . '/../MarkdownExtra.php'],
+];
+
+$full = false;
+$src = [];
+foreach($argv as $k => $arg) {
+	if ($k == 0) {
+		continue;
+	}
+	if ($arg[0] == '-') {
+		$arg = explode('=', $arg);
+		switch($arg[0]) {
+			case '--flavor':
+				if (isset($arg[1])) {
+					if (isset($flavors[$arg[1]])) {
+						require($flavors[$arg[1]][1]);
+						$flavor = $flavors[$arg[1]][0];
+					} else {
+						error("Unknown flavor: " . $arg[1], "usage");
+					}
+				} else {
+					error("Incomplete argument --flavor!", "usage");
+				}
+			break;
+			case '--full':
+				$full = true;
+			break;
+			case '-h':
+			case '--help':
+				echo "PHP Markdown to HTML converter\n";
+				echo "------------------------------\n\n";
+				echo "by Carsten Brandt <mail@cebe.cc>\n\n";
+				usage();
+			break;
+			default:
+				error("Unknown argument " . $arg[0], "usage");
+		}
+	} else {
+		$src[] = $arg;
+	}
+}
+
+if (empty($src)) {
+	$markdown = file_get_contents("php://stdin");
+} elseif (count($src) == 1) {
+	$file = reset($src);
+	if (!file_exists($file)) {
+		error("File does not exist:" . $file);
+	}
+	$markdown = file_get_contents($file);
+} else {
+	error("Converting multiple files is not yet supported.", "usage");
+}
+
+/** @var cebe\markdown\Parser $md */
+$md = new $flavor();
+$markup = $md->parse($markdown);
+
+if ($full) {
+	echo <<<HTML
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8">
+	<style>
+		body { font-family: Arial, sans-serif; }
+		code { background: #eeeeff; padding: 2px; }
+		li { margin-bottom: 5px; }
+		img { max-width: 1200px; }
+		table, td, th { border: solid 1px #ccc; border-collapse: collapse; }
+	</style>
+</head>
+<body>
+$markup
+</body>
+</html>
+HTML;
+} else {
+	echo $markup;
+}
+
+// functions
+
+/**
+ * Display usage information
+ */
+function usage() {
+	global $argv;
+	$cmd = $argv[0];
+	echo <<<EOF
+Usage:
+    $cmd [--flavor=<flavor>] [--full] [file.md]
+
+    --flavor  specifies the markdown flavor to use. If omitted the original markdown by John Gruber [1] will be used.
+              Available flavors:
+
+              gfm   - Github flavored markdown [2]
+              extra - Markdown Extra [3]
+
+    --full    ouput a full HTML page with head and body. If not given, only the parsed markdown will be output.
+
+    --help    shows this usage information.
+
+    If no file is specified input will be read from STDIN.
+
+Examples:
+
+    Render a file with original markdown:
+
+        $cmd README.md > README.html
+
+    Render a file using gihtub flavored markdown:
+
+        $cmd --flavor=gfm README.md > README.html
+
+    Convert the original markdown description to html using STDIN:
+
+        curl http://daringfireball.net/projects/markdown/syntax.text | $cmd > md.html
+
+
+[1] http://daringfireball.net/projects/markdown/syntax
+[2] https://help.github.com/articles/github-flavored-markdown
+[3] http://michelf.ca/projects/php-markdown/extra/
+
+EOF;
+	exit(1);
+}
+
+/**
+ * Send custom error message to stderr
+ * @param $message string
+ * @param $callback mixed called before script exit
+ * @return void
+ */
+function error($message, $callback = null) {
+	$fe = fopen("php://stderr", "w");
+	fwrite($fe, "Error: " . $message . "\n");
+
+	if (is_callable($callback)) {
+		call_user_func($callback);
+	}
+
+	exit(1);
+}
--- a/core/lib/composer/vendor/bin/phpunit
+++ b/core/lib/composer/vendor/bin/phpunit
@@ -0,0 +1,53 @@
+#!/usr/bin/env php
+<?php
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+if (version_compare('7.0.0', PHP_VERSION, '>')) {
+    fwrite(
+        STDERR,
+        sprintf(
+            'This version of PHPUnit is supported on PHP 7.0 and PHP 7.1.' . PHP_EOL .
+            'You are using PHP %s (%s).' . PHP_EOL,
+            PHP_VERSION,
+            PHP_BINARY
+        )
+    );
+
+    die(1);
+}
+
+if (!ini_get('date.timezone')) {
+    ini_set('date.timezone', 'UTC');
+}
+
+foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
+    if (file_exists($file)) {
+        define('PHPUNIT_COMPOSER_INSTALL', $file);
+
+        break;
+    }
+}
+
+unset($file);
+
+if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
+    fwrite(
+        STDERR,
+        'You need to set up the project dependencies using Composer:' . PHP_EOL . PHP_EOL .
+        '    composer install' . PHP_EOL . PHP_EOL .
+        'You can learn all about Composer on https://getcomposer.org/.' . PHP_EOL
+    );
+
+    die(1);
+}
+
+require PHPUNIT_COMPOSER_INSTALL;
+
+PHPUnit\TextUI\Command::main();
--- a/core/lib/composer/vendor/bin/robo
+++ b/core/lib/composer/vendor/bin/robo
@@ -0,0 +1,22 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * if we're running from phar load the phar autoload,
+ * else let the script 'robo' search for the autoloader
+ */
+if (strpos(basename(__FILE__), 'phar')) {
+    require_once 'phar://robo.phar/vendor/autoload.php';
+} else {
+    if (file_exists(__DIR__.'/vendor/autoload.php')) {
+        require_once __DIR__.'/vendor/autoload.php';
+    } elseif (file_exists(__DIR__.'/../../autoload.php')) {
+        require_once __DIR__ . '/../../autoload.php';
+    } else {
+        require_once 'phar://robo.phar/vendor/autoload.php';
+    }
+}
+$runner = new \Robo\Runner();
+$runner->setSelfUpdateRepository('consolidation/robo');
+$statusCode = $runner->execute($_SERVER['argv']);
+exit($statusCode);
--- a/core/lib/composer/vendor/composer/autoload_classmap.php
+++ b/core/lib/composer/vendor/composer/autoload_classmap.php
@@ -6,113 +6,11 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);

 return array(
-    'ArithmeticError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/ArithmeticError.php',
-    'AssertionError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/AssertionError.php',
-    'DivisionByZeroError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php',
-    'Error' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/Error.php',
    'File_Iterator' => $vendorDir . '/phpunit/php-file-iterator/src/Iterator.php',
    'File_Iterator_Facade' => $vendorDir . '/phpunit/php-file-iterator/src/Facade.php',
    'File_Iterator_Factory' => $vendorDir . '/phpunit/php-file-iterator/src/Factory.php',
-    'Generic_Sniffs_Arrays_DisallowLongArraySyntaxSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Arrays/DisallowLongArraySyntaxSniff.php',
-    'Generic_Sniffs_Arrays_DisallowShortArraySyntaxSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Arrays/DisallowShortArraySyntaxSniff.php',
-    'Generic_Sniffs_Classes_DuplicateClassNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
-    'Generic_Sniffs_Classes_OpeningBraceSameLineSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Classes/OpeningBraceSameLineSniff.php',
-    'Generic_Sniffs_CodeAnalysis_EmptyStatementSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php',
-    'Generic_Sniffs_CodeAnalysis_ForLoopShouldBeWhileLoopSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php',
-    'Generic_Sniffs_CodeAnalysis_ForLoopWithTestFunctionCallSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php',
-    'Generic_Sniffs_CodeAnalysis_JumbledIncrementerSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php',
-    'Generic_Sniffs_CodeAnalysis_UnconditionalIfStatementSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php',
-    'Generic_Sniffs_CodeAnalysis_UnnecessaryFinalModifierSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php',
-    'Generic_Sniffs_CodeAnalysis_UnusedFunctionParameterSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php',
-    'Generic_Sniffs_CodeAnalysis_UselessOverridingMethodSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php',
-    'Generic_Sniffs_Commenting_DocCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Commenting/DocCommentSniff.php',
-    'Generic_Sniffs_Commenting_FixmeSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Commenting/FixmeSniff.php',
-    'Generic_Sniffs_Commenting_TodoSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Commenting/TodoSniff.php',
-    'Generic_Sniffs_ControlStructures_InlineControlStructureSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php',
-    'Generic_Sniffs_Debug_CSSLintSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Debug/CSSLintSniff.php',
-    'Generic_Sniffs_Debug_ClosureLinterSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Debug/ClosureLinterSniff.php',
-    'Generic_Sniffs_Debug_ESLintSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Debug/ESLintSniff.php',
-    'Generic_Sniffs_Debug_JSHintSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Debug/JSHintSniff.php',
-    'Generic_Sniffs_Files_ByteOrderMarkSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/ByteOrderMarkSniff.php',
-    'Generic_Sniffs_Files_EndFileNewlineSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/EndFileNewlineSniff.php',
-    'Generic_Sniffs_Files_EndFileNoNewlineSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/EndFileNoNewlineSniff.php',
-    'Generic_Sniffs_Files_InlineHTMLSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/InlineHTMLSniff.php',
-    'Generic_Sniffs_Files_LineEndingsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/LineEndingsSniff.php',
-    'Generic_Sniffs_Files_LineLengthSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/LineLengthSniff.php',
-    'Generic_Sniffs_Files_LowercasedFilenameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/LowercasedFilenameSniff.php',
-    'Generic_Sniffs_Files_OneClassPerFileSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/OneClassPerFileSniff.php',
-    'Generic_Sniffs_Files_OneInterfacePerFileSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/OneInterfacePerFileSniff.php',
-    'Generic_Sniffs_Files_OneTraitPerFileSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Files/OneTraitPerFileSniff.php',
-    'Generic_Sniffs_Formatting_DisallowMultipleStatementsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php',
-    'Generic_Sniffs_Formatting_MultipleStatementAlignmentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php',
-    'Generic_Sniffs_Formatting_NoSpaceAfterCastSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/NoSpaceAfterCastSniff.php',
-    'Generic_Sniffs_Formatting_SpaceAfterCastSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/SpaceAfterCastSniff.php',
-    'Generic_Sniffs_Formatting_SpaceAfterNotSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Formatting/SpaceAfterNotSniff.php',
-    'Generic_Sniffs_Functions_CallTimePassByReferenceSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/CallTimePassByReferenceSniff.php',
-    'Generic_Sniffs_Functions_FunctionCallArgumentSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php',
-    'Generic_Sniffs_Functions_OpeningFunctionBraceBsdAllmanSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php',
-    'Generic_Sniffs_Functions_OpeningFunctionBraceKernighanRitchieSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php',
-    'Generic_Sniffs_Metrics_CyclomaticComplexitySniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php',
-    'Generic_Sniffs_Metrics_NestingLevelSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Metrics/NestingLevelSniff.php',
-    'Generic_Sniffs_NamingConventions_CamelCapsFunctionNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/CamelCapsFunctionNameSniff.php',
-    'Generic_Sniffs_NamingConventions_ConstructorNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/ConstructorNameSniff.php',
-    'Generic_Sniffs_NamingConventions_UpperCaseConstantNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php',
-    'Generic_Sniffs_PHP_BacktickOperatorSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/BacktickOperatorSniff.php',
-    'Generic_Sniffs_PHP_CharacterBeforePHPOpeningTagSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/CharacterBeforePHPOpeningTagSniff.php',
-    'Generic_Sniffs_PHP_ClosingPHPTagSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/ClosingPHPTagSniff.php',
-    'Generic_Sniffs_PHP_DeprecatedFunctionsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/DeprecatedFunctionsSniff.php',
-    'Generic_Sniffs_PHP_DisallowAlternativePHPTagsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php',
-    'Generic_Sniffs_PHP_DisallowShortOpenTagSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php',
-    'Generic_Sniffs_PHP_ForbiddenFunctionsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php',
-    'Generic_Sniffs_PHP_LowerCaseConstantSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/LowerCaseConstantSniff.php',
-    'Generic_Sniffs_PHP_LowerCaseKeywordSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/LowerCaseKeywordSniff.php',
-    'Generic_Sniffs_PHP_NoSilencedErrorsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/NoSilencedErrorsSniff.php',
-    'Generic_Sniffs_PHP_SAPIUsageSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/SAPIUsageSniff.php',
-    'Generic_Sniffs_PHP_SyntaxSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/SyntaxSniff.php',
-    'Generic_Sniffs_PHP_UpperCaseConstantSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php',
-    'Generic_Sniffs_Strings_UnnecessaryStringConcatSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/Strings/UnnecessaryStringConcatSniff.php',
-    'Generic_Sniffs_VersionControl_SubversionPropertiesSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/VersionControl/SubversionPropertiesSniff.php',
-    'Generic_Sniffs_WhiteSpace_DisallowSpaceIndentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/DisallowSpaceIndentSniff.php',
-    'Generic_Sniffs_WhiteSpace_DisallowTabIndentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php',
-    'Generic_Sniffs_WhiteSpace_ScopeIndentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php',
    'Google_Service_Exception' => $vendorDir . '/google/apiclient/src/Google/Service/Exception.php',
    'Google_Service_Resource' => $vendorDir . '/google/apiclient/src/Google/Service/Resource.php',
-    'MySource_Sniffs_CSS_BrowserSpecificStylesSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/CSS/BrowserSpecificStylesSniff.php',
-    'MySource_Sniffs_Channels_DisallowSelfActionsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/DisallowSelfActionsSniff.php',
-    'MySource_Sniffs_Channels_IncludeOwnSystemSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/IncludeOwnSystemSniff.php',
-    'MySource_Sniffs_Channels_IncludeSystemSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/IncludeSystemSniff.php',
-    'MySource_Sniffs_Channels_UnusedSystemSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Channels/UnusedSystemSniff.php',
-    'MySource_Sniffs_Commenting_FunctionCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Commenting/FunctionCommentSniff.php',
-    'MySource_Sniffs_Debug_DebugCodeSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Debug/DebugCodeSniff.php',
-    'MySource_Sniffs_Debug_FirebugConsoleSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Debug/FirebugConsoleSniff.php',
-    'MySource_Sniffs_Objects_AssignThisSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Objects/AssignThisSniff.php',
-    'MySource_Sniffs_Objects_CreateWidgetTypeCallbackSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Objects/CreateWidgetTypeCallbackSniff.php',
-    'MySource_Sniffs_Objects_DisallowNewWidgetSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Objects/DisallowNewWidgetSniff.php',
-    'MySource_Sniffs_PHP_AjaxNullComparisonSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/PHP/AjaxNullComparisonSniff.php',
-    'MySource_Sniffs_PHP_EvalObjectFactorySniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/PHP/EvalObjectFactorySniff.php',
-    'MySource_Sniffs_PHP_GetRequestDataSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/PHP/GetRequestDataSniff.php',
-    'MySource_Sniffs_PHP_ReturnFunctionValueSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/PHP/ReturnFunctionValueSniff.php',
-    'MySource_Sniffs_Strings_JoinStringsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/MySource/Sniffs/Strings/JoinStringsSniff.php',
-    'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
-    'PEAR_Exception' => $vendorDir . '/pear/pear_exception/PEAR/Exception.php',
-    'PEAR_Sniffs_Classes_ClassDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Classes/ClassDeclarationSniff.php',
-    'PEAR_Sniffs_Commenting_ClassCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/ClassCommentSniff.php',
-    'PEAR_Sniffs_Commenting_FileCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php',
-    'PEAR_Sniffs_Commenting_FunctionCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/FunctionCommentSniff.php',
-    'PEAR_Sniffs_Commenting_InlineCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Commenting/InlineCommentSniff.php',
-    'PEAR_Sniffs_ControlStructures_ControlSignatureSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php',
-    'PEAR_Sniffs_ControlStructures_MultiLineConditionSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/ControlStructures/MultiLineConditionSniff.php',
-    'PEAR_Sniffs_Files_IncludingFileSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Files/IncludingFileSniff.php',
-    'PEAR_Sniffs_Formatting_MultiLineAssignmentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Formatting/MultiLineAssignmentSniff.php',
-    'PEAR_Sniffs_Functions_FunctionCallSignatureSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php',
-    'PEAR_Sniffs_Functions_FunctionDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php',
-    'PEAR_Sniffs_Functions_ValidDefaultValueSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php',
-    'PEAR_Sniffs_NamingConventions_ValidClassNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php',
-    'PEAR_Sniffs_NamingConventions_ValidFunctionNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidFunctionNameSniff.php',
-    'PEAR_Sniffs_NamingConventions_ValidVariableNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidVariableNameSniff.php',
-    'PEAR_Sniffs_WhiteSpace_ObjectOperatorIndentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ObjectOperatorIndentSniff.php',
-    'PEAR_Sniffs_WhiteSpace_ScopeClosingBraceSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php',
-    'PEAR_Sniffs_WhiteSpace_ScopeIndentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PEAR/Sniffs/WhiteSpace/ScopeIndentSniff.php',
    'PHPUnit\\Exception' => $vendorDir . '/phpunit/phpunit/src/Exception.php',
    'PHPUnit\\Framework\\Assert' => $vendorDir . '/phpunit/phpunit/src/Framework/Assert.php',
    'PHPUnit\\Framework\\AssertionFailedError' => $vendorDir . '/phpunit/phpunit/src/Framework/AssertionFailedError.php',
@@ -285,44 +183,6 @@ return array(
    'PHPUnit\\Util\\Xml' => $vendorDir . '/phpunit/phpunit/src/Util/Xml.php',
    'PHPUnit\\Util\\XmlTestListRenderer' => $vendorDir . '/phpunit/phpunit/src/Util/XmlTestListRenderer.php',
    'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/src/MockObject.php',
-    'PHP_CodeSniffer' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer.php',
-    'PHP_CodeSniffer_CLI' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/CLI.php',
-    'PHP_CodeSniffer_DocGenerators_Generator' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/DocGenerators/Generator.php',
-    'PHP_CodeSniffer_DocGenerators_HTML' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/DocGenerators/HTML.php',
-    'PHP_CodeSniffer_DocGenerators_Markdown' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/DocGenerators/Markdown.php',
-    'PHP_CodeSniffer_DocGenerators_Text' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/DocGenerators/Text.php',
-    'PHP_CodeSniffer_Exception' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Exception.php',
-    'PHP_CodeSniffer_File' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/File.php',
-    'PHP_CodeSniffer_Fixer' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Fixer.php',
-    'PHP_CodeSniffer_Report' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Report.php',
-    'PHP_CodeSniffer_Reporting' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reporting.php',
-    'PHP_CodeSniffer_Reports_Cbf' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Cbf.php',
-    'PHP_CodeSniffer_Reports_Checkstyle' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Checkstyle.php',
-    'PHP_CodeSniffer_Reports_Csv' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Csv.php',
-    'PHP_CodeSniffer_Reports_Diff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Diff.php',
-    'PHP_CodeSniffer_Reports_Emacs' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Emacs.php',
-    'PHP_CodeSniffer_Reports_Full' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Full.php',
-    'PHP_CodeSniffer_Reports_Gitblame' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Gitblame.php',
-    'PHP_CodeSniffer_Reports_Hgblame' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Hgblame.php',
-    'PHP_CodeSniffer_Reports_Info' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Info.php',
-    'PHP_CodeSniffer_Reports_Json' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Json.php',
-    'PHP_CodeSniffer_Reports_Junit' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Junit.php',
-    'PHP_CodeSniffer_Reports_Notifysend' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Notifysend.php',
-    'PHP_CodeSniffer_Reports_Source' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Source.php',
-    'PHP_CodeSniffer_Reports_Summary' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Summary.php',
-    'PHP_CodeSniffer_Reports_Svnblame' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Svnblame.php',
-    'PHP_CodeSniffer_Reports_VersionControl' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/VersionControl.php',
-    'PHP_CodeSniffer_Reports_Xml' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Reports/Xml.php',
-    'PHP_CodeSniffer_Sniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Sniff.php',
-    'PHP_CodeSniffer_Standards_AbstractPatternSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/AbstractPatternSniff.php',
-    'PHP_CodeSniffer_Standards_AbstractScopeSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/AbstractScopeSniff.php',
-    'PHP_CodeSniffer_Standards_AbstractVariableSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/AbstractVariableSniff.php',
-    'PHP_CodeSniffer_Standards_IncorrectPatternException' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/IncorrectPatternException.php',
-    'PHP_CodeSniffer_Tokenizers_CSS' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Tokenizers/CSS.php',
-    'PHP_CodeSniffer_Tokenizers_Comment' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Tokenizers/Comment.php',
-    'PHP_CodeSniffer_Tokenizers_JS' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Tokenizers/JS.php',
-    'PHP_CodeSniffer_Tokenizers_PHP' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Tokenizers/PHP.php',
-    'PHP_CodeSniffer_Tokens' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Tokens.php',
    'PHP_Timer' => $vendorDir . '/phpunit/php-timer/src/Timer.php',
    'PHP_Token' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
    'PHP_TokenWithScope' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
@@ -523,22 +383,6 @@ return array(
    'PHP_Token_XOR_EQUAL' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
    'PHP_Token_YIELD' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
    'PHP_Token_YIELD_FROM' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
-    'PSR1_Sniffs_Classes_ClassDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR1/Sniffs/Classes/ClassDeclarationSniff.php',
-    'PSR1_Sniffs_Files_SideEffectsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR1/Sniffs/Files/SideEffectsSniff.php',
-    'PSR1_Sniffs_Methods_CamelCapsMethodNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR1/Sniffs/Methods/CamelCapsMethodNameSniff.php',
-    'PSR2_Sniffs_Classes_ClassDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php',
-    'PSR2_Sniffs_Classes_PropertyDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/Classes/PropertyDeclarationSniff.php',
-    'PSR2_Sniffs_ControlStructures_ControlStructureSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/ControlStructures/ControlStructureSpacingSniff.php',
-    'PSR2_Sniffs_ControlStructures_ElseIfDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/ControlStructures/ElseIfDeclarationSniff.php',
-    'PSR2_Sniffs_ControlStructures_SwitchDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/ControlStructures/SwitchDeclarationSniff.php',
-    'PSR2_Sniffs_Files_ClosingTagSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/Files/ClosingTagSniff.php',
-    'PSR2_Sniffs_Files_EndFileNewlineSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/Files/EndFileNewlineSniff.php',
-    'PSR2_Sniffs_Methods_FunctionCallSignatureSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php',
-    'PSR2_Sniffs_Methods_FunctionClosingBraceSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/Methods/FunctionClosingBraceSniff.php',
-    'PSR2_Sniffs_Methods_MethodDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/Methods/MethodDeclarationSniff.php',
-    'PSR2_Sniffs_Namespaces_NamespaceDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/Namespaces/NamespaceDeclarationSniff.php',
-    'PSR2_Sniffs_Namespaces_UseDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php',
-    'ParseError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/ParseError.php',
    'PharIo\\Manifest\\Application' => $vendorDir . '/phar-io/manifest/src/values/Application.php',
    'PharIo\\Manifest\\ApplicationName' => $vendorDir . '/phar-io/manifest/src/values/ApplicationName.php',
    'PharIo\\Manifest\\Author' => $vendorDir . '/phar-io/manifest/src/values/Author.php',
@@ -680,8 +524,6 @@ return array(
    'SebastianBergmann\\Environment\\OperatingSystem' => $vendorDir . '/sebastian/environment/src/OperatingSystem.php',
    'SebastianBergmann\\Environment\\Runtime' => $vendorDir . '/sebastian/environment/src/Runtime.php',
    'SebastianBergmann\\Exporter\\Exporter' => $vendorDir . '/sebastian/exporter/src/Exporter.php',
-    'SebastianBergmann\\FinderFacade\\Configuration' => $vendorDir . '/sebastian/finder-facade/src/Configuration.php',
-    'SebastianBergmann\\FinderFacade\\FinderFacade' => $vendorDir . '/sebastian/finder-facade/src/FinderFacade.php',
    'SebastianBergmann\\GlobalState\\Blacklist' => $vendorDir . '/sebastian/global-state/src/Blacklist.php',
    'SebastianBergmann\\GlobalState\\CodeExporter' => $vendorDir . '/sebastian/global-state/src/CodeExporter.php',
    'SebastianBergmann\\GlobalState\\Exception' => $vendorDir . '/sebastian/global-state/src/exceptions/Exception.php',
@@ -694,131 +536,11 @@ return array(
    'SebastianBergmann\\ObjectReflector\\Exception' => $vendorDir . '/sebastian/object-reflector/src/Exception.php',
    'SebastianBergmann\\ObjectReflector\\InvalidArgumentException' => $vendorDir . '/sebastian/object-reflector/src/InvalidArgumentException.php',
    'SebastianBergmann\\ObjectReflector\\ObjectReflector' => $vendorDir . '/sebastian/object-reflector/src/ObjectReflector.php',
-    'SebastianBergmann\\PHPCPD\\CodeClone' => $vendorDir . '/sebastian/phpcpd/src/CodeClone.php',
-    'SebastianBergmann\\PHPCPD\\CodeCloneMap' => $vendorDir . '/sebastian/phpcpd/src/CodeCloneMap.php',
-    'SebastianBergmann\\PHPCPD\\Detector\\Detector' => $vendorDir . '/sebastian/phpcpd/src/Detector/Detector.php',
-    'SebastianBergmann\\PHPCPD\\Detector\\Strategy\\AbstractStrategy' => $vendorDir . '/sebastian/phpcpd/src/Detector/Strategy/Abstract.php',
-    'SebastianBergmann\\PHPCPD\\Detector\\Strategy\\DefaultStrategy' => $vendorDir . '/sebastian/phpcpd/src/Detector/Strategy/Default.php',
-    'SebastianBergmann\\PHPCPD\\Log\\AbstractXmlLogger' => $vendorDir . '/sebastian/phpcpd/src/Log/AbstractXmlLogger.php',
-    'SebastianBergmann\\PHPCPD\\Log\\PMD' => $vendorDir . '/sebastian/phpcpd/src/Log/PMD.php',
-    'SebastianBergmann\\PHPCPD\\TextUI\\Command' => $vendorDir . '/sebastian/phpcpd/src/TextUI/Command.php',
-    'SebastianBergmann\\PHPCPD\\TextUI\\ResultPrinter' => $vendorDir . '/sebastian/phpcpd/src/TextUI/ResultPrinter.php',
-    'SebastianBergmann\\PHPLOC\\Analyser' => $vendorDir . '/phploc/phploc/src/Analyser.php',
-    'SebastianBergmann\\PHPLOC\\CLI\\Application' => $vendorDir . '/phploc/phploc/src/CLI/Application.php',
-    'SebastianBergmann\\PHPLOC\\CLI\\Command' => $vendorDir . '/phploc/phploc/src/CLI/Command.php',
-    'SebastianBergmann\\PHPLOC\\Collector' => $vendorDir . '/phploc/phploc/src/Collector.php',
-    'SebastianBergmann\\PHPLOC\\Exception' => $vendorDir . '/phploc/phploc/src/Exception/Exception.php',
-    'SebastianBergmann\\PHPLOC\\Log\\Csv' => $vendorDir . '/phploc/phploc/src/Log/Csv.php',
-    'SebastianBergmann\\PHPLOC\\Log\\Text' => $vendorDir . '/phploc/phploc/src/Log/Text.php',
-    'SebastianBergmann\\PHPLOC\\Log\\Xml' => $vendorDir . '/phploc/phploc/src/Log/Xml.php',
-    'SebastianBergmann\\PHPLOC\\Publisher' => $vendorDir . '/phploc/phploc/src/Publisher.php',
-    'SebastianBergmann\\PHPLOC\\RuntimeException' => $vendorDir . '/phploc/phploc/src/Exception/RuntimeException.php',
    'SebastianBergmann\\RecursionContext\\Context' => $vendorDir . '/sebastian/recursion-context/src/Context.php',
    'SebastianBergmann\\RecursionContext\\Exception' => $vendorDir . '/sebastian/recursion-context/src/Exception.php',
    'SebastianBergmann\\RecursionContext\\InvalidArgumentException' => $vendorDir . '/sebastian/recursion-context/src/InvalidArgumentException.php',
    'SebastianBergmann\\ResourceOperations\\ResourceOperations' => $vendorDir . '/sebastian/resource-operations/src/ResourceOperations.php',
    'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
-    'SessionUpdateTimestampHandlerInterface' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/SessionUpdateTimestampHandlerInterface.php',
-    'Squiz_Sniffs_Arrays_ArrayBracketSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayBracketSpacingSniff.php',
-    'Squiz_Sniffs_Arrays_ArrayDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php',
-    'Squiz_Sniffs_CSS_ClassDefinitionClosingBraceSpaceSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionClosingBraceSpaceSniff.php',
-    'Squiz_Sniffs_CSS_ClassDefinitionNameSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php',
-    'Squiz_Sniffs_CSS_ClassDefinitionOpeningBraceSpaceSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ClassDefinitionOpeningBraceSpaceSniff.php',
-    'Squiz_Sniffs_CSS_ColonSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ColonSpacingSniff.php',
-    'Squiz_Sniffs_CSS_ColourDefinitionSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ColourDefinitionSniff.php',
-    'Squiz_Sniffs_CSS_DisallowMultipleStyleDefinitionsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/DisallowMultipleStyleDefinitionsSniff.php',
-    'Squiz_Sniffs_CSS_DuplicateClassDefinitionSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/DuplicateClassDefinitionSniff.php',
-    'Squiz_Sniffs_CSS_DuplicateStyleDefinitionSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/DuplicateStyleDefinitionSniff.php',
-    'Squiz_Sniffs_CSS_EmptyClassDefinitionSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/EmptyClassDefinitionSniff.php',
-    'Squiz_Sniffs_CSS_EmptyStyleDefinitionSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/EmptyStyleDefinitionSniff.php',
-    'Squiz_Sniffs_CSS_ForbiddenStylesSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ForbiddenStylesSniff.php',
-    'Squiz_Sniffs_CSS_IndentationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/IndentationSniff.php',
-    'Squiz_Sniffs_CSS_LowercaseStyleDefinitionSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/LowercaseStyleDefinitionSniff.php',
-    'Squiz_Sniffs_CSS_MissingColonSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/MissingColonSniff.php',
-    'Squiz_Sniffs_CSS_NamedColoursSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/NamedColoursSniff.php',
-    'Squiz_Sniffs_CSS_OpacitySniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/OpacitySniff.php',
-    'Squiz_Sniffs_CSS_SemicolonSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/SemicolonSpacingSniff.php',
-    'Squiz_Sniffs_CSS_ShorthandSizeSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/CSS/ShorthandSizeSniff.php',
-    'Squiz_Sniffs_Classes_ClassDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassDeclarationSniff.php',
-    'Squiz_Sniffs_Classes_ClassFileNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/ClassFileNameSniff.php',
-    'Squiz_Sniffs_Classes_DuplicatePropertySniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/DuplicatePropertySniff.php',
-    'Squiz_Sniffs_Classes_LowercaseClassKeywordsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/LowercaseClassKeywordsSniff.php',
-    'Squiz_Sniffs_Classes_SelfMemberReferenceSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/SelfMemberReferenceSniff.php',
-    'Squiz_Sniffs_Classes_ValidClassNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php',
-    'Squiz_Sniffs_Commenting_BlockCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php',
-    'Squiz_Sniffs_Commenting_ClassCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClassCommentSniff.php',
-    'Squiz_Sniffs_Commenting_ClosingDeclarationCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/ClosingDeclarationCommentSniff.php',
-    'Squiz_Sniffs_Commenting_DocCommentAlignmentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php',
-    'Squiz_Sniffs_Commenting_EmptyCatchCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/EmptyCatchCommentSniff.php',
-    'Squiz_Sniffs_Commenting_FileCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php',
-    'Squiz_Sniffs_Commenting_FunctionCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php',
-    'Squiz_Sniffs_Commenting_FunctionCommentThrowTagSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/FunctionCommentThrowTagSniff.php',
-    'Squiz_Sniffs_Commenting_InlineCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php',
-    'Squiz_Sniffs_Commenting_LongConditionClosingCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php',
-    'Squiz_Sniffs_Commenting_PostStatementCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/PostStatementCommentSniff.php',
-    'Squiz_Sniffs_Commenting_VariableCommentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php',
-    'Squiz_Sniffs_ControlStructures_ControlSignatureSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ControlSignatureSniff.php',
-    'Squiz_Sniffs_ControlStructures_ElseIfDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ElseIfDeclarationSniff.php',
-    'Squiz_Sniffs_ControlStructures_ForEachLoopDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForEachLoopDeclarationSniff.php',
-    'Squiz_Sniffs_ControlStructures_ForLoopDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php',
-    'Squiz_Sniffs_ControlStructures_InlineIfDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/InlineIfDeclarationSniff.php',
-    'Squiz_Sniffs_ControlStructures_LowercaseDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/LowercaseDeclarationSniff.php',
-    'Squiz_Sniffs_ControlStructures_SwitchDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/ControlStructures/SwitchDeclarationSniff.php',
-    'Squiz_Sniffs_Debug_JSLintSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Debug/JSLintSniff.php',
-    'Squiz_Sniffs_Debug_JavaScriptLintSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Debug/JavaScriptLintSniff.php',
-    'Squiz_Sniffs_Files_FileExtensionSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Files/FileExtensionSniff.php',
-    'Squiz_Sniffs_Formatting_OperatorBracketSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php',
-    'Squiz_Sniffs_Functions_FunctionDeclarationArgumentSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDeclarationArgumentSpacingSniff.php',
-    'Squiz_Sniffs_Functions_FunctionDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDeclarationSniff.php',
-    'Squiz_Sniffs_Functions_FunctionDuplicateArgumentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php',
-    'Squiz_Sniffs_Functions_GlobalFunctionSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/GlobalFunctionSniff.php',
-    'Squiz_Sniffs_Functions_LowercaseFunctionKeywordsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/LowercaseFunctionKeywordsSniff.php',
-    'Squiz_Sniffs_Functions_MultiLineFunctionDeclarationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Functions/MultiLineFunctionDeclarationSniff.php',
-    'Squiz_Sniffs_NamingConventions_ValidFunctionNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidFunctionNameSniff.php',
-    'Squiz_Sniffs_NamingConventions_ValidVariableNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/NamingConventions/ValidVariableNameSniff.php',
-    'Squiz_Sniffs_Objects_DisallowObjectStringIndexSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/DisallowObjectStringIndexSniff.php',
-    'Squiz_Sniffs_Objects_ObjectInstantiationSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectInstantiationSniff.php',
-    'Squiz_Sniffs_Objects_ObjectMemberCommaSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Objects/ObjectMemberCommaSniff.php',
-    'Squiz_Sniffs_Operators_ComparisonOperatorUsageSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php',
-    'Squiz_Sniffs_Operators_IncrementDecrementUsageSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Operators/IncrementDecrementUsageSniff.php',
-    'Squiz_Sniffs_Operators_ValidLogicalOperatorsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php',
-    'Squiz_Sniffs_PHP_CommentedOutCodeSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/CommentedOutCodeSniff.php',
-    'Squiz_Sniffs_PHP_DisallowBooleanStatementSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowBooleanStatementSniff.php',
-    'Squiz_Sniffs_PHP_DisallowComparisonAssignmentSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php',
-    'Squiz_Sniffs_PHP_DisallowInlineIfSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowInlineIfSniff.php',
-    'Squiz_Sniffs_PHP_DisallowMultipleAssignmentsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowMultipleAssignmentsSniff.php',
-    'Squiz_Sniffs_PHP_DisallowObEndFlushSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowObEndFlushSniff.php',
-    'Squiz_Sniffs_PHP_DisallowSizeFunctionsInLoopsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DisallowSizeFunctionsInLoopsSniff.php',
-    'Squiz_Sniffs_PHP_DiscouragedFunctionsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/DiscouragedFunctionsSniff.php',
-    'Squiz_Sniffs_PHP_EmbeddedPhpSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/EmbeddedPhpSniff.php',
-    'Squiz_Sniffs_PHP_EvalSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/EvalSniff.php',
-    'Squiz_Sniffs_PHP_ForbiddenFunctionsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/ForbiddenFunctionsSniff.php',
-    'Squiz_Sniffs_PHP_GlobalKeywordSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/GlobalKeywordSniff.php',
-    'Squiz_Sniffs_PHP_HeredocSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/HeredocSniff.php',
-    'Squiz_Sniffs_PHP_InnerFunctionsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/InnerFunctionsSniff.php',
-    'Squiz_Sniffs_PHP_LowercasePHPFunctionsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/LowercasePHPFunctionsSniff.php',
-    'Squiz_Sniffs_PHP_NonExecutableCodeSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/PHP/NonExecutableCodeSniff.php',
-    'Squiz_Sniffs_Scope_MemberVarScopeSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Scope/MemberVarScopeSniff.php',
-    'Squiz_Sniffs_Scope_MethodScopeSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Scope/MethodScopeSniff.php',
-    'Squiz_Sniffs_Scope_StaticThisUsageSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php',
-    'Squiz_Sniffs_Strings_ConcatenationSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Strings/ConcatenationSpacingSniff.php',
-    'Squiz_Sniffs_Strings_DoubleQuoteUsageSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php',
-    'Squiz_Sniffs_Strings_EchoedStringsSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/Strings/EchoedStringsSniff.php',
-    'Squiz_Sniffs_WhiteSpace_CastSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/CastSpacingSniff.php',
-    'Squiz_Sniffs_WhiteSpace_ControlStructureSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ControlStructureSpacingSniff.php',
-    'Squiz_Sniffs_WhiteSpace_FunctionClosingBraceSpaceSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionClosingBraceSpaceSniff.php',
-    'Squiz_Sniffs_WhiteSpace_FunctionOpeningBraceSpaceSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionOpeningBraceSpaceSniff.php',
-    'Squiz_Sniffs_WhiteSpace_FunctionSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/FunctionSpacingSniff.php',
-    'Squiz_Sniffs_WhiteSpace_LanguageConstructSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/LanguageConstructSpacingSniff.php',
-    'Squiz_Sniffs_WhiteSpace_LogicalOperatorSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/LogicalOperatorSpacingSniff.php',
-    'Squiz_Sniffs_WhiteSpace_MemberVarSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/MemberVarSpacingSniff.php',
-    'Squiz_Sniffs_WhiteSpace_ObjectOperatorSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ObjectOperatorSpacingSniff.php',
-    'Squiz_Sniffs_WhiteSpace_OperatorSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php',
-    'Squiz_Sniffs_WhiteSpace_PropertyLabelSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/PropertyLabelSpacingSniff.php',
-    'Squiz_Sniffs_WhiteSpace_ScopeClosingBraceSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php',
-    'Squiz_Sniffs_WhiteSpace_ScopeKeywordSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/ScopeKeywordSpacingSniff.php',
-    'Squiz_Sniffs_WhiteSpace_SemicolonSpacingSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SemicolonSpacingSniff.php',
-    'Squiz_Sniffs_WhiteSpace_SuperfluousWhitespaceSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php',
    'Text_Template' => $vendorDir . '/phpunit/php-text-template/src/Template.php',
    'TheSeer\\Tokenizer\\Exception' => $vendorDir . '/theseer/tokenizer/src/Exception.php',
    'TheSeer\\Tokenizer\\NamespaceUri' => $vendorDir . '/theseer/tokenizer/src/NamespaceUri.php',
@@ -828,117 +550,4 @@ return array(
    'TheSeer\\Tokenizer\\TokenCollectionException' => $vendorDir . '/theseer/tokenizer/src/TokenCollectionException.php',
    'TheSeer\\Tokenizer\\Tokenizer' => $vendorDir . '/theseer/tokenizer/src/Tokenizer.php',
    'TheSeer\\Tokenizer\\XMLSerializer' => $vendorDir . '/theseer/tokenizer/src/XMLSerializer.php',
-    'TheSeer\\fDOM\\CSS\\DollarEqualRule' => $vendorDir . '/theseer/fdomdocument/src/css/DollarEqualRule.php',
-    'TheSeer\\fDOM\\CSS\\NotRule' => $vendorDir . '/theseer/fdomdocument/src/css/NotRule.php',
-    'TheSeer\\fDOM\\CSS\\NthChildRule' => $vendorDir . '/theseer/fdomdocument/src/css/NthChildRule.php',
-    'TheSeer\\fDOM\\CSS\\RegexRule' => $vendorDir . '/theseer/fdomdocument/src/css/RegexRule.php',
-    'TheSeer\\fDOM\\CSS\\RuleInterface' => $vendorDir . '/theseer/fdomdocument/src/css/RuleInterface.php',
-    'TheSeer\\fDOM\\CSS\\Translator' => $vendorDir . '/theseer/fdomdocument/src/css/Translator.php',
-    'TheSeer\\fDOM\\XPathQuery' => $vendorDir . '/theseer/fdomdocument/src/XPathQuery.php',
-    'TheSeer\\fDOM\\XPathQueryException' => $vendorDir . '/theseer/fdomdocument/src/XPathQueryException.php',
-    'TheSeer\\fDOM\\fDOMDocument' => $vendorDir . '/theseer/fdomdocument/src/fDOMDocument.php',
-    'TheSeer\\fDOM\\fDOMDocumentFragment' => $vendorDir . '/theseer/fdomdocument/src/fDOMDocumentFragment.php',
-    'TheSeer\\fDOM\\fDOMElement' => $vendorDir . '/theseer/fdomdocument/src/fDOMElement.php',
-    'TheSeer\\fDOM\\fDOMException' => $vendorDir . '/theseer/fdomdocument/src/fDOMException.php',
-    'TheSeer\\fDOM\\fDOMNode' => $vendorDir . '/theseer/fdomdocument/src/fDOMNode.php',
-    'TheSeer\\fDOM\\fDOMXPath' => $vendorDir . '/theseer/fdomdocument/src/fDOMXPath.php',
-    'TypeError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/TypeError.php',
-    'Zend_Sniffs_Debug_CodeAnalyzerSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Zend/Sniffs/Debug/CodeAnalyzerSniff.php',
-    'Zend_Sniffs_Files_ClosingTagSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Zend/Sniffs/Files/ClosingTagSniff.php',
-    'Zend_Sniffs_NamingConventions_ValidVariableNameSniff' => $vendorDir . '/squizlabs/php_codesniffer/CodeSniffer/Standards/Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php',
-    'ezcBase' => $vendorDir . '/zetacomponents/base/src/base.php',
-    'ezcBaseAutoloadException' => $vendorDir . '/zetacomponents/base/src/exceptions/autoload.php',
-    'ezcBaseAutoloadOptions' => $vendorDir . '/zetacomponents/base/src/options/autoload.php',
-    'ezcBaseConfigurationInitializer' => $vendorDir . '/zetacomponents/base/src/interfaces/configuration_initializer.php',
-    'ezcBaseDoubleClassRepositoryPrefixException' => $vendorDir . '/zetacomponents/base/src/exceptions/double_class_repository_prefix.php',
-    'ezcBaseException' => $vendorDir . '/zetacomponents/base/src/exceptions/exception.php',
-    'ezcBaseExportable' => $vendorDir . '/zetacomponents/base/src/interfaces/exportable.php',
-    'ezcBaseExtensionNotFoundException' => $vendorDir . '/zetacomponents/base/src/exceptions/extension_not_found.php',
-    'ezcBaseFeatures' => $vendorDir . '/zetacomponents/base/src/features.php',
-    'ezcBaseFile' => $vendorDir . '/zetacomponents/base/src/file.php',
-    'ezcBaseFileException' => $vendorDir . '/zetacomponents/base/src/exceptions/file_exception.php',
-    'ezcBaseFileFindContext' => $vendorDir . '/zetacomponents/base/src/structs/file_find_context.php',
-    'ezcBaseFileIoException' => $vendorDir . '/zetacomponents/base/src/exceptions/file_io.php',
-    'ezcBaseFileNotFoundException' => $vendorDir . '/zetacomponents/base/src/exceptions/file_not_found.php',
-    'ezcBaseFilePermissionException' => $vendorDir . '/zetacomponents/base/src/exceptions/file_permission.php',
-    'ezcBaseFunctionalityNotSupportedException' => $vendorDir . '/zetacomponents/base/src/exceptions/functionality_not_supported.php',
-    'ezcBaseInit' => $vendorDir . '/zetacomponents/base/src/init.php',
-    'ezcBaseInitCallbackConfiguredException' => $vendorDir . '/zetacomponents/base/src/exceptions/init_callback_configured.php',
-    'ezcBaseInitInvalidCallbackClassException' => $vendorDir . '/zetacomponents/base/src/exceptions/invalid_callback_class.php',
-    'ezcBaseInvalidParentClassException' => $vendorDir . '/zetacomponents/base/src/exceptions/invalid_parent_class.php',
-    'ezcBaseMetaData' => $vendorDir . '/zetacomponents/base/src/metadata.php',
-    'ezcBaseMetaDataPearReader' => $vendorDir . '/zetacomponents/base/src/metadata/pear.php',
-    'ezcBaseMetaDataTarballReader' => $vendorDir . '/zetacomponents/base/src/metadata/tarball.php',
-    'ezcBaseOptions' => $vendorDir . '/zetacomponents/base/src/options.php',
-    'ezcBasePersistable' => $vendorDir . '/zetacomponents/base/src/interfaces/persistable.php',
-    'ezcBasePropertyNotFoundException' => $vendorDir . '/zetacomponents/base/src/exceptions/property_not_found.php',
-    'ezcBasePropertyPermissionException' => $vendorDir . '/zetacomponents/base/src/exceptions/property_permission.php',
-    'ezcBaseRepositoryDirectory' => $vendorDir . '/zetacomponents/base/src/structs/repository_directory.php',
-    'ezcBaseSettingNotFoundException' => $vendorDir . '/zetacomponents/base/src/exceptions/setting_not_found.php',
-    'ezcBaseSettingValueException' => $vendorDir . '/zetacomponents/base/src/exceptions/setting_value.php',
-    'ezcBaseStruct' => $vendorDir . '/zetacomponents/base/src/struct.php',
-    'ezcBaseValueException' => $vendorDir . '/zetacomponents/base/src/exceptions/value.php',
-    'ezcBaseWhateverException' => $vendorDir . '/zetacomponents/base/src/exceptions/whatever.php',
-    'ezcConsoleArgument' => $vendorDir . '/zetacomponents/console-tools/src/input/argument.php',
-    'ezcConsoleArgumentAlreadyRegisteredException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/argument_already_registered.php',
-    'ezcConsoleArgumentException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/argument.php',
-    'ezcConsoleArgumentMandatoryViolationException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/argument_mandatory_violation.php',
-    'ezcConsoleArgumentTypeViolationException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/argument_type_violation.php',
-    'ezcConsoleArguments' => $vendorDir . '/zetacomponents/console-tools/src/input/arguments.php',
-    'ezcConsoleDialog' => $vendorDir . '/zetacomponents/console-tools/src/interfaces/dialog.php',
-    'ezcConsoleDialogAbortException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/dialog_abort.php',
-    'ezcConsoleDialogOptions' => $vendorDir . '/zetacomponents/console-tools/src/options/dialog.php',
-    'ezcConsoleDialogValidator' => $vendorDir . '/zetacomponents/console-tools/src/interfaces/dialog_validator.php',
-    'ezcConsoleDialogViewer' => $vendorDir . '/zetacomponents/console-tools/src/dialog_viewer.php',
-    'ezcConsoleException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/exception.php',
-    'ezcConsoleInput' => $vendorDir . '/zetacomponents/console-tools/src/input.php',
-    'ezcConsoleInputHelpGenerator' => $vendorDir . '/zetacomponents/console-tools/src/interfaces/input_help_generator.php',
-    'ezcConsoleInputStandardHelpGenerator' => $vendorDir . '/zetacomponents/console-tools/src/input/help_generators/standard.php',
-    'ezcConsoleInputValidator' => $vendorDir . '/zetacomponents/console-tools/src/interfaces/input_validator.php',
-    'ezcConsoleInvalidOptionNameException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/invalid_option_name.php',
-    'ezcConsoleInvalidOutputTargetException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/invalid_output_target.php',
-    'ezcConsoleMenuDialog' => $vendorDir . '/zetacomponents/console-tools/src/dialog/menu_dialog.php',
-    'ezcConsoleMenuDialogDefaultValidator' => $vendorDir . '/zetacomponents/console-tools/src/dialog/validators/menu_dialog_default.php',
-    'ezcConsoleMenuDialogOptions' => $vendorDir . '/zetacomponents/console-tools/src/options/menu_dialog.php',
-    'ezcConsoleMenuDialogValidator' => $vendorDir . '/zetacomponents/console-tools/src/interfaces/menu_dialog_validator.php',
-    'ezcConsoleNoPositionStoredException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/no_position_stored.php',
-    'ezcConsoleNoValidDialogResultException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/no_valid_dialog_result.php',
-    'ezcConsoleOption' => $vendorDir . '/zetacomponents/console-tools/src/input/option.php',
-    'ezcConsoleOptionAlreadyRegisteredException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option_already_registered.php',
-    'ezcConsoleOptionArgumentsViolationException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option_arguments_violation.php',
-    'ezcConsoleOptionDependencyViolationException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option_dependency_violation.php',
-    'ezcConsoleOptionException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option.php',
-    'ezcConsoleOptionExclusionViolationException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option_exclusion_violation.php',
-    'ezcConsoleOptionMandatoryViolationException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option_mandatory_violation.php',
-    'ezcConsoleOptionMissingValueException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option_missing_value.php',
-    'ezcConsoleOptionNoAliasException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option_no_alias.php',
-    'ezcConsoleOptionNotExistsException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option_not_exists.php',
-    'ezcConsoleOptionRule' => $vendorDir . '/zetacomponents/console-tools/src/structs/option_rule.php',
-    'ezcConsoleOptionStringNotWellformedException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option_string_not_wellformed.php',
-    'ezcConsoleOptionTooManyValuesException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option_too_many_values.php',
-    'ezcConsoleOptionTypeViolationException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/option_type_violation.php',
-    'ezcConsoleOutput' => $vendorDir . '/zetacomponents/console-tools/src/output.php',
-    'ezcConsoleOutputFormat' => $vendorDir . '/zetacomponents/console-tools/src/structs/output_format.php',
-    'ezcConsoleOutputFormats' => $vendorDir . '/zetacomponents/console-tools/src/structs/output_formats.php',
-    'ezcConsoleOutputOptions' => $vendorDir . '/zetacomponents/console-tools/src/options/output.php',
-    'ezcConsoleProgressMonitor' => $vendorDir . '/zetacomponents/console-tools/src/progressmonitor.php',
-    'ezcConsoleProgressMonitorOptions' => $vendorDir . '/zetacomponents/console-tools/src/options/progressmonitor.php',
-    'ezcConsoleProgressbar' => $vendorDir . '/zetacomponents/console-tools/src/progressbar.php',
-    'ezcConsoleProgressbarOptions' => $vendorDir . '/zetacomponents/console-tools/src/options/progressbar.php',
-    'ezcConsoleQuestionDialog' => $vendorDir . '/zetacomponents/console-tools/src/dialog/question_dialog.php',
-    'ezcConsoleQuestionDialogCollectionValidator' => $vendorDir . '/zetacomponents/console-tools/src/dialog/validators/question_dialog_collection.php',
-    'ezcConsoleQuestionDialogMappingValidator' => $vendorDir . '/zetacomponents/console-tools/src/dialog/validators/question_dialog_mapping.php',
-    'ezcConsoleQuestionDialogOptions' => $vendorDir . '/zetacomponents/console-tools/src/options/question_dialog.php',
-    'ezcConsoleQuestionDialogRegexValidator' => $vendorDir . '/zetacomponents/console-tools/src/dialog/validators/question_dialog_regex.php',
-    'ezcConsoleQuestionDialogTypeValidator' => $vendorDir . '/zetacomponents/console-tools/src/dialog/validators/question_dialog_type.php',
-    'ezcConsoleQuestionDialogValidator' => $vendorDir . '/zetacomponents/console-tools/src/interfaces/question_dialog_validator.php',
-    'ezcConsoleStandardInputValidator' => $vendorDir . '/zetacomponents/console-tools/src/input/validators/standard.php',
-    'ezcConsoleStatusbar' => $vendorDir . '/zetacomponents/console-tools/src/statusbar.php',
-    'ezcConsoleStatusbarOptions' => $vendorDir . '/zetacomponents/console-tools/src/options/statusbar.php',
-    'ezcConsoleStringTool' => $vendorDir . '/zetacomponents/console-tools/src/tools/string.php',
-    'ezcConsoleTable' => $vendorDir . '/zetacomponents/console-tools/src/table.php',
-    'ezcConsoleTableCell' => $vendorDir . '/zetacomponents/console-tools/src/table/cell.php',
-    'ezcConsoleTableOptions' => $vendorDir . '/zetacomponents/console-tools/src/options/table.php',
-    'ezcConsoleTableRow' => $vendorDir . '/zetacomponents/console-tools/src/table/row.php',
-    'ezcConsoleTooManyArgumentsException' => $vendorDir . '/zetacomponents/console-tools/src/exceptions/argument_too_many.php',
 );
--- a/core/lib/composer/vendor/composer/autoload_files.php
+++ b/core/lib/composer/vendor/composer/autoload_files.php
@@ -7,17 +7,10 @@ $baseDir = dirname($vendorDir);

 return array(
    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
-    'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
-    '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php',
-    '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
-    'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
-    '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
    'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
    'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
-    'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
    '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
-    'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
    '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
-    '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
    '6124b4c8570aa390c21fafd04a26c69f' => $vendorDir . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
+    'decc78cc4436b1292c6c0d151b19445c' => $vendorDir . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
 );
--- a/core/lib/composer/vendor/composer/autoload_namespaces.php
+++ b/core/lib/composer/vendor/composer/autoload_namespaces.php
@@ -7,14 +7,14 @@ $baseDir = dirname($vendorDir);

 return array(
    'Twig_' => array($vendorDir . '/twig/twig/lib'),
-    'Pimple' => array($vendorDir . '/pimple/pimple/src'),
-    'PHPMD\\' => array($vendorDir . '/phpmd/phpmd/src/main/php'),
-    'PHPCodeBrowser\\' => array($vendorDir . '/mayflower/php-codebrowser/src'),
+    'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src'),
+    'PEAR' => array($vendorDir . '/pear/pear_exception'),
    'Net' => array($vendorDir . '/pear/net_smtp', $vendorDir . '/pear/net_socket'),
    'Mail' => array($vendorDir . '/pear/mail'),
    'Google_Service_' => array($vendorDir . '/google/apiclient-services/src'),
    'Google_' => array($vendorDir . '/google/apiclient/src'),
    'ForceUTF8\\' => array($vendorDir . '/neitanod/forceutf8/src'),
+    'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'),
    'Dflydev\\DotAccessData' => array($vendorDir . '/dflydev/dot-access-data/src'),
    'Console' => array($vendorDir . '/pear/console_getopt'),
    '' => array($vendorDir . '/pear/pear-core-minimal/src'),
--- a/core/lib/composer/vendor/composer/autoload_psr4.php
+++ b/core/lib/composer/vendor/composer/autoload_psr4.php
@@ -11,31 +11,19 @@ return array(
    'cebe\\markdown\\' => array($vendorDir . '/cebe/markdown'),
    'Whoops\\' => array($vendorDir . '/filp/whoops/src/Whoops'),
    'Webmozart\\Assert\\' => array($vendorDir . '/webmozart/assert/src'),
-    'Symfony\\Polyfill\\Php72\\' => array($vendorDir . '/symfony/polyfill-php72'),
-    'Symfony\\Polyfill\\Php70\\' => array($vendorDir . '/symfony/polyfill-php70'),
    'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
-    'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'),
-    'Symfony\\Polyfill\\Intl\\Idn\\' => array($vendorDir . '/symfony/polyfill-intl-idn'),
-    'Symfony\\Polyfill\\Iconv\\' => array($vendorDir . '/symfony/polyfill-iconv'),
-    'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
    'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
    'Symfony\\Component\\Process\\' => array($vendorDir . '/symfony/process'),
    'Symfony\\Component\\Finder\\' => array($vendorDir . '/symfony/finder'),
    'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
    'Symfony\\Component\\EventDispatcher\\' => array($vendorDir . '/symfony/event-dispatcher'),
-    'Symfony\\Component\\DependencyInjection\\' => array($vendorDir . '/symfony/dependency-injection'),
    'Symfony\\Component\\Debug\\' => array($vendorDir . '/symfony/debug'),
    'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'),
-    'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
-    'SelfUpdate\\' => array($vendorDir . '/consolidation/self-update/src'),
    'Robo\\' => array($vendorDir . '/consolidation/robo/src'),
    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
    'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
    'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
-    'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src/Prophecy'),
-    'Predis\\' => array($vendorDir . '/predis/predis/src'),
-    'PDepend\\' => array($vendorDir . '/pdepend/pdepend/src/main/php/PDepend'),
    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
    'League\\Container\\' => array($vendorDir . '/league/container/src'),
    'Interop\\Container\\' => array($vendorDir . '/container-interop/container-interop/src/Interop/Container'),
@@ -48,9 +36,8 @@ return array(
    'Gettext\\Languages\\' => array($vendorDir . '/gettext/languages/src'),
    'Gettext\\' => array($vendorDir . '/gettext/gettext/src'),
    'Firebase\\JWT\\' => array($vendorDir . '/firebase/php-jwt/src'),
-    'Egulias\\EmailValidator\\' => array($vendorDir . '/egulias/email-validator/src'),
+    'Egulias\\EmailValidator\\' => array($vendorDir . '/egulias/email-validator/EmailValidator'),
    'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'),
-    'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib/Doctrine/Common/Lexer'),
    'DeepCopy\\' => array($vendorDir . '/myclabs/deep-copy/src/DeepCopy'),
    'Consolidation\\OutputFormatters\\' => array($vendorDir . '/consolidation/output-formatters/src'),
    'Consolidation\\Log\\' => array($vendorDir . '/consolidation/log/src'),
--- a/core/lib/composer/vendor/composer/autoload_real.php
+++ b/core/lib/composer/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@

 // autoload_real.php @generated by Composer

-class ComposerAutoloaderInit5bce11e11de2274869867527dbd4b40e
+class ComposerAutoloaderInit6d4a28cd96a5bc5d5b97781c062572d9
 {
    private static $loader;

@@ -19,9 +19,9 @@ class ComposerAutoloaderInit5bce11e11de2274869867527dbd4b40e
            return self::$loader;
        }

-        spl_autoload_register(array('ComposerAutoloaderInit5bce11e11de2274869867527dbd4b40e', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit6d4a28cd96a5bc5d5b97781c062572d9', 'loadClassLoader'), true, true);
        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit5bce11e11de2274869867527dbd4b40e', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit6d4a28cd96a5bc5d5b97781c062572d9', 'loadClassLoader'));

        $includePaths = require __DIR__ . '/include_paths.php';
        $includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit5bce11e11de2274869867527dbd4b40e
        if ($useStaticLoader) {
            require_once __DIR__ . '/autoload_static.php';

-            call_user_func(\Composer\Autoload\ComposerStaticInit5bce11e11de2274869867527dbd4b40e::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit6d4a28cd96a5bc5d5b97781c062572d9::getInitializer($loader));
        } else {
            $map = require __DIR__ . '/autoload_namespaces.php';
            foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit5bce11e11de2274869867527dbd4b40e
        $loader->register(true);

        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit5bce11e11de2274869867527dbd4b40e::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit6d4a28cd96a5bc5d5b97781c062572d9::$files;
        } else {
            $includeFiles = require __DIR__ . '/autoload_files.php';
        }
        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire5bce11e11de2274869867527dbd4b40e($fileIdentifier, $file);
+            composerRequire6d4a28cd96a5bc5d5b97781c062572d9($fileIdentifier, $file);
        }

        return $loader;
    }
 }

-function composerRequire5bce11e11de2274869867527dbd4b40e($fileIdentifier, $file)
+function composerRequire6d4a28cd96a5bc5d5b97781c062572d9($fileIdentifier, $file)
 {
    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
        require $file;
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`../core/lib/composer/vendor/gettext/languages/bin/export-plural-rules`
				`@@ -1 +0,0 @@`
				`../core/lib/composer/vendor/cebe/markdown/bin/markdown`
				`@@ -1 +0,0 @@`
				`../core/lib/composer/vendor/pdepend/pdepend/src/bin/pdepend`
				`@@ -1 +0,0 @@`
				`../core/lib/composer/vendor/mayflower/php-codebrowser/bin/phpcb`
				`@@ -1 +0,0 @@`
				`../core/lib/composer/vendor/squizlabs/php_codesniffer/scripts/phpcbf`
				`@@ -1 +0,0 @@`
				`../core/lib/composer/vendor/sebastian/phpcpd/composer/bin/phpcpd`
				`@@ -1 +0,0 @@`
				`../core/lib/composer/vendor/phploc/phploc/phploc`
				`@@ -1 +0,0 @@`
				`../core/lib/composer/vendor/phpmd/phpmd/src/bin/phpmd`
				`@@ -1 +0,0 @@`
				`../core/lib/composer/vendor/phpunit/phpunit/phpunit`
				`@@ -1 +0,0 @@`
				`../core/lib/composer/vendor/consolidation/self-update/scripts/release`