X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=autoload.patch;h=8ec7fb498534bbed5e1194fa65fa8adef91ce214;hb=514e13cf0aa5d55848b2f9af2e644a092707b33f;hp=99ec87732a26e5ba65bd37628c35223485061d94;hpb=9b6df4e71ca66d333d4d2821d485df1bef8531d3;p=packages%2Feventum.git diff --git a/autoload.patch b/autoload.patch index 99ec877..8ec7fb4 100644 --- a/autoload.patch +++ b/autoload.patch @@ -1,5 +1,5 @@ ---- eventum-3.1.7/vendor/composer/autoload_classmap.php~ 2016-12-28 18:45:59.299156669 +0200 -+++ eventum-3.1.7/vendor/composer/autoload_classmap.php 2016-12-28 18:47:18.984639485 +0200 +--- eventum-3.3.4-387-geb24072d/vendor/composer/autoload_classmap.php~ 2018-03-15 13:08:57.843633962 +0200 ++++ eventum-3.3.4-387-geb24072d/vendor/composer/autoload_classmap.php 2018-03-15 13:09:53.566126362 +0200 @@ -4,6 +4,7 @@ $vendorDir = dirname(dirname(__FILE__)); @@ -16,7 +16,7 @@ 'Category' => $baseDir . '/lib/eventum/class.category.php', 'Command_Line' => $baseDir . '/lib/eventum/class.command_line.php', 'Contact' => $baseDir . '/lib/eventum/crm/class.contact.php', -@@ -45,8 +45,7 @@ +@@ -45,7 +45,6 @@ 'Email_Response' => $baseDir . '/lib/eventum/class.email_response.php', 'Eventum_Bot' => $baseDir . '/lib/eventum/irc/Eventum_Bot.php', 'FAQ' => $baseDir . '/lib/eventum/class.faq.php', @@ -24,63 +24,29 @@ 'Filter' => $baseDir . '/lib/eventum/class.filter.php', 'Group' => $baseDir . '/lib/eventum/class.group.php', 'Help' => $baseDir . '/lib/eventum/class.help.php', - 'History' => $baseDir . '/lib/eventum/class.history.php', -@@ -59,44 +58,14 @@ - 'Lock' => $baseDir . '/lib/eventum/class.lock.php', +@@ -60,20 +60,14 @@ + 'Link_Filter' => $baseDir . '/lib/eventum/class.link_filter.php', 'Mail_Helper' => $baseDir . '/lib/eventum/class.mail_helper.php', 'Mail_Queue' => $baseDir . '/lib/eventum/class.mail_queue.php', -- 'Mail_mime' => $vendorDir . '/pear-pear.php.net/Mail_Mime/Mail/mime.php', -- 'Mail_mimeDecode' => $vendorDir . '/pear-pear.php.net/Mail_mimeDecode/Mail/mimeDecode.php', -- 'Mail_mimePart' => $vendorDir . '/pear-pear.php.net/Mail_Mime/Mail/mimePart.php', - 'Math_Stats' => $vendorDir . '/pear-pear.php.net/Math_Stats/Math/Stats.php', 'Mime_Helper' => $baseDir . '/lib/eventum/class.mime_helper.php', 'Misc' => $baseDir . '/lib/eventum/class.misc.php', - 'Monitor' => $baseDir . '/lib/eventum/class.monitor.php', 'MySQL_Fulltext_Search' => $baseDir . '/lib/eventum/search/class.mysql_fulltext_search.php', 'Mysql_Auth_Backend' => $baseDir . '/lib/eventum/auth/class.mysql_auth_backend.php', -- 'Net_LDAP2' => $vendorDir . '/pear-pear.php.net/Net_LDAP2/Net/LDAP2.php', -- 'Net_LDAP2_Entry' => $vendorDir . '/pear-pear.php.net/Net_LDAP2/Net/LDAP2/Entry.php', -- 'Net_LDAP2_Error' => $vendorDir . '/pear-pear.php.net/Net_LDAP2/Net/LDAP2.php', -- 'Net_LDAP2_Filter' => $vendorDir . '/pear-pear.php.net/Net_LDAP2/Net/LDAP2/Filter.php', -- 'Net_LDAP2_LDIF' => $vendorDir . '/pear-pear.php.net/Net_LDAP2/Net/LDAP2/LDIF.php', -- 'Net_LDAP2_RootDSE' => $vendorDir . '/pear-pear.php.net/Net_LDAP2/Net/LDAP2/RootDSE.php', -- 'Net_LDAP2_Schema' => $vendorDir . '/pear-pear.php.net/Net_LDAP2/Net/LDAP2/Schema.php', -- 'Net_LDAP2_SchemaCache' => $vendorDir . '/pear-pear.php.net/Net_LDAP2/Net/LDAP2/SchemaCache.interface.php', -- 'Net_LDAP2_Search' => $vendorDir . '/pear-pear.php.net/Net_LDAP2/Net/LDAP2/Search.php', -- 'Net_LDAP2_SimpleFileSchemaCache' => $vendorDir . '/pear-pear.php.net/Net_LDAP2/Net/LDAP2/SimpleFileSchemaCache.php', -- 'Net_LDAP2_Util' => $vendorDir . '/pear-pear.php.net/Net_LDAP2/Net/LDAP2/Util.php', - 'Net_POP3' => $vendorDir . '/pear-pear.php.net/Net_POP3/Net/POP3.php', -- 'Net_SmartIRC' => $vendorDir . '/pear-pear.php.net/Net_SmartIRC/Net/SmartIRC.php', -- 'Net_SmartIRC_Error' => $vendorDir . '/pear-pear.php.net/Net_SmartIRC/Net/SmartIRC.php', -- 'Net_SmartIRC_channel' => $vendorDir . '/pear-pear.php.net/Net_SmartIRC/Net/SmartIRC.php', -- 'Net_SmartIRC_channeluser' => $vendorDir . '/pear-pear.php.net/Net_SmartIRC/Net/SmartIRC.php', -- 'Net_SmartIRC_data' => $vendorDir . '/pear-pear.php.net/Net_SmartIRC/Net/SmartIRC.php', -- 'Net_SmartIRC_irccommands' => $vendorDir . '/pear-pear.php.net/Net_SmartIRC/Net/SmartIRC/irccommands.php', -- 'Net_SmartIRC_ircuser' => $vendorDir . '/pear-pear.php.net/Net_SmartIRC/Net/SmartIRC.php', -- 'Net_SmartIRC_listenfor' => $vendorDir . '/pear-pear.php.net/Net_SmartIRC/Net/SmartIRC.php', -- 'Net_SmartIRC_messagehandler' => $vendorDir . '/pear-pear.php.net/Net_SmartIRC/Net/SmartIRC/messagehandler.php', -- 'Net_SmartIRC_user' => $vendorDir . '/pear-pear.php.net/Net_SmartIRC/Net/SmartIRC.php', - 'Net_Socket' => $vendorDir . '/pear-pear.php.net/Net_Socket/Net/Socket.php', - 'Net_URL' => $vendorDir . '/pear-pear.php.net/Net_URL/Net/URL.php', 'News' => $baseDir . '/lib/eventum/class.news.php', + 'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php', 'Note' => $baseDir . '/lib/eventum/class.note.php', 'Notification' => $baseDir . '/lib/eventum/class.notification.php', - 'PHPlot' => $vendorDir . '/phplot/phplot/phplot.php', - 'PHPlot_truecolor' => $vendorDir . '/phplot/phplot/phplot.php', 'Pager' => $baseDir . '/lib/eventum/class.pager.php', + 'ParseError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/ParseError.php', 'Partner' => $baseDir . '/lib/eventum/class.partner.php', - 'Phone_Support' => $baseDir . '/lib/eventum/class.phone_support.php', -@@ -109,6 +78,8 @@ - 'Reminder' => $baseDir . '/lib/eventum/class.reminder.php', - 'Reminder_Action' => $baseDir . '/lib/eventum/class.reminder_action.php', - 'Reminder_Condition' => $baseDir . '/lib/eventum/class.reminder_condition.php', -+ 'RemoteApi' => $baseDir . '/lib/eventum/rpc/RemoteApi.php', -+ 'RemoteApiException' => $baseDir . '/lib/eventum/rpc/RemoteApi.php', - 'Report' => $baseDir . '/lib/eventum/class.report.php', - 'Reporter_List_Custom_Field_Backend' => $baseDir . '/lib/eventum/custom_field/class.reporter_list.php', - 'Resolution' => $baseDir . '/lib/eventum/class.resolution.php', -@@ -120,43 +91,21 @@ - 'SessionHandlerInterface' => $vendorDir . '/symfony/http-foundation/Resources/stubs/SessionHandlerInterface.php', +@@ -99,44 +93,21 @@ + 'SessionUpdateTimestampHandlerInterface' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/SessionUpdateTimestampHandlerInterface.php', 'Setup' => $baseDir . '/lib/eventum/class.setup.php', 'Severity' => $baseDir . '/lib/eventum/class.severity.php', - 'SphinxClient' => $vendorDir . '/sphinx/php-sphinxapi/sphinxapi.php', @@ -118,36 +84,37 @@ - 'Text_Diff_ThreeWay_Op_copy' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff/ThreeWay.php', - 'Text_MappedDiff' => $vendorDir . '/pear-pear.php.net/Text_Diff/Text/Diff.php', 'Time_Tracking' => $baseDir . '/lib/eventum/class.time_tracking.php', + 'TypeError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/TypeError.php', 'User' => $baseDir . '/lib/eventum/class.user.php', 'Validation' => $baseDir . '/lib/eventum/class.validation.php', 'Workflow' => $baseDir . '/lib/eventum/class.workflow.php', - 'gettext_reader' => $vendorDir . '/php-gettext/php-gettext/gettext.php', -+ 'XmlRpcServer' => $baseDir . '/lib/eventum/rpc/XmlRpcServer.php', + + // external deps + 'PHPlot' => $phpDir .'/phplot/phplot.php', + 'Smarty' => $phpDir. '/Smarty3/Smarty.class.php', + 'SphinxClient' => $phpDir . '/sphinxapi.php', ); ---- eventum-3.1.7/vendor/composer/autoload_files.php~ 2016-12-28 18:37:10.000000000 +0200 -+++ eventum-3.1.7/vendor/composer/autoload_files.php 2016-12-28 18:52:04.467065215 +0200 -@@ -4,11 +4,10 @@ - - $vendorDir = dirname(dirname(__FILE__)); +--- eventum-3.5.2/vendor/composer/autoload_files.php 2018-07-06 10:56:53.018210155 +0300 ++++ eventum-3.5.2/vendor/composer/autoload_files.php 2018-07-06 10:57:42.254191350 +0300 +@@ -6,12 +6,10 @@ $baseDir = dirname($vendorDir); +$phpDir = PHP_DATADIR . '/php'; return array( +- '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php', + '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php', + '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php', - 'f084d01b0a599f67676cffef638aa95b' => $vendorDir . '/smarty/smarty/libs/bootstrap.php', - '8170285c807a9f24f165f37b15bc9a36' => $vendorDir . '/defuse/php-encryption/Crypto.php', + 'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php', - 'b2b3f01361f3aaeab67fde08ae76446f' => $vendorDir . '/smarty-gettext/smarty-gettext/block.t.php', - 'd3114450b53a83020e2822546c24e1ad' => $vendorDir . '/smarty-gettext/smarty-gettext/function.locale.php', 'd12685060d57775f2bc3adf90c7d62bd' => $baseDir . '/lib/eventum/gettext.php', + 'b2b3f01361f3aaeab67fde08ae76446f' => $phpDir. '/Smarty3/plugins/block.t.php', ); ---- eventum-3.1.3/vendor/composer/autoload_namespaces.php~ 2016-09-25 21:27:02.000000000 +0300 -+++ eventum-3.1.3/vendor/composer/autoload_namespaces.php 2016-09-25 21:51:42.028861261 +0300 -@@ -3,15 +3,17 @@ +--- eventum-3.4.2-27-g4318eb0a/vendor/composer/autoload_namespaces.php~ 2018-05-20 15:47:14.000000000 +0300 ++++ eventum-3.4.2-27-g4318eb0a/vendor/composer/autoload_namespaces.php 2018-05-20 15:55:55.040415223 +0300 +@@ -3,19 +3,22 @@ // autoload_namespaces.php @generated by Composer $vendorDir = dirname(dirname(__FILE__)); @@ -160,58 +127,69 @@ 'RandomLib' => array($vendorDir . '/ircmaxell/random-lib/lib'), - 'PEAR' => array($vendorDir . '/pear/pear_exception'), - 'Net' => array($vendorDir . '/pear/net_smtp'), -- 'Mail' => array($vendorDir . '/pear/mail'), -- 'DB' => array($vendorDir . '/pear/db'), + 'Enrise\\' => array($vendorDir . '/enrise/urihelper/src'), + 'Doctrine\\ORM\\' => array($vendorDir . '/doctrine/orm/lib'), + 'Doctrine\\DBAL\\' => array($vendorDir . '/doctrine/dbal/lib'), + 'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'), + 'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib'), + 'Doctrine\\Common\\Collections\\' => array($vendorDir . '/doctrine/collections/lib'), - 'Auth' => array($vendorDir . '/pear/auth_sasl'), - '' => array($vendorDir . '/pear/pear-core-minimal/src'), --); ++ // PEAR deps + 'Auth' => array($pearDir), -+ 'DB' => array($pearDir), + 'Mail' => array($pearDir), + 'Net' => array($pearDir), + 'PEAR' => array($pearDir), + 'Text' => array($pearDir), -+ 'XML' => array($pearDir), -+); ---- eventum-3.1.7/vendor/composer/autoload_psr4.php~ 2016-12-28 18:37:10.000000000 +0200 -+++ eventum-3.1.7/vendor/composer/autoload_psr4.php 2016-12-28 18:53:20.699266184 +0200 -@@ -6,22 +6,22 @@ - $baseDir = dirname($vendorDir); - - return array( -+ 'Zend\\Validator\\' => array($phpDir . '/Zend/Validator'), -+ 'Zend\\Stdlib\\' => array($phpDir . '/Zend/Stdlib'), -+ 'Zend\\Mime\\' => array($phpDir . '/Zend/Mime'), -+ 'Zend\\Mail\\' => array($phpDir . '/Zend/Mail'), -+ 'Zend\\Loader\\' => array($phpDir . '/Zend/Loader'), -+ 'Zend\\Config\\' => array($phpDir . '/Zend/Config'), -+ 'Symfony\\Component\\Yaml\\' => array($phpDir . '/Symfony/Component/Yaml'), -+ 'Symfony\\Component\\Serializer\\' => array($phpDir . '/Symfony/Component/Serializer'), -+ 'Symfony\\Component\\OptionsResolver\\' => array($phpDir . '/Symfony/Component/OptionsResolver'), -+ 'Symfony\\Component\\HttpFoundation\\' => array($phpDir . '/Symfony/Component/HttpFoundation'), -+ 'Symfony\\Component\\Filesystem\\' => array($phpDir . '/Symfony/Component/Filesystem'), -+ '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'), + ); +--- eventum-3.3.4-421-g0643f20c/vendor/composer/autoload_psr4.php~ 2018-04-14 03:48:20.217212779 +0300 ++++ eventum-3.3.4-421-g0643f20c/vendor/composer/autoload_psr4.php 2018-04-14 03:48:39.833586386 +0300 +@@ -10,13 +10,6 @@ + 'glen\\FilenameNormalizer\\Test\\' => array($vendorDir . '/glen/filename-normalizer/tests'), + 'glen\\FilenameNormalizer\\' => array($vendorDir . '/glen/filename-normalizer/src'), + 'cebe\\markdown\\' => array($vendorDir . '/cebe/markdown'), - 'Zend\\Validator\\' => array($vendorDir . '/zendframework/zend-validator/src'), - 'Zend\\Stdlib\\' => array($vendorDir . '/zendframework/zend-stdlib/src'), +- 'Zend\\ServiceManager\\' => array($vendorDir . '/zendframework/zend-servicemanager/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'), + 'Symfony\\Polyfill\\Php70\\' => array($vendorDir . '/symfony/polyfill-php70'), + 'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'), + 'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'), +@@ -26,16 +19,12 @@ + 'Symfony\\Component\\Console\\' => array($vendorDir . '/symfony/console'), + 'Symfony\\Component\\Config\\' => array($vendorDir . '/symfony/config'), + 'Silly\\' => array($vendorDir . '/mnapoli/silly/src'), - 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'), +- 'Psr\\Container\\' => array($vendorDir . '/psr/container/src'), 'PhpXmlRpc\\' => array($vendorDir . '/phpxmlrpc/phpxmlrpc/src'), + 'Phlib\\Flysystem\\Pdo\\' => array($vendorDir . '/phlib/flysystem-pdo/src'), + 'Phinx\\' => array($vendorDir . '/robmorgan/phinx/src/Phinx'), - 'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'), + 'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'), + 'Invoker\\' => array($vendorDir . '/php-di/invoker/src'), + 'Interop\\Container\\' => array($vendorDir . '/container-interop/container-interop/src/Interop/Container'), +- 'Eventum\\Test\\' => array($baseDir . '/tests', $baseDir . '/tests/src'), 'Eventum\\' => array($baseDir . '/src'), 'EmailReplyParser\\' => array($vendorDir . '/willdurand/email-reply-parser/src/EmailReplyParser'), + 'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'), +@@ -43,4 +32,14 @@ + 'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib/Doctrine/Common/Annotations'), + 'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib/Doctrine/Common'), 'Cascade\\' => array($vendorDir . '/theorchard/monolog-cascade/src'), ++ ++ 'Zend\\Validator\\' => array($phpDir . '/Zend/Validator'), ++ 'Zend\\ServiceManager\\' => array($phpDir . '/Zend/ServiceManager'), ++ 'Zend\\Stdlib\\' => array($phpDir . '/Zend/Stdlib'), ++ 'Zend\\Mime\\' => array($phpDir . '/Zend/Mime'), ++ 'Zend\\Mail\\' => array($phpDir . '/Zend/Mail'), ++ 'Zend\\Loader\\' => array($phpDir . '/Zend/Loader'), ++ 'Zend\\Config\\' => array($phpDir . '/Zend/Config'), ++ 'Monolog\\' => array($phpDir . '/Monolog'), ++ 'Psr\\Log\\' => array($phpDir. '/Psr/Log'), + ); --- eventum-3.0.3-13-gfefa325/autoload.php~ 2015-10-13 21:36:40.000000000 +0300 +++ eventum-3.0.3-13-gfefa325/autoload.php 2015-10-13 23:39:26.450266254 +0300 @@ -48,4 +48,4 @@ @@ -220,18 +198,18 @@ // fonts directory for phplot -define('APP_FONTS_PATH', APP_PATH . '/vendor/fonts/liberation'); +define('APP_FONTS_PATH', '/usr/share/fonts/TTF'); ---- eventum-3.1.6/vendor/composer/autoload_real.php~ 2016-12-09 01:12:28.646671725 +0200 -+++ eventum-3.1.6/vendor/composer/autoload_real.php 2016-12-09 01:12:30.253314754 +0200 +--- eventum-3.3.4-365-g65c5538f/vendor/composer/autoload_real.php~ 2018-03-13 23:16:48.000000000 +0200 ++++ eventum-3.3.4-365-g65c5538f/vendor/composer/autoload_real.php 2018-03-13 23:35:23.062702617 +0200 @@ -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()); +- $includePaths[] = get_include_path(); - set_include_path(implode(PATH_SEPARATOR, $includePaths)); - - $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); -+ $useStaticLoader = false; // TODO: patch autoload_static.php as well ++ $useStaticLoader = false; // autoload_static.php patching is annoying and not worth the effort if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php';