diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-04-05 17:58:07 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-04-05 17:58:07 +0200 |
| commit | 1bb40b866a0b9a4973bc6fdcf7321fd7e7170fa0 (patch) | |
| tree | 2a50645e6abf2e24229531cb8e908b2008b0ff47 /lib | |
| parent | 60f532882c5a8e3823f574b7535696ceb011bf2f (diff) | |
| parent | 433c0160b6e1fb558216447b49d09c8efeecd6ce (diff) | |
| download | nextcloud-server-1bb40b866a0b9a4973bc6fdcf7321fd7e7170fa0.tar.gz nextcloud-server-1bb40b866a0b9a4973bc6fdcf7321fd7e7170fa0.zip | |
Merge pull request #23811 from owncloud/move-settings-and-oc-core-to-composer
Add OC\Core and OC\Settings to composer autoloader
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/composer/composer/LICENSE | 2 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_psr4.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/composer/composer/LICENSE b/lib/composer/composer/LICENSE index c8d57af8b27..1a28124886d 100644 --- a/lib/composer/composer/LICENSE +++ b/lib/composer/composer/LICENSE @@ -1,5 +1,5 @@ -Copyright (c) 2015 Nils Adermann, Jordi Boggiano +Copyright (c) 2016 Nils Adermann, Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/lib/composer/composer/autoload_psr4.php b/lib/composer/composer/autoload_psr4.php index 4610a912c6d..2561f0048c5 100644 --- a/lib/composer/composer/autoload_psr4.php +++ b/lib/composer/composer/autoload_psr4.php @@ -6,6 +6,8 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname(dirname($vendorDir)); return array( + 'OC\\Settings\\' => array($baseDir . '/settings'), + 'OC\\Core\\' => array($baseDir . '/core'), 'OC\\' => array($baseDir . '/lib/private'), 'OCP\\' => array($baseDir . '/lib/public'), ); |