aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2021-12-31 17:00:51 +0100
committerGravatar GitHub <noreply@github.com> 2021-12-31 17:00:51 +0100
commit77e9877316fcfacb26799afdf32d94c8411da80e (patch)
tree7fd9c85bf4854054be6536c14d120bc8b790debe /lib
parent09c84fb3bc44bf8e45619c27acc15b967aea14ce (diff)
Add PHPStan (#4021)
* Add PHPStan #fix https://github.com/FreshRSS/FreshRSS/issues/4016 https://phpstan.org/ ```sh composer run-script phpstan ``` * More fixes * Fix global variables * Add .phtml * Fix merge https://github.com/FreshRSS/FreshRSS/pull/4090 * Fix more warnings * Fix view errors and enable in CI * ReturnTypeWillChange * Dynamic view type * Fix Minz static/self bug
Diffstat (limited to 'lib')
-rw-r--r--lib/Minz/ActionController.php9
-rw-r--r--lib/Minz/Configuration.php10
-rw-r--r--lib/Minz/ControllerNotExistException.php2
-rw-r--r--lib/Minz/Dispatcher.php1
-rw-r--r--lib/Minz/Mailer.php4
-rw-r--r--lib/Minz/Paginator.php4
-rw-r--r--lib/Minz/PdoMysql.php2
-rw-r--r--lib/Minz/PdoSqlite.php2
8 files changed, 24 insertions, 10 deletions
diff --git a/lib/Minz/ActionController.php b/lib/Minz/ActionController.php
index f60b5411d..cf41a4819 100644
--- a/lib/Minz/ActionController.php
+++ b/lib/Minz/ActionController.php
@@ -13,11 +13,18 @@ class Minz_ActionController {
'default-src' => "'self'",
);
+ // Gives the possibility to override the default View type.
+ public static $viewType = 'Minz_View';
+
/**
* Constructeur
*/
public function __construct () {
- $this->view = new Minz_View();
+ if (class_exists(self::$viewType)) {
+ $this->view = new self::$viewType();
+ } else {
+ $this->view = new Minz_View();
+ }
$view_path = Minz_Request::controllerName() . '/' . Minz_Request::actionName() . '.phtml';
$this->view->_path($view_path);
$this->view->attributeParams ();
diff --git a/lib/Minz/Configuration.php b/lib/Minz/Configuration.php
index b57ca6c0d..9752c21eb 100644
--- a/lib/Minz/Configuration.php
+++ b/lib/Minz/Configuration.php
@@ -87,15 +87,15 @@ class Minz_Configuration {
private $extensions_enabled = [];
public function removeExtension($ext_name) {
- unset(self::$extensions_enabled[$ext_name]);
- $legacyKey = array_search($ext_name, self::$extensions_enabled, true);
+ unset($this->extensions_enabled[$ext_name]);
+ $legacyKey = array_search($ext_name, $this->extensions_enabled, true);
if ($legacyKey !== false) { //Legacy format FreshRSS < 1.11.1
- unset(self::$extensions_enabled[$legacyKey]);
+ unset($this->extensions_enabled[$legacyKey]);
}
}
public function addExtension($ext_name) {
- if (!isset(self::$extensions_enabled[$ext_name])) {
- self::$extensions_enabled[$ext_name] = true;
+ if (!isset($this->extensions_enabled[$ext_name])) {
+ $this->extensions_enabled[$ext_name] = true;
}
}
diff --git a/lib/Minz/ControllerNotExistException.php b/lib/Minz/ControllerNotExistException.php
index dcdaa94d1..a024e1cbd 100644
--- a/lib/Minz/ControllerNotExistException.php
+++ b/lib/Minz/ControllerNotExistException.php
@@ -1,6 +1,6 @@
<?php
class Minz_ControllerNotExistException extends Minz_Exception {
- public function __construct ($controller_name, $code = self::ERROR) {
+ public function __construct ($code = self::ERROR) {
$message = 'Controller not found!';
parent::__construct ($message, $code);
}
diff --git a/lib/Minz/Dispatcher.php b/lib/Minz/Dispatcher.php
index 7a1c3e1d7..b326d4b62 100644
--- a/lib/Minz/Dispatcher.php
+++ b/lib/Minz/Dispatcher.php
@@ -83,7 +83,6 @@ class Minz_Dispatcher {
if (!class_exists ($controller_name)) {
throw new Minz_ControllerNotExistException (
- $controller_name,
Minz_Exception::ERROR
);
}
diff --git a/lib/Minz/Mailer.php b/lib/Minz/Mailer.php
index b1af88c76..92e396f99 100644
--- a/lib/Minz/Mailer.php
+++ b/lib/Minz/Mailer.php
@@ -32,6 +32,10 @@ class Minz_Mailer {
*/
protected $view;
+ private $mailer;
+ private $smtp_config;
+ private $debug_level;
+
/**
* Constructor.
*/
diff --git a/lib/Minz/Paginator.php b/lib/Minz/Paginator.php
index 7f5f0db8b..72eaafec1 100644
--- a/lib/Minz/Paginator.php
+++ b/lib/Minz/Paginator.php
@@ -47,7 +47,7 @@ class Minz_Paginator {
/**
* Permet d'afficher la pagination
* @param $view nom du fichier de vue situé dans /app/views/helpers/
- * @param $getteur variable de type $_GET[] permettant de retrouver la page
+ * @param int $getteur variable de type $_GET[] permettant de retrouver la page
*/
public function render ($view, $getteur) {
$view = APP_PATH . '/views/helpers/'.$view;
@@ -176,7 +176,7 @@ class Minz_Paginator {
}
public function _currentPage ($page) {
if($page < 1 || ($page > $this->nbPage && $this->nbPage > 0)) {
- throw new CurrentPagePaginationException ($page);
+ throw new Minz_CurrentPagePaginationException($page);
}
$this->currentPage = $page;
diff --git a/lib/Minz/PdoMysql.php b/lib/Minz/PdoMysql.php
index c46d88f1a..e5d62bcc5 100644
--- a/lib/Minz/PdoMysql.php
+++ b/lib/Minz/PdoMysql.php
@@ -15,6 +15,8 @@ class Minz_PdoMysql extends Minz_Pdo {
return 'mysql';
}
+ // PHP8+: PDO::lastInsertId(?string $name = null): string|false
+ #[\ReturnTypeWillChange]
public function lastInsertId($name = null) {
return parent::lastInsertId(); //We discard the name, only used by PostgreSQL
}
diff --git a/lib/Minz/PdoSqlite.php b/lib/Minz/PdoSqlite.php
index c577ad887..978ee8db1 100644
--- a/lib/Minz/PdoSqlite.php
+++ b/lib/Minz/PdoSqlite.php
@@ -15,6 +15,8 @@ class Minz_PdoSqlite extends Minz_Pdo {
return 'sqlite';
}
+ // PHP8+: PDO::lastInsertId(?string $name = null): string|false
+ #[\ReturnTypeWillChange]
public function lastInsertId($name = null) {
return parent::lastInsertId(); //We discard the name, only used by PostgreSQL
}