JcDenis/improve
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

fix init check

Browse source
This commit is contained in:
Jean-Christian Denis 2023-03-20 00:33:44 +01:00
parent 8f3f817f42
commit 40f4cc14ad
Signed by: JcDenis
GPG key ID: 1B5B8C5B90B6C951
5 changed files with 31 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Backend.php
View file

@ -34,16 +34,16 @@ class Backend extends dcNsProcess
{ {
public static function init(): bool public static function init(): bool
{ {
if (defined('DC_CONTEXT_ADMIN')) { static::$init = defined('DC_CONTEXT_ADMIN')
self::$init = dcCore::app()->auth->isSuperAdmin() && version_compare(phpversion(), My::PHP_MIN, '>='); && dcCore::app()->auth->isSuperAdmin()
} && My::phpCompliant();
return self::$init; return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::$init) { if (!static::$init) {
return false; return false;
} }

16
src/Config.php
View file

@ -42,20 +42,16 @@ class Config extends dcNsProcess
{ {
public static function init(): bool public static function init(): bool
{ {
if (defined('DC_CONTEXT_ADMIN')) { static::$init = defined('DC_CONTEXT_ADMIN')
if (version_compare(phpversion(), My::PHP_MIN, '>=')) { && dcCore::app()->auth->isSuperAdmin()
self::$init = dcCore::app()->auth->isSuperAdmin(); && My::phpCompliant();
} else {
dcCore::app()->error->add(sprintf(__('%s required php >= %s'), My::id(), My::PHP_MIN));
}
}
return self::$init; return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::$init) { if (!static::$init) {
return false; return false;
} }
@ -86,7 +82,7 @@ class Config extends dcNsProcess
public static function render(): void public static function render(): void
{ {
if (!self::$init) { if (!static::$init) {
return; return;
} }

11
src/Install.php
View file

@ -40,17 +40,16 @@ class Install extends dcNsProcess
public static function init(): bool public static function init(): bool
{ {
if (defined('DC_CONTEXT_ADMIN')) { static::$init = defined('DC_CONTEXT_ADMIN')
self::$init = version_compare(phpversion(), My::PHP_MIN, '>=') && My::phpCompliant()
&& dcCore::app()->newVersion(My::id(), dcCore::app()->plugins->moduleInfo(My::id(), 'version')); && dcCore::app()->newVersion(My::id(), dcCore::app()->plugins->moduleInfo(My::id(), 'version'));
}
return self::$init; return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::$init) { if (!static::$init) {
return false; return false;
} }

14
src/Manage.php
View file

@ -50,18 +50,18 @@ class Manage extends dcNsProcess
public static function init(): bool public static function init(): bool
{ {
if (defined('DC_CONTEXT_ADMIN')) { static::$init = defined('DC_CONTEXT_ADMIN')
self::$init = dcCore::app()->auth->isSuperAdmin() && version_compare(phpversion(), My::PHP_MIN, '>='); && dcCore::app()->auth->isSuperAdmin()
} && My::phpCompliant();
if (self::$init) { if (static::$init) {
self::$improve = new Core(); self::$improve = new Core();
self::$type = self::getType(); self::$type = self::getType();
self::$module = self::getModule(); self::$module = self::getModule();
self::$action = self::getAction(); self::$action = self::getAction();
} }
return self::$init; return static::$init;
} }
private static function getType(): string private static function getType(): string
@ -166,7 +166,7 @@ class Manage extends dcNsProcess
public static function process(): bool public static function process(): bool
{ {
if (!self::$init) { if (!static::$init) {
return false; return false;
} }
@ -217,7 +217,7 @@ class Manage extends dcNsProcess
public static function render(): void public static function render(): void
{ {
if (!self::$init) { if (!static::$init) {
return; return;
} }

8
src/My.php
View file

@ -39,4 +39,12 @@ class My
{ {
return __((string) dcCore::app()->plugins->moduleInfo(self::id(), 'name')); return __((string) dcCore::app()->plugins->moduleInfo(self::id(), 'name'));
} }
/**
* Check php version
*/
public static function phpCompliant(): bool
{
return version_compare(phpversion(), self::PHP_MIN, '>=');
}
} }