From 433c0160b6e1fb558216447b49d09c8efeecd6ce Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 5 Apr 2016 16:23:01 +0200
Subject: [PATCH] Move OC\Core and OC\Settings to composer autoloader

---
 composer.json                                 | 2 ++
 core/{application.php => Application.php}     | 0
 lib/composer/composer/LICENSE                 | 2 +-
 lib/composer/composer/autoload_psr4.php       | 2 ++
 settings/{application.php => Application.php} | 0
 5 files changed, 5 insertions(+), 1 deletion(-)
 rename core/{application.php => Application.php} (100%)
 rename settings/{application.php => Application.php} (100%)

diff --git a/composer.json b/composer.json
index 21575b5fa6..0f0d0bd310 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
similarity index 100%
rename from core/application.php
rename to core/Application.php
diff --git a/lib/composer/composer/LICENSE b/lib/composer/composer/LICENSE
index c8d57af8b2..1a28124886 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 4610a912c6..2561f0048c 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
similarity index 100%
rename from settings/application.php
rename to settings/Application.php