From 7f572fdeb5ce62c486a213d3d1d57334f0985229 Mon Sep 17 00:00:00 2001 From: Stefan Werfling Date: Thu, 13 Jul 2017 13:35:02 +0200 Subject: [PATCH 1/3] 4loader: namespace: add else autoload app vendor --- api/src/autoload.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/api/src/autoload.php b/api/src/autoload.php index 369ca317d7..6c98795b60 100755 --- a/api/src/autoload.php +++ b/api/src/autoload.php @@ -49,6 +49,15 @@ spl_autoload_register(function($class) require_once $path; //error_log("PSR4_autoload('$class') --> require_once($path) --> class_exists('$class')=".array2string(class_exists($class,false))); } + elseif (file_exists($al= EGW_INCLUDE_ROOT.'/'.$app.'/vendor/autoload.php')) + { + require_once($al); + + if (class_exists($partclass = implode('\\', $parts), true)) + { + class_alias($partclass, $class); + } + } }); /** From 834f2264656418a6e5e74aa2da1e19e4b7247f13 Mon Sep 17 00:00:00 2001 From: Stefan Werfling Date: Thu, 13 Jul 2017 13:56:31 +0200 Subject: [PATCH 2/3] add example to comment --- api/src/autoload.php | 1 + 1 file changed, 1 insertion(+) diff --git a/api/src/autoload.php b/api/src/autoload.php index 6c98795b60..2db75d2f37 100755 --- a/api/src/autoload.php +++ b/api/src/autoload.php @@ -34,6 +34,7 @@ if (!defined('EGW_SERVER_ROOT')) * class_exists('\\EGroupware\\Calendar\\Ui'); // /calendar/src/Ui.php * class_exists('\\EGroupware\\Calendar\\Ui\\Lists'); // /calendar/src/Ui/Lists.php * class_exists('\\EGroupware\\Calendar\\Ui\\Views'); // /calendar/src/Ui/Views.php + * class_exists('\\EGroupware\\Calendar\\Dir1\\Dir2\\AClass'); // /calendar/vendor/Dir1/Dir2/AClass.php */ spl_autoload_register(function($class) { From 680c4c43d002200b0538a6e7445f0b081b280a0d Mon Sep 17 00:00:00 2001 From: Stefan Werfling Date: Thu, 13 Jul 2017 13:59:03 +0200 Subject: [PATCH 3/3] change comment example --- api/src/autoload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/autoload.php b/api/src/autoload.php index 2db75d2f37..08a2c53f00 100755 --- a/api/src/autoload.php +++ b/api/src/autoload.php @@ -34,7 +34,7 @@ if (!defined('EGW_SERVER_ROOT')) * class_exists('\\EGroupware\\Calendar\\Ui'); // /calendar/src/Ui.php * class_exists('\\EGroupware\\Calendar\\Ui\\Lists'); // /calendar/src/Ui/Lists.php * class_exists('\\EGroupware\\Calendar\\Ui\\Views'); // /calendar/src/Ui/Views.php - * class_exists('\\EGroupware\\Calendar\\Dir1\\Dir2\\AClass'); // /calendar/vendor/Dir1/Dir2/AClass.php + * class_exists('\\EGroupware\\Calendar\\Lib\\Dir\\AClass'); // /calendar/vendor/Lib/Dir/AClass.php */ spl_autoload_register(function($class) {