summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json2
-rw-r--r--core/Application.php (renamed from core/application.php)0
-rw-r--r--lib/composer/composer/LICENSE2
-rw-r--r--lib/composer/composer/autoload_psr4.php2
-rw-r--r--settings/Application.php (renamed from settings/application.php)0
5 files changed, 5 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index 21575b5fa60..0f0d0bd3104 100644
--- a/composer.json
+++ b/composer.json
@@ -5,6 +5,8 @@
"autoload" : {
"psr-4": {
"OC\\": "lib/private",
+ "OC\\Core\\": "core/",
+ "OC\\Settings\\": "settings/",
"OCP\\": "lib/public"
}
},
diff --git a/core/application.php b/core/Application.php
index 30376ee4f2e..30376ee4f2e 100644
--- a/core/application.php
+++ b/core/Application.php
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'),
);
diff --git a/settings/application.php b/settings/Application.php
index 5b84d028abf..5b84d028abf 100644
--- a/settings/application.php
+++ b/settings/Application.php