Merge pull request #23811 from owncloud/move-settings-and-oc-core-to-composer

Add OC\Core and OC\Settings to composer autoloader

composer.json

@@ -5,6 +5,8 @@
     "autoload" : {
         "psr-4": {
             "OC\\": "lib/private",
+            "OC\\Core\\": "core/",
+            "OC\\Settings\\": "settings/",
             "OCP\\": "lib/public"
         }
     },

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

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'),
 );