Browse Source

fix appframework routing

tags/v6.0.0RC1
Thomas Müller 10 years ago
parent
commit
993fea2f05

+ 4
- 1
lib/private/appframework/app.php View File

@@ -44,7 +44,10 @@ class App {
* @param string $methodName the method that you want to call
* @param DIContainer $container an instance of a pimple container.
*/
public static function main($controllerName, $methodName, IAppContainer $container) {
public static function main($controllerName, $methodName, DIContainer $container, array $urlParams = null) {
if (!is_null($urlParams)) {
$container['urlParams'] = $urlParams;
}
$controller = $container[$controllerName];

// initialize the dispatcher and run all the middleware before the controller

+ 1
- 1
lib/private/appframework/routing/routeactionhandler.php View File

@@ -37,6 +37,6 @@ class RouteActionHandler {
}

public function __invoke($params) {
App::main($this->controllerName, $this->actionName, $params, $this->container);
App::main($this->controllerName, $this->actionName, $this->container, $params);
}
}

+ 11
- 0
lib/public/appframework/app.php View File

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

namespace OCP\AppFramework;
use OC\AppFramework\routing\RouteConfig;


/**
@@ -47,6 +48,16 @@ class App {
return $this->container;
}

/**
* This function is to be called
* @param \OC_Router $router
* @param array $routes
*/
public function registerRoutes($router, $routes) {
$routeConfig = new RouteConfig($this->container, $router, $routes);
$routeConfig->register();
}

/**
* This function is called by the routing component to fire up the frameworks dispatch mechanism.
*

Loading…
Cancel
Save