+ 'Text' => array($pearDir),
+ 'XML' => array($pearDir),
+);
---- eventum-3.1.3/vendor/composer/autoload_psr4.php~ 2016-09-25 21:27:02.000000000 +0300
-+++ eventum-3.1.3/vendor/composer/autoload_psr4.php 2016-09-25 21:54:10.153351072 +0300
-@@ -4,22 +4,23 @@
+--- eventum-3.1.4/vendor/composer/autoload_psr4.php~ 2016-10-26 22:02:08.000000000 +0300
++++ eventum-3.1.4/vendor/composer/autoload_psr4.php 2016-10-27 16:54:25.728781171 +0300
+@@ -4,23 +4,24 @@
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
+$phpDir = PHP_DATADIR . '/php';
return array(
-- 'Zend\\Validator\\' => array($vendorDir . '/zendframework/zend-validator/src'),
-- 'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib/src'),
-- 'Zend\\Mime\\' => array($vendorDir . '/zendframework/zend-mime/src'),
-- 'Zend\\Mail\\' => array($vendorDir . '/zendframework/zend-mail/src'),
-- 'Zend\\Loader\\' => array($vendorDir . '/zendframework/zend-loader/src'),
-- 'Zend\\Config\\' => array($vendorDir . '/zendframework/zend-config/src'),
-- 'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
-- 'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
-- 'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'),
-- 'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
-- 'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
-- 'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
-- 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
-- 'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
+ 'Zend\\Validator\\' => array($phpDir . '/Zend/Validator'),
+ 'Zend\\Stdlib\\' => array($phpDir . '/Zend/Stdlib'),
+ 'Zend\\Mime\\' => array($phpDir . '/Zend/Mime'),
+ 'Symfony\\Component\\Config\\' => array($phpDir . '/Symfony/Component/Config'),
+ 'Monolog\\' => array($phpDir . '/Monolog'),
+ 'Psr\\Log\\' => array($phpDir. '/Psr/Log'),
+ 'malkusch\\lock\\' => array($vendorDir . '/malkusch/lock/classes'),
+- 'Zend\\Validator\\' => array($vendorDir . '/zendframework/zend-validator/src'),
+- 'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib/src'),
+- 'Zend\\Mime\\' => array($vendorDir . '/zendframework/zend-mime/src'),
+- 'Zend\\Mail\\' => array($vendorDir . '/zendframework/zend-mail/src'),
+- 'Zend\\Loader\\' => array($vendorDir . '/zendframework/zend-loader/src'),
+- 'Zend\\Config\\' => array($vendorDir . '/zendframework/zend-config/src'),
+- 'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
+- 'Symfony\\Component\\Serializer\\' => array($vendorDir . '/symfony/serializer'),
+- 'Symfony\\Component\\OptionsResolver\\' => array($vendorDir . '/symfony/options-resolver'),
+- 'Symfony\\Component\\HttpFoundation\\' => array($vendorDir . '/symfony/http-foundation'),
+- 'Symfony\\Component\\Filesystem\\' => array($vendorDir . '/symfony/filesystem'),
+- 'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'),
+- 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
+- 'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
'Eventum\\' => array($baseDir . '/src'),
'EmailReplyParser\\' => array($vendorDir . '/willdurand/email-reply-parser/src/EmailReplyParser'),
'Cascade\\' => array($vendorDir . '/theorchard/monolog-cascade/src'),
// fonts directory for phplot
-define('APP_FONTS_PATH', APP_PATH . '/vendor/fonts/liberation');
+define('APP_FONTS_PATH', '/usr/share/fonts/TTF');
---- eventum-3.1.3/vendor/composer/autoload_real.php~ 2016-09-25 21:27:02.000000000 +0300
-+++ eventum-3.1.3/vendor/composer/autoload_real.php 2016-09-25 21:55:26.295565465 +0300
+--- eventum-3.1.4/vendor/composer/autoload_real.php~ 2016-10-26 22:02:08.000000000 +0300
++++ eventum-3.1.4/vendor/composer/autoload_real.php 2016-10-27 16:55:16.684709131 +0300
@@ -23,11 +23,7 @@
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitEventumCore', 'loadClassLoader'));
- $includePaths = require __DIR__ . '/include_paths.php';
- array_push($includePaths, get_include_path());
-- set_include_path(join(PATH_SEPARATOR, $includePaths));
+- set_include_path(implode(PATH_SEPARATOR, $includePaths));
-
- $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
+ $useStaticLoader = false; // TODO: patch autoload_static.php as well
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
+