FreshRSS
/
FreshRSS
mirror of https://github.com/FreshRSS/FreshRSS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minz remove use of deprecated variable (#6132) 

and related improvements to clarify inheritance
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/6130
This commit is contained in:
Alexandre Alapetite 2024-03-01 10:08:05 +01:00 committed by GitHub
parent 4b29e666b0
commit 96484d22a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/FreshRSS.php
View File

@ -23,8 +23,6 @@ class FreshRSS extends Minz_FrontController {
Minz_Session::init('FreshRSS'); Minz_Session::init('FreshRSS');
} }
Minz_ActionController::$defaultViewType = FreshRSS_View::class;
FreshRSS_Context::initSystem(); FreshRSS_Context::initSystem();
if (!FreshRSS_Context::hasSystemConf()) { if (!FreshRSS_Context::hasSystemConf()) {
$message = 'Error during context system init!'; $message = 'Error during context system init!';

6
app/Models/ActionController.php
View File

@ -1,10 +1,14 @@
<?php <?php
declare(strict_types=1); declare(strict_types=1);
class FreshRSS_ActionController extends Minz_ActionController { abstract class FreshRSS_ActionController extends Minz_ActionController {
/** /**
* @var FreshRSS_View * @var FreshRSS_View
*/ */
protected $view; protected $view;
public function __construct(string $viewType = '') {
parent::__construct($viewType === '' ? FreshRSS_View::class : $viewType);
}
} }

2
lib/Minz/ActionController.php
View File

@ -9,7 +9,7 @@ declare(strict_types=1);
/** /**
* The Minz_ActionController class is a controller in the MVC paradigm * The Minz_ActionController class is a controller in the MVC paradigm
*/ */
class Minz_ActionController { abstract class Minz_ActionController {
/** @var array<string,string> */ /** @var array<string,string> */
private static array $csp_default = [ private static array $csp_default = [

2
lib/Minz/Dispatcher.php
View File

@ -10,7 +10,7 @@ declare(strict_types=1);
* The Dispatcher is in charge of initialising the Controller and exectue the action as specified in the Request object. * The Dispatcher is in charge of initialising the Controller and exectue the action as specified in the Request object.
* It is a singleton. * It is a singleton.
*/ */
class Minz_Dispatcher { final class Minz_Dispatcher {
/** /**
* Singleton * Singleton