mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Switch static::$parameters to $this->parameters

Browse source
This commit is contained in:
Philipp Holzer 2021-11-14 23:19:25 +01:00
commit 5879535822
Signed by: nupplaPhil
GPG key ID: 24A7501396EB5432
116 changed files with 321 additions and 314 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/App/Module.php
View file

@ -182,7 +182,7 @@ class Module
**/
try {
$module_class = $router->getModuleClass($args->getCommand());
$module_parameters = $router->getModuleParameters();
$module_parameters[] = $router->getModuleParameters();
} catch (MethodNotAllowedException $e) {
$module_class = MethodNotAllowed::class;
} catch (NotFoundException $e) {
@ -195,8 +195,8 @@ class Module
} else {
include_once "addon/{$this->module}/{$this->module}.php";
if (function_exists($this->module . '_module')) {
LegacyModule::setModuleFile("addon/{$this->module}/{$this->module}.php");
$module_class = LegacyModule::class;
$module_parameters[] = "addon/{$this->module}/{$this->module}.php";
$module_class = LegacyModule::class;
}
}
}
@ -205,15 +205,15 @@ class Module
* We emulate a Module class through the LegacyModule class
*/
if (!$module_class && file_exists("mod/{$this->module}.php")) {
LegacyModule::setModuleFile("mod/{$this->module}.php");
$module_class = LegacyModule::class;
$module_parameters[] = "mod/{$this->module}.php";
$module_class = LegacyModule::class;
}
$module_class = $module_class ?: PageNotFound::class;
}
/** @var ICanHandleRequests $module */
$module = $dice->create($module_class, [$module_parameters]);
$module = $dice->create($module_class, $module_parameters);
return new Module($this->module, $module, $this->isBackend, $printNotAllowedAddon);
}