Browse Source

Move \OC\AppFramework to PSR-4

* Also moved the autoloader setup a bit up since we need it in initpaths
tags/v9.1.0beta1
Roeland Jago Douma 8 years ago
parent
commit
1d33a5ef13
No account linked to committer's email address
23 changed files with 5 additions and 5 deletions
  1. 3
    3
      lib/base.php
  2. 0
    0
      lib/private/AppFramework/App.php
  3. 0
    0
      lib/private/AppFramework/Core/API.php
  4. 0
    0
      lib/private/AppFramework/Db/Db.php
  5. 0
    0
      lib/private/AppFramework/DependencyInjection/DIContainer.php
  6. 0
    0
      lib/private/AppFramework/Http.php
  7. 0
    0
      lib/private/AppFramework/Http/Dispatcher.php
  8. 0
    0
      lib/private/AppFramework/Http/Output.php
  9. 0
    0
      lib/private/AppFramework/Http/Request.php
  10. 0
    0
      lib/private/AppFramework/Middleware/MiddlewareDispatcher.php
  11. 0
    0
      lib/private/AppFramework/Middleware/Security/CORSMiddleware.php
  12. 0
    0
      lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php
  13. 0
    0
      lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php
  14. 0
    0
      lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php
  15. 0
    0
      lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php
  16. 0
    0
      lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php
  17. 0
    0
      lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
  18. 0
    0
      lib/private/AppFramework/Middleware/SessionMiddleware.php
  19. 1
    1
      lib/private/AppFramework/Routing/RouteActionHandler.php
  20. 1
    1
      lib/private/AppFramework/Routing/RouteConfig.php
  21. 0
    0
      lib/private/AppFramework/Utility/ControllerMethodReflector.php
  22. 0
    0
      lib/private/AppFramework/Utility/SimpleContainer.php
  23. 0
    0
      lib/private/AppFramework/Utility/TimeFactory.php

+ 3
- 3
lib/base.php View File

@@ -488,6 +488,9 @@ class OC {

self::$CLI = (php_sapi_name() == 'cli');

// Add default composer PSR-4 autoloader
require_once OC::$SERVERROOT . '/lib/composer/autoload.php';

try {
self::initPaths();
// setup 3rdparty autoloader
@@ -507,9 +510,6 @@ class OC {
exit();
}

// Add default composer PSR-4 autoloader
require_once OC::$SERVERROOT . '/lib/composer/autoload.php';

// setup the basic server
self::$server = new \OC\Server(\OC::$WEBROOT, self::$config);
\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);

lib/private/appframework/app.php → lib/private/AppFramework/App.php View File


lib/private/appframework/core/api.php → lib/private/AppFramework/Core/API.php View File


lib/private/appframework/db/db.php → lib/private/AppFramework/Db/Db.php View File


lib/private/appframework/dependencyinjection/dicontainer.php → lib/private/AppFramework/DependencyInjection/DIContainer.php View File


lib/private/appframework/http.php → lib/private/AppFramework/Http.php View File


lib/private/appframework/http/dispatcher.php → lib/private/AppFramework/Http/Dispatcher.php View File


lib/private/appframework/http/output.php → lib/private/AppFramework/Http/Output.php View File


lib/private/appframework/http/request.php → lib/private/AppFramework/Http/Request.php View File


lib/private/appframework/middleware/middlewaredispatcher.php → lib/private/AppFramework/Middleware/MiddlewareDispatcher.php View File


lib/private/appframework/middleware/security/corsmiddleware.php → lib/private/AppFramework/Middleware/Security/CORSMiddleware.php View File


lib/private/appframework/middleware/security/exceptions/appnotenabledexception.php → lib/private/AppFramework/Middleware/Security/Exceptions/AppNotEnabledException.php View File


lib/private/appframework/middleware/security/exceptions/crosssiterequestforgeryexception.php → lib/private/AppFramework/Middleware/Security/Exceptions/CrossSiteRequestForgeryException.php View File


lib/private/appframework/middleware/security/exceptions/notadminexception.php → lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php View File


lib/private/appframework/middleware/security/exceptions/notloggedinexception.php → lib/private/AppFramework/Middleware/Security/Exceptions/NotLoggedInException.php View File


lib/private/appframework/middleware/security/exceptions/securityexception.php → lib/private/AppFramework/Middleware/Security/Exceptions/SecurityException.php View File


lib/private/appframework/middleware/security/securitymiddleware.php → lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php View File


lib/private/appframework/middleware/sessionmiddleware.php → lib/private/AppFramework/Middleware/SessionMiddleware.php View File


lib/private/appframework/routing/routeactionhandler.php → lib/private/AppFramework/Routing/RouteActionHandler.php View File

@@ -21,7 +21,7 @@
*
*/

namespace OC\AppFramework\routing;
namespace OC\AppFramework\Routing;

use \OC\AppFramework\App;
use \OC\AppFramework\DependencyInjection\DIContainer;

lib/private/appframework/routing/routeconfig.php → lib/private/AppFramework/Routing/RouteConfig.php View File

@@ -24,7 +24,7 @@
*
*/

namespace OC\AppFramework\routing;
namespace OC\AppFramework\Routing;

use OC\AppFramework\DependencyInjection\DIContainer;
use OCP\Route\IRouter;

lib/private/appframework/utility/controllermethodreflector.php → lib/private/AppFramework/Utility/ControllerMethodReflector.php View File


lib/private/appframework/utility/simplecontainer.php → lib/private/AppFramework/Utility/SimpleContainer.php View File


lib/private/appframework/utility/timefactory.php → lib/private/AppFramework/Utility/TimeFactory.php View File


Loading…
Cancel
Save