*/
private $mode;
+ /**
+ * @var App\Router
+ */
+ private $router;
+
/**
* @var string The App URL path
*/
return $this->mode;
}
+ public function getRouter()
+ {
+ return $this->router;
+ }
+
/**
* Register a stylesheet file path to be included in the <head> tag of every page.
* Inclusion is done in App->initHead().
*
* @param Configuration $config The Configuration
* @param App\Mode $mode The mode of this Friendica app
+ * @param App\Router $router The router of this Friendica app
* @param LoggerInterface $logger The current app logger
* @param Profiler $profiler The profiler of this application
* @param bool $isBackend Whether it is used for backend or frontend (Default true=backend)
*
* @throws Exception if the Basepath is not usable
*/
- public function __construct(Configuration $config, App\Mode $mode, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
+ public function __construct(Configuration $config, App\Mode $mode, App\Router $router, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
{
BaseObject::setApp($this);
- $this->logger = $logger;
$this->config = $config;
- $this->profiler = $profiler;
$this->mode = $mode;
+ $this->router = $router;
+ $this->profiler = $profiler;
+ $this->logger = $logger;
$this->checkBackend($isBackend);
$this->checkFriendicaApp();
$this->module = "login";
}
- $router = new App\Router();
- $this->collectRoutes($router->getRouteCollector());
+ /*
+ * ROUTING
+ *
+ * From the request URL, routing consists of obtaining the name of a BaseModule-extending class of which the
+ * post() and/or content() static methods can be respectively called to produce a data change or an output.
+ */
+
+ // First we try explicit routes defined in App\Router
+ $this->router->collectRoutes();
+
+ Hook::callAll('route_collection', $this->router->getRouteCollector());
- $this->module_class = $router->getModuleClass($this->cmd);
+ $this->module_class = $this->router->getModuleClass($this->cmd);
- $privateapps = $this->config->get('config', 'private_addons', false);
+ // Then we try addon-provided modules that we wrap in the LegacyModule class
if (!$this->module_class && Core\Addon::isEnabled($this->module) && file_exists("addon/{$this->module}/{$this->module}.php")) {
//Check if module is an app and if public access to apps is allowed or not
+ $privateapps = $this->config->get('config', 'private_addons', false);
if ((!local_user()) && Core\Hook::isAddonApp($this->module) && $privateapps) {
info(Core\L10n::t("You must be logged in to use addons. "));
} else {
}
}
- // Controller class routing
+ // Then we try name-matching a Friendica\Module class
if (!$this->module_class && class_exists('Friendica\\Module\\' . ucfirst($this->module))) {
$this->module_class = 'Friendica\\Module\\' . ucfirst($this->module);
}
- /* If not, next look for a 'standard' program module in the 'mod' directory
+ /* Finally, we look for a 'standard' program module in the 'mod' directory
* We emulate a Module class through the LegacyModule class
*/
if (!$this->module_class && file_exists("mod/{$this->module}.php")) {
$this->internalRedirect($toUrl);
}
}
-
- /**
- * Static declaration of Friendica routes.
- *
- * Supports:
- * - Route groups
- * - Variable parts
- * Disregards:
- * - HTTP method other than GET
- * - Named parameters
- *
- * Handler must be the name of a class extending Friendica\BaseModule.
- *
- * @brief Static declaration of Friendica routes.
- * @param RouteCollector $routeCollector
- * @throws InternalServerErrorException
- */
- private function collectRoutes(RouteCollector $routeCollector)
- {
- $routeCollector->addRoute(['GET', 'POST'], '/itemsource[/{guid}]', Module\Itemsource::class);
-
- Hook::callAll('route_collection', $routeCollector);
- }
}
use FastRoute\Dispatcher;\r
use FastRoute\RouteCollector;\r
use FastRoute\RouteParser\Std;\r
+use Friendica\Module;\r
\r
/**\r
* Wrapper for FastRoute\Router\r
/** @var RouteCollector */\r
protected $routeCollector;\r
\r
+ /**\r
+ * Static declaration of Friendica routes.\r
+ *\r
+ * Supports:\r
+ * - Route groups\r
+ * - Variable parts\r
+ * Disregards:\r
+ * - HTTP method other than GET\r
+ * - Named parameters\r
+ *\r
+ * Handler must be the name of a class extending Friendica\BaseModule.\r
+ *\r
+ * @brief Static declaration of Friendica routes.\r
+ */\r
+ public function collectRoutes()\r
+ {\r
+ $this->routeCollector->addRoute(['GET', 'POST'], '/itemsource[/{guid}]', Module\Itemsource::class);\r
+ }\r
+\r
public function __construct(RouteCollector $routeCollector = null)\r
{\r
if (!$routeCollector) {\r
return $this->routeCollector;\r
}\r
\r
+ /**\r
+ * Returns the relevant module class name for the given page URI or NULL if no route rule matched.\r
+ *\r
+ * @param string $cmd The path component of the request URL without the query string\r
+ * @return string|null A Friendica\BaseModule-extending class name if a route rule matched\r
+ */\r
public function getModuleClass($cmd)\r
{\r
$cmd = '/' . ltrim($cmd, '/');\r
{
$basePath = BasePath::create($directory, $_SERVER);
$mode = new App\Mode($basePath);
+ $router = new App\Router();
$configLoader = new Config\ConfigFileLoader($basePath, $mode);
$configCache = Factory\ConfigFactory::createCache($configLoader);
$profiler = Factory\ProfilerFactory::create($configCache);
$logger = Factory\LoggerFactory::create($channel, $config, $profiler);
Factory\LoggerFactory::createDev($channel, $config, $profiler);
- return new App($config, $mode, $logger, $profiler, $isBackend);
+ return new App($config, $mode, $router, $logger, $profiler, $isBackend);
}
}
{
$basePath = BasePath::create(dirname(__DIR__) . '/../');
$mode = new App\Mode($basePath);
+ $router = new App\Router();
$configLoader = new ConfigFileLoader($basePath, $mode);
$configCache = Factory\ConfigFactory::createCache($configLoader);
$profiler = Factory\ProfilerFactory::create($configCache);
$config = Factory\ConfigFactory::createConfig($configCache);
Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create('test', $config, $profiler);
- $this->app = new App($config, $mode, $logger, $profiler, false);
+ $this->app = new App($config, $mode, $router, $logger, $profiler, false);
parent::setUp();
{
$basePath = BasePath::create(dirname(__DIR__) . '/../../');
$mode = new App\Mode($basePath);
+ $router = new App\Router();
$configLoader = new ConfigFileLoader($basePath, $mode);
$configCache = Factory\ConfigFactory::createCache($configLoader);
$profiler = Factory\ProfilerFactory::create($configCache);
$config = Factory\ConfigFactory::createConfig($configCache);
Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create('test', $config, $profiler);
- $this->app = new App($config, $mode, $logger, $profiler, false);
+ $this->app = new App($config, $mode, $router, $logger, $profiler, false);
parent::setUp();
{
$basePath = BasePath::create(dirname(__DIR__) . '/../../');
$mode = new App\Mode($basePath);
+ $router = new App\Router();
$configLoader = new ConfigFileLoader($basePath, $mode);
$configCache = Factory\ConfigFactory::createCache($configLoader);
$profiler = Factory\ProfilerFactory::create($configCache);
$config = Factory\ConfigFactory::createConfig($configCache);
Factory\ConfigFactory::createPConfig($configCache);
$logger = Factory\LoggerFactory::create('test', $config, $profiler);
- $this->app = new App($config, $mode, $logger, $profiler, false);
+ $this->app = new App($config, $mode, $router, $logger, $profiler, false);
parent::setUp();
}
projects / friendica.git / commitdiff