Merge pull request #120 in ZP/z-push from feature/ZP-682-Composer-Auto-include to develop

* commit 'daf481e5':
  ZP-682 Compare the configured LOGBACKEND lowercase.
  ZP-682 "filelog" and "syslog" classes can not be found by autoloader (because they are in camel case and not lowercase). Rewriting the backend loaded by ZLog to the class name, as this is more end-user friendly. Throwing a FatalNotImplementedException causes a recursion that eats up all available memory before it fails, as that exception tries to log which then throws the exception again.
  ZP-682 updated classmap for CalDav and CardDav backends. Removed includes from the backends.
  ZP-682 Never commit composer binary. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-682 Composer - AutoInclude. Released under the Affero GNU General Public License (AGPL) version 3.

composer.json

@@ -5,6 +5,6 @@
 	"homepage": "http://z-push.org/",
 	"license": "AGPL-3.0",
 	"require": {
-		"php": ">=5.2.0"
+		"php": ">=5.4.0"
 	}
 }

src/.gitignore

+composer.phar

src/DEVELOPMENT

+After creating a new file or removing an existing one you must refresh the autoload code.
+
+curl -sS https://getcomposer.org/installer | php
+php composer.phar dump-autoload -o

src/autodiscover/autodiscover.php

@@ -41,21 +41,8 @@
 * Consult LICENSE file for details
 ************************************************/
 
-include_once('../lib/core/zpushdefs.php');
-include_once('../lib/exceptions/exceptions.php');
-include_once('../lib/utils/compat.php');
-include_once('../lib/utils/utils.php');
-include_once('../lib/core/zpush.php');
-include_once('../lib/core/zlog.php');
-include_once('../lib/interface/ibackend.php');
-include_once('../lib/interface/ichanges.php');
-include_once('../lib/interface/iexportchanges.php');
-include_once('../lib/interface/iimportchanges.php');
-include_once('../lib/interface/isearchprovider.php');
-include_once('../lib/interface/istatemachine.php');
-include_once('../lib/request/request.php');
-include_once('../version.php');
-include_once('config.php');
+require_once '../vendor/autoload.php';
+require_once '../config.php';
 
 class ZPushAutodiscover {
     const ACCEPTABLERESPONSESCHEMA = 'http://schemas.microsoft.com/exchange/autodiscover/mobilesync/responseschema/2006';

src/backend/caldav/caldav.php

@@ -45,10 +45,6 @@
 
 // config file
 require_once("backend/caldav/config.php");
-// TODO: remove this after ZP-682 merge
-require_once("include/z_caldav.php");
-require_once("include/iCalendar.php");
-require_once("include/z_RTF.php");
 
 class BackendCalDAV extends BackendDiff {
     /**

src/backend/carddav/carddav.php

@@ -43,8 +43,6 @@
 
 // config file
 require_once("backend/carddav/config.php");
-// TODO: remove this after ZP-682 merge
-require_once("include/z_carddav.php");
 
 class BackendCardDAV extends BackendDiff implements ISearchProvider {
 

src/composer.json

+{
+    "autoload": {
+        "classmap": ["autodiscover/", "include/", "lib/"],
+        "files": ["version.php", "lib/core/zpushdefs.php", "lib/utils/compat.php"]
+    }
+}

src/index.php

@@ -54,84 +54,10 @@ else {
 // ignore user abortions because this can lead to weird errors - see ZP-239
 ignore_user_abort(true);
 
-include_once('lib/exceptions/exceptions.php');
-include_once('lib/utils/utils.php');
-include_once('lib/utils/compat.php');
-include_once('lib/utils/timezoneutil.php');
-include_once('lib/utils/stringstreamwrapper.php');
-include_once('lib/core/zpushdefs.php');
-include_once('lib/core/stateobject.php');
-include_once('lib/core/interprocessdata.php');
-include_once('lib/core/pingtracking.php');
-include_once('lib/core/topcollector.php');
-include_once('lib/core/loopdetection.php');
-include_once('lib/core/asdevice.php');
-include_once('lib/core/statemanager.php');
-include_once('lib/core/devicemanager.php');
-include_once('lib/core/zpush.php');
-include_once('lib/core/zlog.php');
-include_once('lib/log/log.php');
-include_once('lib/log/filelog.php');
-include_once('lib/log/syslog.php');
-include_once('lib/interface/ibackend.php');
-include_once('lib/interface/ichanges.php');
-include_once('lib/interface/iexportchanges.php');
-include_once('lib/interface/iimportchanges.php');
-include_once('lib/interface/isearchprovider.php');
-include_once('lib/interface/istatemachine.php');
-include_once('lib/core/streamer.php');
-include_once('lib/core/streamimporter.php');
-include_once('lib/core/synccollections.php');
-include_once('lib/core/hierarchycache.php');
-include_once('lib/core/changesmemorywrapper.php');
-include_once('lib/core/syncparameters.php');
-include_once('lib/core/bodypreference.php');
-include_once('lib/core/contentparameters.php');
-include_once('lib/wbxml/wbxmldefs.php');
-include_once('lib/wbxml/wbxmldecoder.php');
-include_once('lib/wbxml/wbxmlencoder.php');
-include_once('lib/syncobjects/syncobject.php');
-include_once('lib/syncobjects/syncbasebody.php');
-include_once('lib/syncobjects/syncbaseattachment.php');
-include_once('lib/syncobjects/syncmailflags.php');
-include_once('lib/syncobjects/syncrecurrence.php');
-include_once('lib/syncobjects/syncappointment.php');
-include_once('lib/syncobjects/syncappointmentexception.php');
-include_once('lib/syncobjects/syncattachment.php');
-include_once('lib/syncobjects/syncattendee.php');
-include_once('lib/syncobjects/syncmeetingrequestrecurrence.php');
-include_once('lib/syncobjects/syncmeetingrequest.php');
-include_once('lib/syncobjects/syncmail.php');
-include_once('lib/syncobjects/syncnote.php');
-include_once('lib/syncobjects/synccontact.php');
-include_once('lib/syncobjects/syncfolder.php');
-include_once('lib/syncobjects/syncprovisioning.php');
-include_once('lib/syncobjects/synctaskrecurrence.php');
-include_once('lib/syncobjects/synctask.php');
-include_once('lib/syncobjects/syncoofmessage.php');
-include_once('lib/syncobjects/syncoof.php');
-include_once('lib/syncobjects/syncuserinformation.php');
-include_once('lib/syncobjects/syncdeviceinformation.php');
-include_once('lib/syncobjects/syncdevicepassword.php');
-include_once('lib/syncobjects/syncitemoperationsattachment.php');
-include_once('lib/syncobjects/syncsendmail.php');
-include_once('lib/syncobjects/syncsendmailsource.php');
-include_once('lib/syncobjects/syncvalidatecert.php');
-include_once('lib/syncobjects/syncresolverecipients.php');
-include_once('lib/syncobjects/syncresolverecipient.php');
-include_once('lib/syncobjects/syncresolverecipientsresponse.php');
-include_once('lib/syncobjects/syncresolverecipientsoptions.php');
-include_once('lib/syncobjects/syncresolverecipientsavailability.php');
-include_once('lib/syncobjects/syncresolverecipientscertificates.php');
-include_once('lib/syncobjects/syncresolverecipientspicture.php');
-include_once('lib/default/backend.php');
-include_once('lib/default/searchprovider.php');
-include_once('lib/request/request.php');
-include_once('lib/request/requestprocessor.php');
+require_once 'vendor/autoload.php';
 
 if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
 include_once(ZPUSH_CONFIG);
-include_once('version.php');
 
 
     // Attempt to set maximum execution time

src/lib/core/zlog.php

@@ -161,9 +161,12 @@ class ZLog {
     static private function getLogger() {
         if (!self::$logger) {
             global $specialLogUsers; // This variable comes from the configuration file (config.php)
-            $logger = LOGBACKEND;
+
+            $logger = LOGBACKEND_CLASS;
             if (!class_exists($logger)) {
-                throw new FatalNotImplementedException('The logging class `'.$logger.'` does not exist.');
+                $errmsg = 'The configured logging class `'.$logger.'` does not exist. Check your configuration.';
+                error_log($errmsg);
+                throw new \Exception($errmsg);
             }
 
             list($user) = Utils::SplitDomainUser(strtolower(Request::GetGETUser()));

src/lib/core/zpush.php

@@ -224,8 +224,8 @@ class ZPush {
             define('LOGBACKEND', 'filelog');
         }
 
-        if (LOGBACKEND == 'syslog') {
-
+        if (strtolower(LOGBACKEND) == 'syslog') {
+            define('LOGBACKEND_CLASS', 'Syslog');
             if (!defined('LOG_SYSLOG_FACILITY')) {
                 define('LOG_SYSLOG_FACILITY', LOG_LOCAL0);
             }
@@ -250,8 +250,8 @@ class ZPush {
                 throw new FatalMisconfigurationException("LOG_SYSLOG_HOST is defined but the LOG_SYSLOG_PORT does not seem to be valid.");
             }
         }
-        elseif (LOGBACKEND == 'filelog') {
-
+        elseif (strtolower(LOGBACKEND) == 'filelog') {
+            define('LOGBACKEND_CLASS', 'FileLog');
             if (!defined('LOGFILEDIR'))
                 throw new FatalMisconfigurationException("The LOGFILEDIR is not configured. Check if the config.php file is in place.");
 
@@ -271,6 +271,9 @@ class ZPush {
             Utils::FixFileOwner(LOGFILE);
             Utils::FixFileOwner(LOGERRORFILE);
         }
+        else {
+            define('LOGBACKEND_CLASS', LOGBACKEND);
+        }
 
         // set time zone
         // code contributed by Robert Scheck (rsc)
@@ -397,7 +400,6 @@ class ZPush {
             }
             else {
                 // Initialize the default StateMachine
-                include_once('lib/default/filestatemachine.php');
                 ZPush::$stateMachine = new FileStateMachine();
             }
 

src/lib/default/diffbackend/diffbackend.php

@@ -51,15 +51,6 @@
 * Consult LICENSE file for details
 ************************************************/
 
-// default backend
-include_once('lib/default/backend.php');
-
-// DiffBackend components
-include_once('diffstate.php');
-include_once('importchangesdiff.php');
-include_once('exportchangesdiff.php');
-
-
 abstract class BackendDiff extends Backend {
     protected $store;
 

src/lib/default/filestatemachine.php

@@ -209,7 +209,6 @@ class FileStateMachine implements IStateMachine {
      * @return boolean     indicating if the user was added or not (existed already)
      */
     public function LinkUserDevice($username, $devid) {
-        include_once("simplemutex.php");
         $mutex = new SimpleMutex();
         $changed = false;
 
@@ -254,7 +253,6 @@ class FileStateMachine implements IStateMachine {
      * @return boolean
      */
     public function UnLinkUserDevice($username, $devid) {
-        include_once("simplemutex.php");
         $mutex = new SimpleMutex();
         $changed = false;
 

src/lib/exceptions/exceptions.php

-<?php
-/***********************************************
-* File      :   exceptions.php
-* Project   :   Z-Push
-* Descr     :   Includes all Z-Push exceptions
-*
-* Created   :   06.02.2012
-*
-* Copyright 2007 - 2013 Zarafa Deutschland GmbH
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Affero General Public License, version 3,
-* as published by the Free Software Foundation with the following additional
-* term according to sec. 7:
-*
-* According to sec. 7 of the GNU Affero General Public License, version 3,
-* the terms of the AGPL are supplemented with the following terms:
-*
-* "Zarafa" is a registered trademark of Zarafa B.V.
-* "Z-Push" is a registered trademark of Zarafa Deutschland GmbH
-* The licensing of the Program under the AGPL does not imply a trademark license.
-* Therefore any rights, title and interest in our trademarks remain entirely with us.
-*
-* However, if you propagate an unmodified version of the Program you are
-* allowed to use the term "Z-Push" to indicate that you distribute the Program.
-* Furthermore you may use our trademarks where it is necessary to indicate
-* the intended purpose of a product or service provided you use it in accordance
-* with honest practices in industrial or commercial matters.
-* If you want to propagate modified versions of the Program under the name "Z-Push",
-* you may only do so if you have a written permission by Zarafa Deutschland GmbH
-* (to acquire a permission please contact Zarafa at trademark@zarafa.com).
-*
-* 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 Affero General Public License for more details.
-*
-* You should have received a copy of the GNU Affero General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* Consult LICENSE file for details
-************************************************/
-
-// main exception
-include_once('zpushexception.php');
-
-// Fatal exceptions
-include_once('fatalexception.php');
-include_once('fatalmisconfigurationexception.php');
-include_once('fatalnotimplementedexception.php');
-include_once('wbxmlexception.php');
-include_once('nopostrequestexception.php');
-include_once('httpreturncodeexception.php');
-include_once('authenticationrequiredexception.php');
-include_once('provisioningrequiredexception.php');
-
-// Non fatal exceptions
-include_once('notimplementedexception.php');
-include_once('syncobjectbrokenexception.php');
-include_once('statusexception.php');
-include_once('statenotfoundexception.php');
-include_once('stateinvalidexception.php');
-include_once('nohierarchycacheavailableexception.php');
-include_once('statenotyetavailableexception.php');

src/lib/wbxml/wbxmlencoder.php

@@ -194,7 +194,6 @@ class WBXMLEncoder extends WBXMLDefs {
      */
     public function contentStream($stream, $asBase64 = false) {
         if (!$asBase64) {
-            include_once('lib/wbxml/replacenullcharfilter.php');
             $rnc_filter = stream_filter_append($stream, 'replacenullchar');
         }
 

src/lib/webservice/webservice.php

@@ -67,8 +67,6 @@ class Webservice {
         // the webservice command is handled by its class
         if ($commandCode == ZPush::COMMAND_WEBSERVICE_DEVICE) {
             ZLog::Write(LOGLEVEL_DEBUG, sprintf("Webservice::HandleWebservice('%s'): executing WebserviceDevice service", $commandCode));
-
-            include_once('webservicedevice.php');
             $this->server->setClass("WebserviceDevice");
         }
 
@@ -82,7 +80,6 @@ class Webservice {
             if(ZPush::GetBackend()->Setup("SYSTEM", true) == false)
                 throw new AuthenticationRequiredException(sprintf("User '%s' has no admin privileges", Request::GetAuthUser()));
 
-            include_once('webserviceusers.php');
             $this->server->setClass("WebserviceUsers");
         }
 

src/vendor/autoload.php

+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer' . '/autoload_real.php';
+
+return ComposerAutoloaderInitd6749fc2fb9944bbe86b2b7d79a7852f::getLoader();

src/vendor/composer/LICENSE

+
+Copyright (c) 2015 Nils Adermann, Jordi Boggiano
+
+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:
+
+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.
+

src/vendor/composer/autoload_classmap.php

+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+    'ASDevice' => $baseDir . '/lib/core/asdevice.php',
+    'AuthenticationRequiredException' => $baseDir . '/lib/exceptions/authenticationrequiredexception.php',
+    'Backend' => $baseDir . '/lib/default/backend.php',
+    'BackendDiff' => $baseDir . '/lib/default/diffbackend/diffbackend.php',
+    'BodyPreference' => $baseDir . '/lib/core/bodypreference.php',
+    'CalDAVClient' => $baseDir . '/include/z_caldav.php',
+    'CalendarInfo' => $baseDir . '/include/z_caldav.php',
+    'ChangesMemoryWrapper' => $baseDir . '/lib/core/changesmemorywrapper.php',
+    'ContentParameters' => $baseDir . '/lib/core/contentparameters.php',
+    'DeviceManager' => $baseDir . '/lib/core/devicemanager.php',
+    'DiffState' => $baseDir . '/lib/default/diffbackend/diffstate.php',
+    'ExportChangesDiff' => $baseDir . '/lib/default/diffbackend/exportchangesdiff.php',
+    'FatalException' => $baseDir . '/lib/exceptions/fatalexception.php',
+    'FatalMisconfigurationException' => $baseDir . '/lib/exceptions/fatalmisconfigurationexception.php',
+    'FatalNotImplementedException' => $baseDir . '/lib/exceptions/fatalnotimplementedexception.php',
+    'FileLog' => $baseDir . '/lib/log/filelog.php',
+    'FileStateMachine' => $baseDir . '/lib/default/filestatemachine.php',
+    'FolderChange' => $baseDir . '/lib/request/folderchange.php',
+    'FolderSync' => $baseDir . '/lib/request/foldersync.php',
+    'GetAttachment' => $baseDir . '/lib/request/getattachment.php',
+    'GetHierarchy' => $baseDir . '/lib/request/gethierarchy.php',
+    'GetItemEstimate' => $baseDir . '/lib/request/getitemestimate.php',
+    'HTTPReturnCodeException' => $baseDir . '/lib/exceptions/httpreturncodeexception.php',
+    'HierarchyCache' => $baseDir . '/lib/core/hierarchycache.php',
+    'IBackend' => $baseDir . '/lib/interface/ibackend.php',
+    'IChanges' => $baseDir . '/lib/interface/ichanges.php',
+    'IExportChanges' => $baseDir . '/lib/interface/iexportchanges.php',
+    'IImportChanges' => $baseDir . '/lib/interface/iimportchanges.php',
+    'ISearchProvider' => $baseDir . '/lib/interface/isearchprovider.php',
+    'IStateMachine' => $baseDir . '/lib/interface/istatemachine.php',
+    'ImportChangesDiff' => $baseDir . '/lib/default/diffbackend/importchangesdiff.php',
+    'ImportChangesStream' => $baseDir . '/lib/core/streamimporter.php',
+    'InterProcessData' => $baseDir . '/lib/core/interprocessdata.php',
+    'ItemOperations' => $baseDir . '/lib/request/itemoperations.php',
+    'Log' => $baseDir . '/lib/log/log.php',
+    'LoopDetection' => $baseDir . '/lib/core/loopdetection.php',
+    'Mail_RFC822' => $baseDir . '/include/z_RFC822.php',
+    'Mail_mimeDecode' => $baseDir . '/include/mimeDecode.php',
+    'MeetingResponse' => $baseDir . '/lib/request/meetingresponse.php',
+    'MoveItems' => $baseDir . '/lib/request/moveitems.php',
+    'NoHierarchyCacheAvailableException' => $baseDir . '/lib/exceptions/nohierarchycacheavailableexception.php',
+    'NoPostRequestException' => $baseDir . '/lib/exceptions/nopostrequestexception.php',
+    'NotImplementedException' => $baseDir . '/lib/exceptions/notimplementedexception.php',
+    'Notify' => $baseDir . '/lib/request/notify.php',
+    'Ping' => $baseDir . '/lib/request/ping.php',
+    'PingTracking' => $baseDir . '/lib/core/pingtracking.php',
+    'Provisioning' => $baseDir . '/lib/request/provisioning.php',
+    'ProvisioningRequiredException' => $baseDir . '/lib/exceptions/provisioningrequiredexception.php',
+    'Request' => $baseDir . '/lib/request/request.php',
+    'RequestProcessor' => $baseDir . '/lib/request/requestprocessor.php',
+    'ResolveRecipients' => $baseDir . '/lib/request/resolverecipients.php',
+    'Search' => $baseDir . '/lib/request/search.php',
+    'SearchProvider' => $baseDir . '/lib/default/searchprovider.php',
+    'SendMail' => $baseDir . '/lib/request/sendmail.php',
+    'Settings' => $baseDir . '/lib/request/settings.php',
+    'SimpleMutex' => $baseDir . '/lib/default/simplemutex.php',
+    'StateInvalidException' => $baseDir . '/lib/exceptions/stateinvalidexception.php',
+    'StateManager' => $baseDir . '/lib/core/statemanager.php',
+    'StateNotFoundException' => $baseDir . '/lib/exceptions/statenotfoundexception.php',
+    'StateNotYetAvailableException' => $baseDir . '/lib/exceptions/statenotyetavailableexception.php',
+    'StateObject' => $baseDir . '/lib/core/stateobject.php',
+    'StatusException' => $baseDir . '/lib/exceptions/statusexception.php',
+    'Streamer' => $baseDir . '/lib/core/streamer.php',
+    'StringStreamWrapper' => $baseDir . '/lib/utils/stringstreamwrapper.php',
+    'Sync' => $baseDir . '/lib/request/sync.php',
+    'SyncAppointment' => $baseDir . '/lib/syncobjects/syncappointment.php',
+    'SyncAppointmentException' => $baseDir . '/lib/syncobjects/syncappointmentexception.php',
+    'SyncAttachment' => $baseDir . '/lib/syncobjects/syncattachment.php',
+    'SyncAttendee' => $baseDir . '/lib/syncobjects/syncattendee.php',
+    'SyncBaseAttachment' => $baseDir . '/lib/syncobjects/syncbaseattachment.php',
+    'SyncBaseBody' => $baseDir . '/lib/syncobjects/syncbasebody.php',
+    'SyncCollections' => $baseDir . '/lib/core/synccollections.php',
+    'SyncContact' => $baseDir . '/lib/syncobjects/synccontact.php',
+    'SyncDeviceInformation' => $baseDir . '/lib/syncobjects/syncdeviceinformation.php',
+    'SyncDevicePassword' => $baseDir . '/lib/syncobjects/syncdevicepassword.php',
+    'SyncFolder' => $baseDir . '/lib/syncobjects/syncfolder.php',
+    'SyncItemOperationsAttachment' => $baseDir . '/lib/syncobjects/syncitemoperationsattachment.php',
+    'SyncMail' => $baseDir . '/lib/syncobjects/syncmail.php',
+    'SyncMailFlags' => $baseDir . '/lib/syncobjects/syncmailflags.php',
+    'SyncMeetingRequest' => $baseDir . '/lib/syncobjects/syncmeetingrequest.php',
+    'SyncMeetingRequestRecurrence' => $baseDir . '/lib/syncobjects/syncmeetingrequestrecurrence.php',
+    'SyncNote' => $baseDir . '/lib/syncobjects/syncnote.php',
+    'SyncOOF' => $baseDir . '/lib/syncobjects/syncoof.php',
+    'SyncOOFMessage' => $baseDir . '/lib/syncobjects/syncoofmessage.php',
+    'SyncObject' => $baseDir . '/lib/syncobjects/syncobject.php',
+    'SyncObjectBrokenException' => $baseDir . '/lib/exceptions/syncobjectbrokenexception.php',
+    'SyncParameters' => $baseDir . '/lib/core/syncparameters.php',
+    'SyncProvisioning' => $baseDir . '/lib/syncobjects/syncprovisioning.php',
+    'SyncRecurrence' => $baseDir . '/lib/syncobjects/syncrecurrence.php',
+    'SyncResolveRecipient' => $baseDir . '/lib/syncobjects/syncresolverecipient.php',
+    'SyncResolveRecipients' => $baseDir . '/lib/syncobjects/syncresolverecipients.php',
+    'SyncResolveRecipientsAvailability' => $baseDir . '/lib/syncobjects/syncresolverecipientsavailability.php',
+    'SyncResolveRecipientsCertificates' => $baseDir . '/lib/syncobjects/syncresolverecipientscertificates.php',
+    'SyncResolveRecipientsOptions' => $baseDir . '/lib/syncobjects/syncresolverecipientsoptions.php',
+    'SyncResolveRecipientsPicture' => $baseDir . '/lib/syncobjects/syncresolverecipientspicture.php',
+    'SyncResolveRecipientsResponse' => $baseDir . '/lib/syncobjects/syncresolverecipientsresponse.php',
+    'SyncSendMail' => $baseDir . '/lib/syncobjects/syncsendmail.php',
+    'SyncSendMailSource' => $baseDir . '/lib/syncobjects/syncsendmailsource.php',
+    'SyncTask' => $baseDir . '/lib/syncobjects/synctask.php',
+    'SyncTaskRecurrence' => $baseDir . '/lib/syncobjects/synctaskrecurrence.php',
+    'SyncUserInformation' => $baseDir . '/lib/syncobjects/syncuserinformation.php',
+    'SyncValidateCert' => $baseDir . '/lib/syncobjects/syncvalidatecert.php',
+    'Syslog' => $baseDir . '/lib/log/syslog.php',
+    'TimezoneUtil' => $baseDir . '/lib/utils/timezoneutil.php',
+    'TopCollector' => $baseDir . '/lib/core/topcollector.php',
+    'Utils' => $baseDir . '/lib/utils/utils.php',
+    'ValidateCert' => $baseDir . '/lib/request/validatecert.php',
+    'WBXMLDecoder' => $baseDir . '/lib/wbxml/wbxmldecoder.php',
+    'WBXMLDefs' => $baseDir . '/lib/wbxml/wbxmldefs.php',
+    'WBXMLEncoder' => $baseDir . '/lib/wbxml/wbxmlencoder.php',
+    'WBXMLException' => $baseDir . '/lib/exceptions/wbxmlexception.php',
+    'Webservice' => $baseDir . '/lib/webservice/webservice.php',
+    'WebserviceDevice' => $baseDir . '/lib/webservice/webservicedevice.php',
+    'WebserviceUsers' => $baseDir . '/lib/webservice/webserviceusers.php',
+    'ZLog' => $baseDir . '/lib/core/zlog.php',
+    'ZPush' => $baseDir . '/lib/core/zpush.php',
+    'ZPushAdmin' => $baseDir . '/lib/utils/zpushadmin.php',
+    'ZPushAutodiscover' => $baseDir . '/autodiscover/autodiscover.php',
+    'ZPushException' => $baseDir . '/lib/exceptions/zpushexception.php',
+    'carddav_backend' => $baseDir . '/include/z_carddav.php',
+    'iCalComponent' => $baseDir . '/include/iCalendar.php',
+    'iCalProp' => $baseDir . '/include/iCalendar.php',
+    'iCalendar' => $baseDir . '/include/iCalendar.php',
+    'replace_nullchar_filter' => $baseDir . '/lib/wbxml/replacenullcharfilter.php',
+    'rtf' => $baseDir . '/include/z_RTF.php',
+);

src/vendor/composer/autoload_files.php

+<?php
+
+// autoload_files.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+    '158e247719544c05f5e89c414f630c24' => $baseDir . '/version.php',
+    '7e65a9fc8bb44d8c2fe16fa283aeaaee' => $baseDir . '/lib/core/zpushdefs.php',
+    'd2a63a53b4a43a2bd71de0cec5c1abfb' => $baseDir . '/lib/utils/compat.php',
+);

src/vendor/composer/autoload_namespaces.php

+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);

src/vendor/composer/autoload_psr4.php

+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);

src/vendor/composer/autoload_real.php

+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInitd6749fc2fb9944bbe86b2b7d79a7852f
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInitd6749fc2fb9944bbe86b2b7d79a7852f', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        spl_autoload_unregister(array('ComposerAutoloaderInitd6749fc2fb9944bbe86b2b7d79a7852f', 'loadClassLoader'));
+
+        $map = require __DIR__ . '/autoload_namespaces.php';
+        foreach ($map as $namespace => $path) {
+            $loader->set($namespace, $path);
+        }
+
+        $map = require __DIR__ . '/autoload_psr4.php';
+        foreach ($map as $namespace => $path) {
+            $loader->setPsr4($namespace, $path);
+        }
+
+        $classMap = require __DIR__ . '/autoload_classmap.php';
+        if ($classMap) {
+            $loader->addClassMap($classMap);
+        }
+
+        $loader->register(true);
+
+        $includeFiles = require __DIR__ . '/autoload_files.php';
+        foreach ($includeFiles as $fileIdentifier => $file) {
+            composerRequired6749fc2fb9944bbe86b2b7d79a7852f($fileIdentifier, $file);
+        }
+
+        return $loader;
+    }
+}
+
+function composerRequired6749fc2fb9944bbe86b2b7d79a7852f($fileIdentifier, $file)
+{
+    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+        require $file;
+
+        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+    }
+}

src/z-push-admin.php

@@ -44,60 +44,10 @@
 * Consult LICENSE file for details
 ************************************************/
 
-include('lib/core/zpushdefs.php');
-include('lib/core/zpush.php');
-include('lib/core/stateobject.php');
-include('lib/core/syncparameters.php');
-include('lib/core/bodypreference.php');
-include('lib/core/contentparameters.php');
-include('lib/core/synccollections.php');
-include('lib/core/zlog.php');
-include('lib/core/statemanager.php');
-include('lib/core/streamer.php');
-include('lib/core/asdevice.php');
-include('lib/core/interprocessdata.php');
-include('lib/core/loopdetection.php');
-include('lib/log/log.php');
-include('lib/log/filelog.php');
-include('lib/log/syslog.php');
-include('lib/exceptions/exceptions.php');
-include('lib/utils/utils.php');
-include('lib/utils/zpushadmin.php');
-include('lib/request/request.php');
-include('lib/request/requestprocessor.php');
-include('lib/interface/ibackend.php');
-include('lib/interface/ichanges.php');
-include('lib/interface/iexportchanges.php');
-include('lib/interface/iimportchanges.php');
-include('lib/interface/isearchprovider.php');
-include('lib/interface/istatemachine.php');
-include('lib/syncobjects/syncobject.php');
-include('lib/syncobjects/syncbasebody.php');
-include('lib/syncobjects/syncbaseattachment.php');
-include('lib/syncobjects/syncmailflags.php');
-include('lib/syncobjects/syncrecurrence.php');
-include('lib/syncobjects/syncappointment.php');
-include('lib/syncobjects/syncappointmentexception.php');
-include('lib/syncobjects/syncattachment.php');
-include('lib/syncobjects/syncattendee.php');
-include('lib/syncobjects/syncmeetingrequestrecurrence.php');
-include('lib/syncobjects/syncmeetingrequest.php');
-include('lib/syncobjects/syncmail.php');
-include('lib/syncobjects/syncnote.php');
-include('lib/syncobjects/synccontact.php');
-include('lib/syncobjects/syncfolder.php');
-include('lib/syncobjects/syncprovisioning.php');
-include('lib/syncobjects/synctaskrecurrence.php');
-include('lib/syncobjects/synctask.php');
-include('lib/syncobjects/syncoofmessage.php');
-include('lib/syncobjects/syncoof.php');
-include('lib/syncobjects/syncuserinformation.php');
-include('lib/syncobjects/syncdeviceinformation.php');
-include('lib/syncobjects/syncdevicepassword.php');
-include('lib/syncobjects/syncitemoperationsattachment.php');
+require_once 'vendor/autoload.php';
+
 if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
 include_once(ZPUSH_CONFIG);
-include('version.php');
 
 /**
  * //TODO resync of single folders of a users device

src/z-push-top.php

@@ -44,21 +44,10 @@
 * Consult LICENSE file for details
 ************************************************/
 
-include('lib/exceptions/exceptions.php');
-include('lib/core/zpushdefs.php');
-include('lib/core/zpush.php');
-include('lib/core/zlog.php');
-include('lib/core/interprocessdata.php');
-include('lib/core/topcollector.php');
-include('lib/log/log.php');
-include('lib/log/filelog.php');
-include('lib/log/syslog.php');
-include('lib/utils/utils.php');
-include('lib/request/request.php');
-include('lib/request/requestprocessor.php');
+require_once 'vendor/autoload.php';
+
 if (!defined('ZPUSH_CONFIG')) define('ZPUSH_CONFIG', 'config.php');
 include_once(ZPUSH_CONFIG);
-include('version.php');
 
 /************************************************
  * MAIN