Merge pull request #197 in ZP/z-push from...

Merge pull request #197 in ZP/z-push from feature/ZP-821-integrate-autoloading-for-backends to develop

* commit 'e516b7ed':
  ZP-821 Updated composer.json to include backend folder, removed includes from Combined, IMAP, MailDir, VCardDir and Zarafa backends, removed includes from Zarafa's subcomponents, removed include in InterProcessData, added config include to IpcMemcachedProvider, fixed typo in StringStreamWrapper, fixed typos of MAPIStreamWrapper.

src/backend/combined/combined.php

@@ -49,13 +49,8 @@
 * Consult LICENSE file for details
 ************************************************/
 
-// default backend
-include_once('lib/default/backend.php');
-
 //include the CombinedBackend's own config file
 require_once("backend/combined/config.php");
-require_once("backend/combined/importer.php");
-require_once("backend/combined/exporter.php");
 
 class BackendCombined extends Backend implements ISearchProvider {
     public $config;

src/backend/imap/imap.php

@@ -46,11 +46,6 @@
 // config file
 require_once("backend/imap/config.php");
 
-include_once('lib/default/diffbackend/diffbackend.php');
-include_once('include/mimeDecode.php');
-require_once('include/z_RFC822.php');
-
-
 class BackendIMAP extends BackendDiff {
     protected $wasteID;
     protected $sentID;

src/backend/ipcmemcached/ipcmemcachedprovider.php

@@ -42,6 +42,8 @@
 *
 * Consult LICENSE file for details
 ************************************************/
+//include own config file
+require_once("backend/ipcmemcached/config.php");
 
 class IpcMemcachedProvider implements IIpcProvider {
     protected $type;

src/backend/maildir/maildir.php

@@ -56,10 +56,6 @@
 // config file
 require_once("backend/maildir/config.php");
 
-include_once('lib/default/diffbackend/diffbackend.php');
-include_once('include/mimeDecode.php');
-require_once('include/z_RFC822.php');
-
 class BackendMaildir extends BackendDiff {
     /**----------------------------------------------------------------------------------------------------------
      * default backend methods

src/backend/vcarddir/vcarddir.php

@@ -44,8 +44,6 @@
 // config file
 require_once("backend/vcarddir/config.php");
 
-include_once('lib/default/diffbackend/diffbackend.php');
-
 class BackendVCardDir extends BackendDiff {
     /**----------------------------------------------------------------------------------------------------------
      * default backend methods

src/backend/zarafa/mapi/class.freebusypublish.php

@@ -49,8 +49,6 @@
  */
 
 
-include_once('backend/zarafa/mapi/class.recurrence.php');
-
 class FreeBusyPublish {
 
     var $session;

src/backend/zarafa/mapi/class.recurrence.php

@@ -48,8 +48,6 @@
  *
  */
 
-    include_once('backend/zarafa/mapi/class.baserecurrence.php');
-
     /**
      * Recurrence
      * @author Steve Hardy <steve@zarafa.com>

src/backend/zarafa/mapi/class.taskrecurrence.php

@@ -48,9 +48,6 @@
  *
  */
 
-
-    require_once("backend/zarafa/mapi/class.baserecurrence.php");
-
     class TaskRecurrence extends BaseRecurrence
     {
         /**

src/backend/zarafa/mapiprovider.php

@@ -2458,12 +2458,12 @@ class MAPIProvider {
                 if (Request::GetProtocolVersion() >= 12.0) {
                     if (!isset($message->asbody))
                         $message->asbody = new SyncBaseBody();
-                    $message->asbody->data = MapiStreamWrapper::Open($stream);
+                    $message->asbody->data = MAPIStreamWrapper::Open($stream);
                     $message->asbody->estimatedDataSize = $streamsize;
                     $message->asbody->truncated = 0;
                 }
                 else {
-                    $message->mimedata = MapiStreamWrapper::Open($stream);
+                    $message->mimedata = MAPIStreamWrapper::Open($stream);
                     $message->mimesize = $streamsize;
                     $message->mimetruncated = 0;
                 }

src/backend/zarafa/zarafa.php

@@ -54,25 +54,7 @@ include_once('backend/zarafa/mapi/mapidefs.php');
 include_once('backend/zarafa/mapi/mapitags.php');
 include_once('backend/zarafa/mapi/mapicode.php');
 include_once('backend/zarafa/mapi/mapiguid.php');
-include_once('backend/zarafa/mapi/class.baseexception.php');
-include_once('backend/zarafa/mapi/class.mapiexception.php');
-include_once('backend/zarafa/mapi/class.baserecurrence.php');
-include_once('backend/zarafa/mapi/class.taskrecurrence.php');
-include_once('backend/zarafa/mapi/class.recurrence.php');
-include_once('backend/zarafa/mapi/class.meetingrequest.php');
-include_once('backend/zarafa/mapi/class.freebusypublish.php');
-
-// processing of RFC822 messages
-require_once('include/z_RFC822.php');
-
-// components of Zarafa backend
-include_once('backend/zarafa/mapiutils.php');
-include_once('backend/zarafa/mapimapping.php');
-include_once('backend/zarafa/mapiprovider.php');
-include_once('backend/zarafa/mapiphpwrapper.php');
-include_once('backend/zarafa/mapistreamwrapper.php');
-include_once('backend/zarafa/importer.php');
-include_once('backend/zarafa/exporter.php');
+
 
 //setlocale to UTF-8 in order to support properties containing Unicode characters
 setlocale(LC_CTYPE, "en_US.UTF-8");
@@ -121,7 +103,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
         $this->session = false;
         $this->folderStatCache = array();
 
-        ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendZarafa using PHP-MAPI version: %s", phpversion("mapi")));
+        ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendZarafa using PHP-MAPI version: %s - PHP version: %s", phpversion("mapi"), phpversion()));
     }
 
     /**
@@ -703,7 +685,7 @@ class BackendZarafa implements IBackend, ISearchProvider {
             throw new StatusException(sprintf("ZarafaBackend->GetAttachmentData('%s'): Error, unable to open attachment data stream: 0x%X", $attname, mapi_last_hresult()), SYNC_ITEMOPERATIONSSTATUS_INVALIDATT);
 
         // put the mapi stream into a wrapper to get a standard stream
-        $attachment->data = MapiStreamWrapper::Open($stream);
+        $attachment->data = MAPIStreamWrapper::Open($stream);
         if (isset($attprops[PR_ATTACH_MIME_TAG]))
             $attachment->contenttype = $attprops[PR_ATTACH_MIME_TAG];
         elseif (isset($attprops[PR_ATTACH_MIME_TAG_W]))

src/composer.json

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

src/lib/core/interprocessdata.php

@@ -43,9 +43,6 @@
 * Consult LICENSE file for details
 ************************************************/
 
-// TODO ZP-821 - remove when autoloading
-include_once('backend/ipcsharedmemory/ipcsharedmemoryprovider.php');
-
 abstract class InterProcessData {
     const CLEANUPTIME = 1;
 

src/lib/core/zpush.php

@@ -482,8 +482,7 @@ class ZPush {
             return false;
 
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("Including backend file: '%s'", $toLoad));
-        include_once($toLoad);
-        return true;
+        return include_once($toLoad);
     }
 
     /**
@@ -535,20 +534,19 @@ class ZPush {
 
             // if no backend provider is defined, try to include automatically
             if ($ourBackend == false || $ourBackend == "") {
-                $loaded = false;
                 foreach (self::$autoloadBackendPreference as $autoloadBackend) {
                     ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZPush::GetBackend(): trying autoload backend '%s'", $autoloadBackend));
-                    $loaded = class_exists($autoloadBackend) || self::IncludeBackend($autoloadBackend);
-                    if ($loaded) {
+                    if (class_exists($autoloadBackend)) {
                         $ourBackend = $autoloadBackend;
                         break;
                     }
                 }
-                if (!$ourBackend || !$loaded)
-                    throw new FatalMisconfigurationException("No Backend provider can not be loaded. Check your installation and configuration!");
+                if (!$ourBackend)
+                    throw new FatalMisconfigurationException("No Backend provider can be found. Check your installation and/or configuration!");
+            }
+            elseif (!class_exists($ourBackend)) {
+                spl_autoload_register('\ZPush::IncludeBackend');
             }
-            elseif (!class_exists($ourBackend))
-                self::IncludeBackend($ourBackend);
 
             if (class_exists($ourBackend))
                 ZPush::$backend = new $ourBackend();

src/lib/utils/stringstreamwrapper.php

@@ -157,7 +157,7 @@ class StringStreamWrapper {
         $this->streamlength = strlen($this->stringstream);
 
         if ($this->position > $this->streamlength) {
-            ZLog::Write(LOGLEVEL_WARN, sprintf("MAPIStreamWrapper->stream_truncate(): stream position (%d) ahead of new size of %d. Repositioning pointer to end of stream.", $this->position, $this->streamlength));
+            ZLog::Write(LOGLEVEL_WARN, sprintf("StringStreamWrapper->stream_truncate(): stream position (%d) ahead of new size of %d. Repositioning pointer to end of stream.", $this->position, $this->streamlength));
             $this->position = $this->streamlength;
         }
         return true;

src/vendor/composer/autoload_classmap.php

@@ -9,7 +9,20 @@ return array(
     'ASDevice' => $baseDir . '/lib/core/asdevice.php',
     'AuthenticationRequiredException' => $baseDir . '/lib/exceptions/authenticationrequiredexception.php',
     'Backend' => $baseDir . '/lib/default/backend.php',
+    'BackendCalDAV' => $baseDir . '/backend/caldav/caldav.php',
+    'BackendCardDAV' => $baseDir . '/backend/carddav/carddav.php',
+    'BackendCombined' => $baseDir . '/backend/combined/combined.php',
+    'BackendCombinedConfig' => $baseDir . '/backend/combined/config.php',
     'BackendDiff' => $baseDir . '/lib/default/diffbackend/diffbackend.php',
+    'BackendICS' => $baseDir . '/backend/zarafa/zarafa.php',
+    'BackendIMAP' => $baseDir . '/backend/imap/imap.php',
+    'BackendLDAP' => $baseDir . '/backend/ldap/ldap.php',
+    'BackendMaildir' => $baseDir . '/backend/maildir/maildir.php',
+    'BackendSearchLDAP' => $baseDir . '/backend/searchldap/searchldap.php',
+    'BackendVCardDir' => $baseDir . '/backend/vcarddir/vcarddir.php',
+    'BackendZarafa' => $baseDir . '/backend/zarafa/zarafa.php',
+    'BaseException' => $baseDir . '/backend/zarafa/mapi/class.baseexception.php',
+    'BaseRecurrence' => $baseDir . '/backend/zarafa/mapi/class.baserecurrence.php',
     'BodyPreference' => $baseDir . '/lib/core/bodypreference.php',
     'CalDAVClient' => $baseDir . '/include/z_caldav.php',
     'CalendarInfo' => $baseDir . '/include/z_caldav.php',
@@ -17,7 +30,9 @@ return array(
     'ContentParameters' => $baseDir . '/lib/core/contentparameters.php',
     'DeviceManager' => $baseDir . '/lib/core/devicemanager.php',
     'DiffState' => $baseDir . '/lib/default/diffbackend/diffstate.php',
+    'ExportChangesCombined' => $baseDir . '/backend/combined/exporter.php',
     'ExportChangesDiff' => $baseDir . '/lib/default/diffbackend/exportchangesdiff.php',
+    'ExportChangesICS' => $baseDir . '/backend/zarafa/exporter.php',
     'FatalException' => $baseDir . '/lib/exceptions/fatalexception.php',
     'FatalMisconfigurationException' => $baseDir . '/lib/exceptions/fatalmisconfigurationexception.php',
     'FatalNotImplementedException' => $baseDir . '/lib/exceptions/fatalnotimplementedexception.php',
@@ -25,36 +40,51 @@ return array(
     'FileStateMachine' => $baseDir . '/lib/default/filestatemachine.php',
     'FolderChange' => $baseDir . '/lib/request/folderchange.php',
     'FolderSync' => $baseDir . '/lib/request/foldersync.php',
+    'FreeBusyPublish' => $baseDir . '/backend/zarafa/mapi/class.freebusypublish.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',
+    'ICalParser' => $baseDir . '/backend/zarafa/icalparser.php',
     'IChanges' => $baseDir . '/lib/interface/ichanges.php',
     'IExportChanges' => $baseDir . '/lib/interface/iexportchanges.php',
     'IImportChanges' => $baseDir . '/lib/interface/iimportchanges.php',
     'IIpcProvider' => $baseDir . '/lib/interface/iipcprovider.php',
     'ISearchProvider' => $baseDir . '/lib/interface/isearchprovider.php',
     'IStateMachine' => $baseDir . '/lib/interface/istatemachine.php',
+    'ImportChangesCombined' => $baseDir . '/backend/combined/importer.php',
     'ImportChangesDiff' => $baseDir . '/lib/default/diffbackend/importchangesdiff.php',
+    'ImportChangesICS' => $baseDir . '/backend/zarafa/importer.php',
     'ImportChangesStream' => $baseDir . '/lib/core/streamimporter.php',
+    'ImportHierarchyChangesCombinedWrap' => $baseDir . '/backend/combined/importer.php',
     'InterProcessData' => $baseDir . '/lib/core/interprocessdata.php',
+    'IpcMemcachedProvider' => $baseDir . '/backend/ipcmemcached/ipcmemcachedprovider.php',
+    'IpcSharedMemoryProvider' => $baseDir . '/backend/ipcsharedmemory/ipcsharedmemoryprovider.php',
     'ItemOperations' => $baseDir . '/lib/request/itemoperations.php',
     'Log' => $baseDir . '/lib/log/log.php',
     'LoopDetection' => $baseDir . '/lib/core/loopdetection.php',
+    'MAPIException' => $baseDir . '/backend/zarafa/mapi/class.mapiexception.php',
+    'MAPIMapping' => $baseDir . '/backend/zarafa/mapimapping.php',
+    'MAPIProvider' => $baseDir . '/backend/zarafa/mapiprovider.php',
+    'MAPIStreamWrapper' => $baseDir . '/backend/zarafa/mapistreamwrapper.php',
+    'MAPIUtils' => $baseDir . '/backend/zarafa/mapiutils.php',
     'Mail_RFC822' => $baseDir . '/include/z_RFC822.php',
     'Mail_mimeDecode' => $baseDir . '/include/mimeDecode.php',
     'MeetingResponse' => $baseDir . '/lib/request/meetingresponse.php',
+    'Meetingrequest' => $baseDir . '/backend/zarafa/mapi/class.meetingrequest.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',
+    'PHPWrapper' => $baseDir . '/backend/zarafa/mapiphpwrapper.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',
+    'Recurrence' => $baseDir . '/backend/zarafa/mapi/class.recurrence.php',
     'ReplaceNullcharFilter' => $baseDir . '/lib/wbxml/replacenullcharfilter.php',
     'Request' => $baseDir . '/lib/request/request.php',
     'RequestProcessor' => $baseDir . '/lib/request/requestprocessor.php',
@@ -111,6 +141,9 @@ return array(
     'SyncUserInformation' => $baseDir . '/lib/syncobjects/syncuserinformation.php',
     'SyncValidateCert' => $baseDir . '/lib/syncobjects/syncvalidatecert.php',
     'Syslog' => $baseDir . '/lib/log/syslog.php',
+    'TNEFParser' => $baseDir . '/backend/zarafa/tnefparser.php',
+    'TaskRecurrence' => $baseDir . '/backend/zarafa/mapi/class.taskrecurrence.php',
+    'TaskRequest' => $baseDir . '/backend/zarafa/mapi/class.taskrequest.php',
     'TimezoneUtil' => $baseDir . '/lib/utils/timezoneutil.php',
     'TopCollector' => $baseDir . '/lib/core/topcollector.php',
     'Utils' => $baseDir . '/lib/utils/utils.php',

src/vendor/composer/autoload_static.php

@@ -16,7 +16,20 @@ class ComposerStaticInitd6749fc2fb9944bbe86b2b7d79a7852f
         'ASDevice' => __DIR__ . '/../..' . '/lib/core/asdevice.php',
         'AuthenticationRequiredException' => __DIR__ . '/../..' . '/lib/exceptions/authenticationrequiredexception.php',
         'Backend' => __DIR__ . '/../..' . '/lib/default/backend.php',
+        'BackendCalDAV' => __DIR__ . '/../..' . '/backend/caldav/caldav.php',
+        'BackendCardDAV' => __DIR__ . '/../..' . '/backend/carddav/carddav.php',
+        'BackendCombined' => __DIR__ . '/../..' . '/backend/combined/combined.php',
+        'BackendCombinedConfig' => __DIR__ . '/../..' . '/backend/combined/config.php',
         'BackendDiff' => __DIR__ . '/../..' . '/lib/default/diffbackend/diffbackend.php',
+        'BackendICS' => __DIR__ . '/../..' . '/backend/zarafa/zarafa.php',
+        'BackendIMAP' => __DIR__ . '/../..' . '/backend/imap/imap.php',
+        'BackendLDAP' => __DIR__ . '/../..' . '/backend/ldap/ldap.php',
+        'BackendMaildir' => __DIR__ . '/../..' . '/backend/maildir/maildir.php',
+        'BackendSearchLDAP' => __DIR__ . '/../..' . '/backend/searchldap/searchldap.php',
+        'BackendVCardDir' => __DIR__ . '/../..' . '/backend/vcarddir/vcarddir.php',
+        'BackendZarafa' => __DIR__ . '/../..' . '/backend/zarafa/zarafa.php',
+        'BaseException' => __DIR__ . '/../..' . '/backend/zarafa/mapi/class.baseexception.php',
+        'BaseRecurrence' => __DIR__ . '/../..' . '/backend/zarafa/mapi/class.baserecurrence.php',
         'BodyPreference' => __DIR__ . '/../..' . '/lib/core/bodypreference.php',
         'CalDAVClient' => __DIR__ . '/../..' . '/include/z_caldav.php',
         'CalendarInfo' => __DIR__ . '/../..' . '/include/z_caldav.php',
@@ -24,7 +37,9 @@ class ComposerStaticInitd6749fc2fb9944bbe86b2b7d79a7852f
         'ContentParameters' => __DIR__ . '/../..' . '/lib/core/contentparameters.php',
         'DeviceManager' => __DIR__ . '/../..' . '/lib/core/devicemanager.php',
         'DiffState' => __DIR__ . '/../..' . '/lib/default/diffbackend/diffstate.php',
+        'ExportChangesCombined' => __DIR__ . '/../..' . '/backend/combined/exporter.php',
         'ExportChangesDiff' => __DIR__ . '/../..' . '/lib/default/diffbackend/exportchangesdiff.php',
+        'ExportChangesICS' => __DIR__ . '/../..' . '/backend/zarafa/exporter.php',
         'FatalException' => __DIR__ . '/../..' . '/lib/exceptions/fatalexception.php',
         'FatalMisconfigurationException' => __DIR__ . '/../..' . '/lib/exceptions/fatalmisconfigurationexception.php',
         'FatalNotImplementedException' => __DIR__ . '/../..' . '/lib/exceptions/fatalnotimplementedexception.php',
@@ -32,36 +47,51 @@ class ComposerStaticInitd6749fc2fb9944bbe86b2b7d79a7852f
         'FileStateMachine' => __DIR__ . '/../..' . '/lib/default/filestatemachine.php',
         'FolderChange' => __DIR__ . '/../..' . '/lib/request/folderchange.php',
         'FolderSync' => __DIR__ . '/../..' . '/lib/request/foldersync.php',
+        'FreeBusyPublish' => __DIR__ . '/../..' . '/backend/zarafa/mapi/class.freebusypublish.php',
         'GetAttachment' => __DIR__ . '/../..' . '/lib/request/getattachment.php',
         'GetHierarchy' => __DIR__ . '/../..' . '/lib/request/gethierarchy.php',
         'GetItemEstimate' => __DIR__ . '/../..' . '/lib/request/getitemestimate.php',
         'HTTPReturnCodeException' => __DIR__ . '/../..' . '/lib/exceptions/httpreturncodeexception.php',
         'HierarchyCache' => __DIR__ . '/../..' . '/lib/core/hierarchycache.php',
         'IBackend' => __DIR__ . '/../..' . '/lib/interface/ibackend.php',
+        'ICalParser' => __DIR__ . '/../..' . '/backend/zarafa/icalparser.php',
         'IChanges' => __DIR__ . '/../..' . '/lib/interface/ichanges.php',
         'IExportChanges' => __DIR__ . '/../..' . '/lib/interface/iexportchanges.php',
         'IImportChanges' => __DIR__ . '/../..' . '/lib/interface/iimportchanges.php',
         'IIpcProvider' => __DIR__ . '/../..' . '/lib/interface/iipcprovider.php',
         'ISearchProvider' => __DIR__ . '/../..' . '/lib/interface/isearchprovider.php',
         'IStateMachine' => __DIR__ . '/../..' . '/lib/interface/istatemachine.php',
+        'ImportChangesCombined' => __DIR__ . '/../..' . '/backend/combined/importer.php',
         'ImportChangesDiff' => __DIR__ . '/../..' . '/lib/default/diffbackend/importchangesdiff.php',
+        'ImportChangesICS' => __DIR__ . '/../..' . '/backend/zarafa/importer.php',
         'ImportChangesStream' => __DIR__ . '/../..' . '/lib/core/streamimporter.php',
+        'ImportHierarchyChangesCombinedWrap' => __DIR__ . '/../..' . '/backend/combined/importer.php',
         'InterProcessData' => __DIR__ . '/../..' . '/lib/core/interprocessdata.php',
+        'IpcMemcachedProvider' => __DIR__ . '/../..' . '/backend/ipcmemcached/ipcmemcachedprovider.php',
+        'IpcSharedMemoryProvider' => __DIR__ . '/../..' . '/backend/ipcsharedmemory/ipcsharedmemoryprovider.php',
         'ItemOperations' => __DIR__ . '/../..' . '/lib/request/itemoperations.php',
         'Log' => __DIR__ . '/../..' . '/lib/log/log.php',
         'LoopDetection' => __DIR__ . '/../..' . '/lib/core/loopdetection.php',
+        'MAPIException' => __DIR__ . '/../..' . '/backend/zarafa/mapi/class.mapiexception.php',
+        'MAPIMapping' => __DIR__ . '/../..' . '/backend/zarafa/mapimapping.php',
+        'MAPIProvider' => __DIR__ . '/../..' . '/backend/zarafa/mapiprovider.php',
+        'MAPIStreamWrapper' => __DIR__ . '/../..' . '/backend/zarafa/mapistreamwrapper.php',
+        'MAPIUtils' => __DIR__ . '/../..' . '/backend/zarafa/mapiutils.php',
         'Mail_RFC822' => __DIR__ . '/../..' . '/include/z_RFC822.php',
         'Mail_mimeDecode' => __DIR__ . '/../..' . '/include/mimeDecode.php',
         'MeetingResponse' => __DIR__ . '/../..' . '/lib/request/meetingresponse.php',
+        'Meetingrequest' => __DIR__ . '/../..' . '/backend/zarafa/mapi/class.meetingrequest.php',
         'MoveItems' => __DIR__ . '/../..' . '/lib/request/moveitems.php',
         'NoHierarchyCacheAvailableException' => __DIR__ . '/../..' . '/lib/exceptions/nohierarchycacheavailableexception.php',
         'NoPostRequestException' => __DIR__ . '/../..' . '/lib/exceptions/nopostrequestexception.php',
         'NotImplementedException' => __DIR__ . '/../..' . '/lib/exceptions/notimplementedexception.php',
         'Notify' => __DIR__ . '/../..' . '/lib/request/notify.php',
+        'PHPWrapper' => __DIR__ . '/../..' . '/backend/zarafa/mapiphpwrapper.php',
         'Ping' => __DIR__ . '/../..' . '/lib/request/ping.php',
         'PingTracking' => __DIR__ . '/../..' . '/lib/core/pingtracking.php',
         'Provisioning' => __DIR__ . '/../..' . '/lib/request/provisioning.php',
         'ProvisioningRequiredException' => __DIR__ . '/../..' . '/lib/exceptions/provisioningrequiredexception.php',
+        'Recurrence' => __DIR__ . '/../..' . '/backend/zarafa/mapi/class.recurrence.php',
         'ReplaceNullcharFilter' => __DIR__ . '/../..' . '/lib/wbxml/replacenullcharfilter.php',
         'Request' => __DIR__ . '/../..' . '/lib/request/request.php',
         'RequestProcessor' => __DIR__ . '/../..' . '/lib/request/requestprocessor.php',
@@ -118,6 +148,9 @@ class ComposerStaticInitd6749fc2fb9944bbe86b2b7d79a7852f
         'SyncUserInformation' => __DIR__ . '/../..' . '/lib/syncobjects/syncuserinformation.php',
         'SyncValidateCert' => __DIR__ . '/../..' . '/lib/syncobjects/syncvalidatecert.php',
         'Syslog' => __DIR__ . '/../..' . '/lib/log/syslog.php',
+        'TNEFParser' => __DIR__ . '/../..' . '/backend/zarafa/tnefparser.php',
+        'TaskRecurrence' => __DIR__ . '/../..' . '/backend/zarafa/mapi/class.taskrecurrence.php',
+        'TaskRequest' => __DIR__ . '/../..' . '/backend/zarafa/mapi/class.taskrequest.php',
         'TimezoneUtil' => __DIR__ . '/../..' . '/lib/utils/timezoneutil.php',
         'TopCollector' => __DIR__ . '/../..' . '/lib/core/topcollector.php',
         'Utils' => __DIR__ . '/../..' . '/lib/utils/utils.php',