VarSetType rename to SetVarType, add phan/phpstan/phpunit tests

Breaking change:
VarSetType/VarSetTypeNull classes have been renamed to
SetVarType/SetVarTypeNull

Added phan/phpstan static checkes and settings
Add phpunit tests (in test/phpunit) that are an exact copy from the
trunk folder unit tests

The phan/phpstan tests have been updated to work with the composer layout

config files with static defines needed for certain classes are stored
in test/configs (config.php, config.other.php, config.master.php)
This commit is contained in:
Clemens Schwaighofer
2023-02-22 07:52:51 +09:00
parent b56f889c5e
commit 6f653c24a0
77 changed files with 20066 additions and 28 deletions

View File

@@ -9,7 +9,7 @@ declare(strict_types=1);
namespace CoreLibs\Convert\Extends;
class VarSetTypeMain
class SetVarTypeMain
{
/**
* If input variable is string then returns it, else returns default set

View File

@@ -11,9 +11,9 @@ declare(strict_types=1);
namespace CoreLibs\Convert;
use CoreLibs\Convert\Extends\VarSetTypeMain;
use CoreLibs\Convert\Extends\SetVarTypeMain;
class VarSetType extends Extends\VarSetTypeMain
class SetVarType extends Extends\SetVarTypeMain
{
/**
* Check is input is string, if not return default string.
@@ -25,7 +25,7 @@ class VarSetType extends Extends\VarSetTypeMain
*/
public static function setStr(mixed $val, string $default = ''): string
{
return (string)VarSetTypeMain::setStrMain($val, $default, false);
return (string)SetVarTypeMain::setStrMain($val, $default, false);
}
/**
@@ -39,7 +39,7 @@ class VarSetType extends Extends\VarSetTypeMain
*/
public static function makeStr(mixed $val, string $default = ''): string
{
return (string)VarSetTypeMain::makeStrMain($val, $default, false);
return (string)SetVarTypeMain::makeStrMain($val, $default, false);
}
/**
@@ -52,7 +52,7 @@ class VarSetType extends Extends\VarSetTypeMain
*/
public static function setInt(mixed $val, int $default = 0): int
{
return (int)VarSetTypeMain::setIntMain($val, $default, false);
return (int)SetVarTypeMain::setIntMain($val, $default, false);
}
/**
@@ -65,7 +65,7 @@ class VarSetType extends Extends\VarSetTypeMain
*/
public static function makeInt(mixed $val, int $default = 0): int
{
return (int)VarSetTypeMain::makeIntMain($val, $default, false);
return (int)SetVarTypeMain::makeIntMain($val, $default, false);
}
/**
@@ -78,7 +78,7 @@ class VarSetType extends Extends\VarSetTypeMain
*/
public static function setFloat(mixed $val, float $default = 0.0): float
{
return (float)VarSetTypeMain::setFloatMain($val, $default, false);
return (float)SetVarTypeMain::setFloatMain($val, $default, false);
}
/**
@@ -91,7 +91,7 @@ class VarSetType extends Extends\VarSetTypeMain
*/
public static function makeFloat(mixed $val, float $default = 0.0): float
{
return (float)VarSetTypeMain::makeFloatMain($val, $default, false);
return (float)SetVarTypeMain::makeFloatMain($val, $default, false);
}
/**
@@ -104,7 +104,7 @@ class VarSetType extends Extends\VarSetTypeMain
*/
public static function setArray(mixed $val, array $default = []): array
{
return (array)VarSetTypeMain::setArrayMain($val, $default, false);
return (array)SetVarTypeMain::setArrayMain($val, $default, false);
}
/**
@@ -117,7 +117,7 @@ class VarSetType extends Extends\VarSetTypeMain
*/
public static function setBool(mixed $val, bool $default = false): bool
{
return (bool)VarSetTypeMain::setBoolMain($val, $default, false);
return (bool)SetVarTypeMain::setBoolMain($val, $default, false);
}
/**
@@ -129,7 +129,7 @@ class VarSetType extends Extends\VarSetTypeMain
*/
public static function makeBool(mixed $val, bool $default = false): bool
{
return (bool)VarSetTypeMain::makeBoolMain($val, $default, false);
return (bool)SetVarTypeMain::makeBoolMain($val, $default, false);
}
}

View File

@@ -9,9 +9,9 @@ declare(strict_types=1);
namespace CoreLibs\Convert;
use CoreLibs\Convert\Extends\VarSetTypeMain;
use CoreLibs\Convert\Extends\SetVarTypeMain;
class VarSetTypeNull extends Extends\VarSetTypeMain
class SetVarTypeNull extends Extends\SetVarTypeMain
{
/**
* Check is input is string, if not return default string.
@@ -23,7 +23,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
*/
public static function setStr(mixed $val, ?string $default = null): ?string
{
return VarSetTypeMain::setStrMain($val, $default, true);
return SetVarTypeMain::setStrMain($val, $default, true);
}
/**
@@ -37,7 +37,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
*/
public static function makeStr(mixed $val, string $default = null): ?string
{
return VarSetTypeMain::makeStrMain($val, $default, true);
return SetVarTypeMain::makeStrMain($val, $default, true);
}
@@ -50,7 +50,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
*/
public static function setInt(mixed $val, ?int $default = null): ?int
{
return VarSetTypeMain::setIntMain($val, $default, true);
return SetVarTypeMain::setIntMain($val, $default, true);
}
/**
@@ -62,7 +62,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
*/
public static function makeInt(mixed $val, int $default = null): ?int
{
return VarSetTypeMain::makeIntMain($val, $default, true);
return SetVarTypeMain::makeIntMain($val, $default, true);
}
/**
@@ -74,7 +74,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
*/
public static function setFloat(mixed $val, ?float $default = null): ?float
{
return VarSetTypeMain::setFloatMain($val, $default, true);
return SetVarTypeMain::setFloatMain($val, $default, true);
}
/**
@@ -86,7 +86,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
*/
public static function makeFloat(mixed $val, float $default = null): ?float
{
return VarSetTypeMain::makeFloatMain($val, $default, true);
return SetVarTypeMain::makeFloatMain($val, $default, true);
}
/**
@@ -98,7 +98,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
*/
public static function setArray(mixed $val, ?array $default = null): ?array
{
return VarSetTypeMain::setArrayMain($val, $default, true);
return SetVarTypeMain::setArrayMain($val, $default, true);
}
/**
@@ -110,7 +110,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
*/
public static function setBool(mixed $val, ?bool $default = null): ?bool
{
return VarSetTypeMain::setBoolMain($val, $default, true);
return SetVarTypeMain::setBoolMain($val, $default, true);
}
/**
@@ -123,7 +123,7 @@ class VarSetTypeNull extends Extends\VarSetTypeMain
{
// note that the default value here is irrelevant, we return null
// on unsetable string var
return VarSetTypeMain::makeBoolMain($val, false, true);
return SetVarTypeMain::makeBoolMain($val, false, true);
}
}

View File

@@ -1851,7 +1851,6 @@ class IO
// if cursor exists ...
if ($this->cursor_ext[$query_hash]['cursor']) {
/** @phpstan-ignore-next-line claims this is always false, but can be true */
if ($first_call === true) {
$this->cursor_ext[$query_hash]['log'][] = 'First call';
// count the rows returned (if select)
@@ -3048,7 +3047,6 @@ class IO
} else {
// find in all inside the array
$__arr = array_column($this->insert_id_arr, $key);
/** @phpstan-ignore-next-line [Why is this always true?] */
if (count($__arr)) {
return $__arr;
} else {

View File

@@ -453,7 +453,7 @@ class SmartyExtend extends \Smarty
$this->DATA['nav_menu_count'] = count($this->DATA['nav_menu']);
// messages = ['msg' =>, 'class' => 'error/warning/...']
$this->DATA['messages'] = $cms->messages;
} else { /** @phpstan-ignore-line Because I assume object for phpstan */
} else {
$this->DATA['show_ea_extra'] = false;
$this->DATA['ADMIN'] = 0;
$this->DATA['nav_menu'] = [];