diff options
| author | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2016-10-17 23:26:48 +0200 |
|---|---|---|
| committer | Klaus Weidenbach <Klaus.Weidenbach@gmx.net> | 2016-10-18 18:11:41 +0200 |
| commit | 745515b11f438d3658203aaaaf151c72e30d5e7c (patch) | |
| tree | ed43b874f5519cf06a05a703e144fd6acad06d4b /Zotlabs | |
| parent | 17091bd38c4e4e5d8b1812dd1d9efeffe0046d02 (diff) | |
| download | volse-hubzilla-745515b11f438d3658203aaaaf151c72e30d5e7c.tar.gz volse-hubzilla-745515b11f438d3658203aaaaf151c72e30d5e7c.tar.bz2 volse-hubzilla-745515b11f438d3658203aaaaf151c72e30d5e7c.zip | |
[FEATURE] Add config and use composer autoloader.
We use composer already to install SabreDAV. Include config
composer.(json|lock) to install and manage more dependencies
in future.
Also provide PSR-4 autoloading for our namespaced classes, e.g.
"Zotlabs\". To regenerate autoloader maps use:
$ composer install --optimize-autoloader --no-dev
We could also remove the whole vendor/ folder from our repository, but
that would need changes in deployment and how to install hubs and needs
more discussion first.
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Master.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Dav.php | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php index 56076f612..580df97db 100644 --- a/Zotlabs/Daemon/Master.php +++ b/Zotlabs/Daemon/Master.php @@ -24,8 +24,7 @@ class Master { static public function Release($argc,$argv) { cli_startup(); logger('Master: release: ' . print_r($argv,true), LOGGER_ALL,LOG_DEBUG); - require_once('Zotlabs/Daemon/' . $argv[0] . '.php'); $cls = '\\Zotlabs\\Daemon\\' . $argv[0]; $cls::run($argc,$argv); } -}
\ No newline at end of file +} diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php index 4ab101780..8ae2e8991 100644 --- a/Zotlabs/Module/Dav.php +++ b/Zotlabs/Module/Dav.php @@ -11,9 +11,6 @@ namespace Zotlabs\Module; use \Sabre\DAV as SDAV; use \Zotlabs\Storage; -// composer autoloader for SabreDAV -require_once('vendor/autoload.php'); - require_once('include/attach.php'); class Dav extends \Zotlabs\Web\Controller { @@ -74,7 +71,6 @@ class Dav extends \Zotlabs\Web\Controller { $auth->setBrowserPlugin($browser); // Experimental QuotaPlugin - // require_once('Zotlabs/Storage/QuotaPlugin.php'); // $server->addPlugin(new \Zotlabs\Storage\QuotaPlugin($auth)); // All we need to do now, is to fire up the server |