$array any array
- * @param bool $no_html set to true to use ##HTMLPRE##
+ * @param bool $no_html default add
* @return string formatted array for output with tag added
*/
public static function printAr(array $array, bool $no_html = false): string
{
- if ($no_html === false) {
- return "" . print_r($array, true) . "
";
- } else {
- return '##HTMLPRE##' . print_r($array, true) . '##/HTMLPRE##';
- }
+ return $no_html ?
+ print_r($array, true) :
+ '' . print_r($array, true) . '
';
}
/**
* alternate name for printAr function
*
* @param array $array any array
- * @param bool $no_html set to true to use ##HTMLPRE##
+ * @param bool $no_html default add
* @return string formatted array for output with tag added
*/
public static function printArray(array $array, bool $no_html = false): string
@@ -61,26 +59,61 @@ class Support
return self::printAr($array, $no_html);
}
+ /**
+ * A replacement for the \CoreLibs\Debug\Support::printAr
+ * But this does not wrap it in
+ * Do not use this without using it in a string in debug function
+ * Note: for full data debug dumps use Support::dumpVar()
+ *
+ * @param array $a Array to format
+ * @return string print_r formated
+ */
+ public static function prAr(array $a): string
+ {
+ return self::printAr($a, true);
+ }
+
/**
* convert bool value to string
* if $name is set prefix with nae
* default true: true, false: false
*
- * @param bool $bool Variable to convert
- * @param string $name [default: ''] Prefix name
- * @param string $true [default: true] True string
- * @param string $false [default: false] False string
- * @return string String with converted bool text for debug
+ * @param bool $bool Variable to convert
+ * @param string $name [default: ''] Prefix name
+ * @param string $true [default: 'true'] True string
+ * @param string $false [default: 'false'] False string
+ * @param bool $no_html [default: false] if true do not print html
+ * @return string String with converted bool text for debug
*/
public static function printBool(
bool $bool,
string $name = '',
string $true = 'true',
+ string $false = 'false',
+ bool $no_html = false,
+ ): string {
+ return
+ (!empty($name) ?
+ ($no_html ?
+ $name : '' . $name . '') . ': '
+ : '')
+ . ($bool ? $true : $false);
+ }
+
+ /**
+ * Convert bool value to string value. Short name alias for printBool
+ *
+ * @param bool $bool Bool value to be transformed
+ * @param string $true [default: 'true'] Override default string 'true'
+ * @param string $false [default: 'false'] Override default string 'false'
+ * @return string $true or $false string for true/false bool
+ */
+ public static function prBl(
+ bool $bool,
+ string $true = 'true',
string $false = 'false'
): string {
- $string = (!empty($name) ? '' . $name . ': ' : '')
- . ($bool ? $true : $false);
- return $string;
+ return self::printBool($bool, '', $true, $false, true);
}
/**
@@ -89,9 +122,10 @@ class Support
* if object return get_class
* for array use printAr function, can be controlled with no_html for
* Debug\Logging compatible output
+ * Recommended to use Support::dumpVar()
*
* @param mixed $mixed
- * @param bool $no_html set to true to use ##HTMLPRE##or html escape
+ * @param bool $no_html set to true to strip tags
* @return string
*/
public static function printToString(mixed $mixed, bool $no_html = false): string
@@ -119,12 +153,93 @@ class Support
}
}
+ /**
+ * Dumps var data and returns it as string
+ * var_dump based
+ * Recommended debug output
+ *
+ * @param mixed $data Anything
+ * @param bool $no_html [default=false] If true strip all html tags
+ * (for text print)
+ * @return string A text string
+ */
+ public static function dumpVar(
+ mixed $data,
+ bool $no_html = false,
+ ): string {
+ // dump data
+ ob_start();
+ var_dump($data);
+ $debug_dump = ob_get_clean() ?: '[FAILED TO GET var_dump() data]';
+ // check if the original caller is dV, if yes, up the caller level for
+ // the file line get by 1, so we get file + pos from the dV call and
+ // not this call
+ $caller_level = 1;
+ $caller_list = self::getCallerMethodList();
+ if ($caller_list[0] == 'dV') {
+ echo "Raise caller level
: " . $caller_list[0] . "
";
+ $caller_level = 2;
+ }
+ // we need to strip the string in :
+ // and replace it with the caller methods and location
+ $caller_file_number = self::getCallerFileLine($caller_level);
+ $debug_dump = preg_replace(
+ '|(/.*:\d+:)|',
+ '' . $caller_file_number . ':',
+ $debug_dump
+ ) ?? $debug_dump; // in case of failure keep original
+ // if strip is ture, remove all HTML tags and convert any html entities back
+ return $no_html ?
+ str_replace(
+ // things to replace in the string if set
+ ['>', '<', '
', '
'],
+ ['>', '<', "\r", "\n"],
+ strip_tags($debug_dump)
+ ) :
+ $debug_dump;
+ }
+
+ /**
+ * exports (dumps) var, in more printable design, but without detail info
+ *
+ * @param mixed $data Anything
+ * @param bool $no_html If true true do not add tags
+ * @return string A text string
+ */
+ public static function exportVar(mixed $data, bool $no_html = false): string
+ {
+ return $no_html ?
+ var_export($data, true) :
+ '' . var_export($data, true) . '
';
+ }
+
+ /**
+ * Return file name and line number where this was called
+ * One level up
+ *
+ * @param int $level trace level, default 1
+ * @return string|null null or file name:line number
+ */
+ public static function getCallerFileLine(int $level = 1): ?string
+ {
+ $traces = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
+ // print \CoreLibs\Debug\Support::printAr($traces);
+ // We should check from top down if unset?
+ // sets the start point here, and in level two (the sub call) we find this
+ if (isset($traces[$level])) {
+ return ($traces[$level]['file'] ?? $traces[$level]['function'])
+ . ':' . ($traces[$level]['line'] ?? '-');
+ }
+ return null;
+ }
+
/**
* if there is a need to find out which parent method called a child method,
* eg for debugging, this function does this
*
* call this method in the child method and you get the parent function that called
- * @param int $level debug level, default 1
+ * @param int $level trace level, default 1
* @return ?string null or the function that called the function
* where this method is called
*/
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Get/System.php b/www/vendor/egrajp/corelibs-composer-all/src/Get/System.php
index 4984564d..690b43b8 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Get/System.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Get/System.php
@@ -54,14 +54,15 @@ class System
/**
* get the host name without the port as given by the SELF var
+ * if no host name found will set to NOHOST:0
*
- * @return array host name/port name
+ * @return array{string,int} host name/port number
*/
public static function getHostName(): array
{
- $host = $_SERVER['HTTP_HOST'] ?? 'NOHOST:NOPORT';
- list($host_name, $port) = array_pad(explode(':', $host), 2, self::DEFAULT_PORT);
- return [$host_name, $port];
+ $host = $_SERVER['HTTP_HOST'] ?? 'NOHOST:0';
+ [$host_name, $port] = array_pad(explode(':', $host), 2, self::DEFAULT_PORT);
+ return [$host_name, (int)$port];
}
/**
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/CachedFileReader.php b/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/CachedFileReader.php
index adcd535c..95721bbc 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/CachedFileReader.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/CachedFileReader.php
@@ -29,9 +29,9 @@ namespace CoreLibs\Language\Core;
class CachedFileReader extends \CoreLibs\Language\Core\StringReader
{
/** @var int */
- public $error = 0;
+ public int $error = 0;
/** @var string */
- public $fd_str = '';
+ public string $fd_str = '';
/**
* Undocumented function
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/FileReader.php b/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/FileReader.php
index 8488fa38..ae4f6e18 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/FileReader.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/FileReader.php
@@ -27,13 +27,13 @@ namespace CoreLibs\Language\Core;
class FileReader
{
/** @var int */
- public $fr_pos;
+ public int $fr_pos;
/** @var resource|bool */
- public $fr_fd;
+ public mixed $fr_fd; // no resource type yet
/** @var int */
- public $fr_length;
+ public int $fr_length;
/** @var int */
- public $error = 0;
+ public int $error = 0;
/**
* file read constructor
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/GetTextReader.php b/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/GetTextReader.php
index 3fa7404d..0a5715a7 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/GetTextReader.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/GetTextReader.php
@@ -41,31 +41,31 @@ class GetTextReader
{
// public:
/** @var int */
- public $error = 0; // public variable that holds error code (0 if no error)
+ public int $error = 0; // public variable that holds error code (0 if no error)
// private:
/** @var int */
- private $BYTEORDER = 0; // 0: low endian, 1: big endian
+ private int $BYTEORDER = 0; // 0: low endian, 1: big endian
/** @var FileReader */
- private $STREAM;
+ private FileReader $STREAM;
/** @var bool */
- private $short_circuit = false;
+ private bool $short_circuit = false;
/** @var bool */
- private $enable_cache = false;
+ private bool $enable_cache = false;
/** @var int */
- private $originals = 0; // offset of original table
+ private int $originals = 0; // offset of original table
/** @var int */
- private $translations = 0; // offset of translation table
+ private int $translations = 0; // offset of translation table
/** @var string */
- private $pluralheader = ''; // cache header field for plural forms
+ private string $pluralheader = ''; // cache header field for plural forms
/** @var int */
- private $total = 0; // total string count
+ private int $total = 0; // total string count
/** @var array|null */
- private $table_originals = null; // table for original strings (offsets)
+ private array|null $table_originals = null; // table for original strings (offsets)
/** @var array|null */
- private $table_translations = null; // table for translated strings (offsets)
+ private array|null $table_translations = null; // table for translated strings (offsets)
/** @var array */
- private $cache_translations = []; // original -> translation mapping
+ private array $cache_translations = []; // original -> translation mapping
/* Methods */
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/StringReader.php b/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/StringReader.php
index 90766e9e..063647d3 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/StringReader.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Language/Core/StringReader.php
@@ -27,9 +27,9 @@ namespace CoreLibs\Language\Core;
class StringReader
{
/** @var int */
- public $sr_pos;
+ public int $sr_pos;
/** @var string */
- public $sr_str;
+ public string $sr_str;
/**
* constructor for string reader
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Language/L10n.php b/www/vendor/egrajp/corelibs-composer-all/src/Language/L10n.php
index 75db228a..dcf97a74 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Language/L10n.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Language/L10n.php
@@ -35,42 +35,42 @@ class L10n
/** @var string the default fallback encoding if nothing is set */
public const DEFAULT_CHARSET = 'UTF-8';
/** @var string the current locale */
- private $locale = '';
+ private string $locale = '';
/** @var string the SET locale as WHERE the domain file is */
- private $locale_set = '';
+ private string $locale_set = '';
/** @var string the default selected/active domain */
- private $domain = '';
+ private string $domain = '';
/** @var string encoding, as from locale or set from outside */
- private $override_encoding = self::DEFAULT_CHARSET;
+ private string $override_encoding = self::DEFAULT_CHARSET;
/** @var string encoding set during the parse Locale */
- private $encoding = '';
+ private string $encoding = '';
/** @var array> locale > domain = translator */
- private $domains = [];
+ private array $domains = [];
/** @var array bound paths for domains */
- private $paths = ['' => './'];
+ private array $paths = ['' => './'];
// files
/** @var string the full path to the mo file to loaded */
- private $mofile = '';
+ private string $mofile = '';
/** @var string base path to search level */
- private $base_locale_path = '';
+ private string $base_locale_path = '';
/** @var string dynamic set path to where the mo file is actually */
- private $base_content_path = '';
+ private string $base_content_path = '';
// errors
/** @var bool if load of mo file was unsuccessful */
- private $load_failure = false;
+ private bool $load_failure = false;
// object holders
/** @var FileReader|bool reader class for file reading, false for short circuit */
- private $input = false;
+ private FileReader|bool $input = false;
/** @var GetTextReader reader class for MO data */
- private $l10n;
+ private GetTextReader|null $l10n = null;
/**
* @static
* @var L10n self class
*/
- private static $instance;
+ private static L10n $instance;
/**
* class constructor call for language getstring
@@ -124,7 +124,6 @@ class L10n
*/
public static function getInstance(): L10n
{
- /** @phpstan-ignore-next-line */
if (empty(self::$instance)) {
self::$instance = new self();
}
@@ -253,6 +252,13 @@ class L10n
// dummy
$this->l10n = new GetTextReader($this->input);
}
+ // if this is still null here, we abort
+ if ($this->l10n === null) {
+ throw new \Exception(
+ "Could not create CoreLibs\Language\Core\GetTextReader object",
+ E_USER_ERROR
+ );
+ }
return $this->l10n;
}
@@ -673,6 +679,7 @@ class L10n
// fallback passthrough
if ($this->l10n === null) {
echo $text;
+ return;
}
echo $this->l10n->translate($text);
}
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logger/Flag.php b/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logger/Flag.php
new file mode 100644
index 00000000..6fb8fc45
--- /dev/null
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logger/Flag.php
@@ -0,0 +1,107 @@
+ per_date, cannot be used at the same time)
+ * per_group: for debug level, group per group id (old level)
+ * per_page: per file name logging
+ * per_class: log per class
+ * per_level: per logging level file split
+*/
+
+declare(strict_types=1);
+
+namespace CoreLibs\Logging\Logger;
+
+enum Flag: int
+{
+ /** all off flag */
+ case all_off = 0;
+
+ /** write per run */
+ case per_run = 1;
+
+ /** write per date */
+ case per_date = 2;
+
+ /** was PER_LEVEL, write per group id (debug) */
+ case per_group = 4;
+
+ /** write per page (filename) */
+ case per_page = 8;
+
+ /** write per class */
+ case per_class = 16;
+
+ /** write per log level name */
+ case per_level = 32;
+
+ /**
+ * get internal name from string value
+ *
+ * @param non-empty-string $name
+ * @return self
+ */
+ public static function fromName(string $name): self
+ {
+ return match ($name) {
+ 'Run', 'run', 'per_run', 'PER_RUN' => self::per_run,
+ 'Date', 'date', 'per_date', 'PER_DATE' => self::per_date,
+ 'Group', 'group', 'per_group', 'PER_GROUP' => self::per_group,
+ 'Page', 'page', 'per_page', 'PER_PAGE' => self::per_page,
+ 'Class', 'class', 'per_class', 'PER_CLASS' => self::per_class,
+ 'Level', 'level', 'per_level', 'PER_LEVEL' => self::per_level,
+ default => self::all_off,
+ };
+ }
+
+ /**
+ * Get internal name from int value
+ *
+ * @param int $value
+ * @return self
+ */
+ public static function fromValue(int $value): self
+ {
+ return self::from($value);
+ }
+
+ /**
+ * convert current set level to name (upper case)
+ *
+ * @return string
+ */
+ public function getName(): string
+ {
+ return strtoupper($this->name);
+ }
+
+ /** @var int[] */
+ public const VALUES = [
+ 0,
+ 1,
+ 2,
+ 4,
+ 8,
+ 16,
+ 32,
+ ];
+
+ /** @var string[] */
+ public const NAMES = [
+ 'ALL_OFF',
+ 'PER_RUN',
+ 'PER_DATE',
+ 'PER_GROUP',
+ 'PER_PAGE',
+ 'PER_CLASS',
+ 'PER_LEVEL',
+ ];
+}
+
+// __END__
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logger/Level.php b/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logger/Level.php
new file mode 100644
index 00000000..355dce43
--- /dev/null
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logger/Level.php
@@ -0,0 +1,216 @@
+getName() to get the standard Monolog name which is full uppercased (e.g. "DEBUG")
+ * - Use ->toPsrLogLevel() to get the standard PSR-3 name which is full lowercased (e.g. "debug")
+ * - Use ->toRFC5424Level() to get the standard RFC 5424 value (e.g. 7 for debug, 0 for emergency)
+ * - Use ->name to get the enum case's name which is capitalized (e.g. "Debug")
+ *
+ * To get the internal value for filtering, if the includes/isLowerThan/isHigherThan methods are
+ * not enough, you can use ->value to get the enum case's integer value.
+ */
+enum Level: int
+{
+ /**
+ * Detailed debug information
+ */
+ case Debug = 100;
+
+ /**
+ * Interesting events
+ *
+ * Examples: User logs in, SQL logs.
+ */
+ case Info = 200;
+
+ /**
+ * Uncommon events
+ */
+ case Notice = 250;
+
+ /**
+ * Exceptional occurrences that are not errors
+ *
+ * Examples: Use of deprecated APIs, poor use of an API,
+ * undesirable things that are not necessarily wrong.
+ */
+ case Warning = 300;
+
+ /**
+ * Runtime errors
+ */
+ case Error = 400;
+
+ /**
+ * Critical conditions
+ *
+ * Example: Application component unavailable, unexpected exception.
+ */
+ case Critical = 500;
+
+ /**
+ * Action must be taken immediately
+ *
+ * Example: Entire website down, database unavailable, etc.
+ * This should trigger the SMS alerts and wake you up.
+ */
+ case Alert = 550;
+
+ /**
+ * Urgent alert.
+ */
+ case Emergency = 600;
+
+ /**
+ * @param value-of|LogLevel::*|'Debug'|'Info'|'Notice'|'Warning'|'Error'|'Critical'|'Alert'|'Emergency' $name
+ * @return static
+ */
+ public static function fromName(string $name): self
+ {
+ return match ($name) {
+ 'debug', 'Debug', 'DEBUG' => self::Debug,
+ 'info', 'Info', 'INFO' => self::Info,
+ 'notice', 'Notice', 'NOTICE' => self::Notice,
+ 'warning', 'Warning', 'WARNING' => self::Warning,
+ 'error', 'Error', 'ERROR' => self::Error,
+ 'critical', 'Critical', 'CRITICAL' => self::Critical,
+ 'alert', 'Alert', 'ALERT' => self::Alert,
+ 'emergency', 'Emergency', 'EMERGENCY' => self::Emergency,
+ };
+ }
+
+ /**
+ * @param value-of $value
+ * @return static
+ */
+ public static function fromValue(int $value): self
+ {
+ return self::from($value);
+ }
+
+ /**
+ * Returns true if the passed $level is higher or equal to $this
+ */
+ public function includes(Level $level): bool
+ {
+ return $this->value <= $level->value;
+ }
+
+ public function isHigherThan(Level $level): bool
+ {
+ return $this->value > $level->value;
+ }
+
+ public function isLowerThan(Level $level): bool
+ {
+ return $this->value < $level->value;
+ }
+
+ /**
+ * Returns the monolog standardized all-capitals name of the level
+ *
+ * Use this instead of $level->name which returns the enum case name (e.g. Debug vs DEBUG if you use getName())
+ *
+ * @phan-suppress-next-line PhanTypeMismatchDeclaredReturn
+ * @return value-of
+ */
+ public function getName(): string
+ {
+ return match ($this) {
+ self::Debug => 'DEBUG',
+ self::Info => 'INFO',
+ self::Notice => 'NOTICE',
+ self::Warning => 'WARNING',
+ self::Error => 'ERROR',
+ self::Critical => 'CRITICAL',
+ self::Alert => 'ALERT',
+ self::Emergency => 'EMERGENCY',
+ };
+ }
+
+ /**
+ * Returns the PSR-3 level matching this instance
+ *
+ * @phpstan-return \Psr\Log\LogLevel::*
+ */
+ public function toPsrLogLevel(): string
+ {
+ return match ($this) {
+ self::Debug => LogLevel::DEBUG,
+ self::Info => LogLevel::INFO,
+ self::Notice => LogLevel::NOTICE,
+ self::Warning => LogLevel::WARNING,
+ self::Error => LogLevel::ERROR,
+ self::Critical => LogLevel::CRITICAL,
+ self::Alert => LogLevel::ALERT,
+ self::Emergency => LogLevel::EMERGENCY,
+ };
+ }
+
+ /**
+ * Returns the RFC 5424 level matching this instance
+ *
+ * @phpstan-return int<0, 7>
+ */
+ public function toRFC5424Level(): int
+ {
+ return match ($this) {
+ self::Debug => 7,
+ self::Info => 6,
+ self::Notice => 5,
+ self::Warning => 4,
+ self::Error => 3,
+ self::Critical => 2,
+ self::Alert => 1,
+ self::Emergency => 0,
+ };
+ }
+
+ public const VALUES = [
+ 100,
+ 200,
+ 250,
+ 300,
+ 400,
+ 500,
+ 550,
+ 600,
+ ];
+
+ public const NAMES = [
+ 'DEBUG',
+ 'INFO',
+ 'NOTICE',
+ 'WARNING',
+ 'ERROR',
+ 'CRITICAL',
+ 'ALERT',
+ 'EMERGENCY',
+ ];
+}
+
+
+// __END__
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logging.php b/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logging.php
new file mode 100644
index 00000000..81630a33
--- /dev/null
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Logging/Logging.php
@@ -0,0 +1,1334 @@
+>|array{string:array{type:string,type_info?:string,mandatory:true,alias?:string,default:string|bool|Level,deprecated:bool,use?:string}} */
+ private const OPTIONS = [
+ 'log_folder' => [
+ 'type' => 'string', 'mandatory' => true,
+ 'default' => '', 'deprecated' => false
+ ],
+ 'log_file_id' => [
+ 'type' => 'string', 'mandatory' => true, 'alias' => 'file_id',
+ 'default' => '', 'deprecated' => false
+ ],
+ 'file_id' => [
+ 'type' => 'string', 'mandatory' => false,
+ 'default' => '', 'deprecated' => true, 'use' => 'log_file_id'
+ ],
+ 'log_level' => [
+ 'type' => 'instance',
+ 'type_info' => '\CoreLibs\Logging\Logger\Level',
+ 'mandatory' => false,
+ 'default' => Level::Debug,
+ 'deprecated' => false
+ ],
+ // options
+ 'log_per_run' => [
+ 'type' => 'bool', 'mandatory' => false,
+ 'default' => false, 'deprecated' => false
+ ],
+ 'log_per_date' => [
+ 'type' => 'bool', 'mandatory' => false,
+ 'default' => false, 'deprecated' => false
+ ],
+ 'log_per_group' => [
+ 'type' => 'bool', 'mandatory' => false,
+ 'default' => false, 'deprecated' => false
+ ],
+ 'log_per_page' => [
+ 'type' => 'bool', 'mandatory' => false,
+ 'default' => false, 'deprecated' => false
+ ],
+ 'log_per_class' => [
+ 'type' => 'bool', 'mandatory' => false,
+ 'default' => false, 'deprecated' => false
+ ],
+ 'log_per_level' => [
+ 'type' => 'bool', 'mandatory' => false,
+ 'default' => false, 'deprecated' => false
+ ],
+ 'print_file_date' => [
+ 'type' => 'bool', 'mandatory' => false,
+ 'default' => false, 'deprecated' => true, 'use' => 'log_per_date'
+ ],
+ ];
+
+ // options
+ /** @var array */
+ private array $options = [];
+
+ /** @var Level set level */
+ private Level $log_level;
+
+ // page and host name
+ /** @var string */
+ private string $host_name;
+ /** @var int */
+ private int $host_port;
+ /** @var string unique ID set on class init and used in logging as prefix */
+ private string $running_uid = '';
+
+ // log file name
+ /** @var string */
+ private string $log_folder = '';
+ /** @var string a alphanumeric name that has to be set as global definition */
+ private string $log_file_id = '';
+ /** @var string log file name extension */
+ private string $log_file_name_ext = 'log';
+ /** @var string log file name with folder, for actual writing */
+ private string $log_file_name = '';
+ /** @var int set in bytes */
+ private int $log_max_filesize = 0;
+ /** @var string used if no log id set or found */
+ private string $log_file_prefix = 'error_msg';
+ /** @var string */
+ private string $log_print_file = '{LOGID}{LEVEL}{GROUP}{CLASS}{PAGENAME}{DATE_RUNID}';
+ /** @var string a unique ID set only once for call derived from this class */
+ private string $log_file_unique_id = '';
+ /** @var string Y-m-d file in file name */
+ private string $log_file_date = '';
+
+ /**
+ * 1: create a new log file per run (time stamp + unique ID)
+ * 2: add Y-m-d and do automatic daily rotation
+ * 4: split per group (first parameter in debug call, group id, former level)
+ * 8: split log per called file
+ * 16: split log per class
+ * 32: split log per set log level
+ */
+ /** @var int bitwise set for log flags */
+ private int $log_flags = 0;
+ /** @var array valid log flag names */
+ private array $log_valid_flags = [
+ 'log_per_run' => Flag::per_run,
+ 'log_per_date' => Flag::per_date,
+ 'log_per_group' => Flag::per_group,
+ 'log_per_page' => Flag::per_page,
+ 'log_per_class' => Flag::per_class,
+ // not before it was PER_GROUP type
+ 'log_per_level' => Flag::per_level,
+ // below are old & deprecated
+ 'print_file_date' => Flag::per_date,
+ ];
+
+ /**
+ * Init logger
+ *
+ * options array layout
+ * - log_folder:
+ * - log_file_id / file_id (will be deprecated):
+ * - log_level:
+ *
+ * - log_per_run:
+ * - log_per_date: (was print_file_date)
+ * - log_per_group
+ * - log_per_page:
+ * - log_per_class:
+ * - log_per_level:
+ *
+ * @param array $options Array with settings options
+ */
+ public function __construct(array $options = [])
+ {
+ // options chekc
+ // must set values
+ // * path
+ // * file id
+ // * log level
+ $this->optionsCheck($options);
+
+ // set log level
+ $this->initLogLevel();
+ // set log folder from options
+ $this->initLogFolder();
+ // set per run UID for logging
+ $this->running_uid = Uids::uniqIdShort();
+ // set host name
+ $this->initHostName();
+ // set file id
+ $this->initLogFileId();
+ // set max file size for logging, 0 = no limit
+ $this->setLogMaxFileSize($this->options['log_max_file_size'] ?? 0);
+ // set flags and values needed for those flags
+ $this->initLogFlagsAndValues();
+ }
+
+ // *********************************************************************
+ // PRIVATE METHODS
+ // *********************************************************************
+
+ /**
+ * Undocumented function
+ *
+ * @param array $options
+ * @return bool
+ */
+ private function optionsCheck(array $options): bool
+ {
+ // make sure only valid ones are in the options list,
+ // drop all others
+ // check for missing (trigger warning?)
+ foreach (self::OPTIONS as $name => $settings) {
+ // first deprecation warnings
+ if (isset($options[$name]) && $settings['deprecated']) {
+ trigger_error(
+ 'options: "' . $name . '" is deprecated use: "'
+ . ($settings['use'] ?? 'NO_REPLACEMENT') . '".',
+ E_USER_DEPRECATED
+ );
+ }
+ // if mandatory and not set -> warning
+ if (
+ $settings['mandatory'] && !isset($options[$name]) &&
+ empty($settings['alias'])
+ ) {
+ throw new \InvalidArgumentException(
+ 'Missing mandatory option: "' . $name . '"',
+ E_USER_WARNING
+ );
+ } elseif (
+ // if not mandatory and not set -> default
+ !$settings['mandatory'] && !isset($options[$name])
+ ) {
+ $this->options[$name] = $settings['default'];
+ } else {
+ // else set from options
+ $this->options[$name] = $options[$name] ?? $settings['default'];
+ }
+ // check valid type (only type not content)
+ switch ($settings['type']) {
+ case 'bool':
+ if (!is_bool($this->options[$name])) {
+ throw new \InvalidArgumentException(
+ 'Option: "' . $name . '" is not of type bool',
+ E_USER_ERROR
+ );
+ }
+ break;
+ case 'string':
+ if (!is_string($this->options[$name])) {
+ throw new \InvalidArgumentException(
+ 'Option: "' . $name . '" is not of type string',
+ E_USER_ERROR
+ );
+ }
+ break;
+ case 'instance':
+ if (
+ empty($settings['type_info']) ||
+ !$this->options[$name] instanceof $settings['type_info']
+ ) {
+ throw new \InvalidArgumentException(
+ 'Option: "' . $name . '" is not of instance '
+ . ($settings['type_info'] ?? 'NO INSTANCE DEFINED'),
+ E_USER_ERROR
+ );
+ }
+ break;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * init log level, just a wrapper to auto set from options
+ *
+ * @return void
+ */
+ private function initLogLevel()
+ {
+ // if this is not a valid instance of Level Enum then set to Debug
+ if (
+ empty($this->options['log_level']) ||
+ !$this->options['log_level'] instanceof Level
+ ) {
+ $this->options['log_level'] = Level::Debug;
+ }
+ $this->setLoggingLevel($this->options['log_level']);
+ }
+
+ /**
+ * Set the log folder
+ * If folder is not writeable the script will throw an E_USER_ERROR
+ *
+ * @return bool True on proper set, False on not proper set folder
+ */
+ private function initLogFolder(): bool
+ {
+ $status = true;
+ // set log folder from options
+ $log_folder = $this->options['log_folder'] ?? '';
+ // legacy flow, check must set constants
+ if (empty($log_folder) && defined('BASE') && defined('LOG')) {
+ /** @deprecated Do not use this anymore, define path on class load */
+ trigger_error(
+ 'options: log_folder must be set. Setting via BASE and LOG constants is deprecated',
+ E_USER_DEPRECATED
+ );
+ // make sure this is writeable, else skip
+ $log_folder = BASE . LOG;
+ $status = false;
+ }
+ // fallback + notice
+ if (empty($log_folder)) {
+ /* trigger_error(
+ 'option log_folder is empty. fallback to: ' . getcwd(),
+ E_USER_NOTICE
+ ); */
+ $log_folder = getcwd() . DIRECTORY_SEPARATOR;
+ $status = false;
+ }
+ // if folder is not writeable, abort
+ if (!$this->setLogFolder($log_folder)) {
+ throw new InvalidArgumentException(
+ 'Folder: "' . $log_folder . '" is not writeable for logging',
+ E_USER_ERROR
+ );
+ }
+ return $status;
+ }
+
+ /**
+ * Set the hostname and port
+ * If port is not defaul 80 it will be added to the host name
+ *
+ * @return void
+ */
+ private function initHostName(): void
+ {
+ // set host name
+ [$this->host_name, $this->host_port] = System::getHostName();
+ // add port to host name if not port 80
+ if ($this->host_port != 80) {
+ $this->host_name .= ':' . (string)$this->host_port;
+ }
+ }
+
+ /**
+ * set log file prefix id
+ *
+ * @return bool
+ */
+ private function initLogFileId(): bool
+ {
+ $status = true;
+
+ // alert of log_file_id and file_id is, log_file_id is prefered
+ if (
+ !empty($this->options['log_file_id']) &&
+ !empty($this->options['file_id'])
+ ) {
+ trigger_error(
+ 'options: both log_file_id and log_id are set at the same time, will use log_file_id',
+ E_USER_WARNING
+ );
+ $this->options['log_file_id'] = $this->options['file_id'];
+ unset($this->options['file_id']);
+ }
+ if (
+ empty($this->options['log_file_id']) &&
+ !empty($this->options['file_id'])
+ ) {
+ // will trigger deprecation in future
+ $this->options['log_file_id'] = $this->options['file_id'];
+ unset($this->options['file_id']);
+ }
+
+ // can be overridden with basicSetLogFileId later
+ if (!empty($this->options['log_file_id'])) {
+ $this->setLogFileId($this->options['log_file_id']);
+ } elseif (!empty($GLOBALS['LOG_FILE_ID'])) {
+ /** @deprecated Do not use this anymore, define file_id on class load */
+ trigger_error(
+ 'options: log_file_id must be set. Setting via LOG_FILE_ID global variable is deprecated',
+ E_USER_DEPRECATED
+ );
+ $status = false;
+ // legacy flow, should be removed and only set via options
+ $this->setLogFileId($GLOBALS['LOG_FILE_ID']);
+ } else {
+ // auto set (should be deprecated in future)
+ $this->setLogFileId(
+ str_replace(':', '-', $this->host_name) . '_'
+ . str_replace('\\', '-', Support::getCallerClass())
+ );
+ }
+ if (empty($this->getLogFileId())) {
+ throw new InvalidArgumentException(
+ 'LogFileId: no log file id set',
+ E_USER_ERROR
+ );
+ }
+ return $status;
+ }
+
+ /**
+ * set flags from options and option flags connection internal settings
+ *
+ * @return void
+ */
+ private function initLogFlagsAndValues(): void
+ {
+ // first set all flags
+ foreach ($this->log_valid_flags as $log_flag => $log_flag_key) {
+ if (empty($this->options[$log_flag])) {
+ continue;
+ }
+ $this->setLogFlag($log_flag_key);
+ }
+ // init per run uid
+ if ($this->getLogFlag(Flag::per_run)) {
+ $this->setLogUniqueId();
+ } elseif ($this->getLogFlag(Flag::per_date)) {
+ // init file date
+ $this->log_file_date = date('Y-m-d');
+ }
+ }
+
+ /**
+ * check if set log level is equal or higher than
+ * requested one
+ *
+ * @param Level $level
+ * @return bool True to allow write, False for not
+ */
+ private function checkLogLevel(Level $level): bool
+ {
+ return $this->log_level->includes($level);
+ }
+
+ /**
+ * Build the file name for writing
+ *
+ * @param Level $level Request log level
+ * @param string $group_id Debug level group name id
+ * @return string
+ */
+ private function buildLogFileName(Level $level, string $group_id = ''): string
+ {
+ // init base file path
+ $fn = $this->log_print_file . '.' . $this->log_file_name_ext;
+ // log ID prefix settings, if not valid, replace with empty
+ if (!empty($this->log_file_id)) {
+ $rpl_string = $this->log_file_id;
+ } else {
+ $rpl_string = $this->log_file_prefix;
+ }
+ $fn = str_replace('{LOGID}', $rpl_string, $fn); // log id (like a log file prefix)
+
+ $rpl_string = !$this->getLogFlag(Flag::per_level) ? '' :
+ '_' . $level->getName();
+ $fn = str_replace('{LEVEL}', $rpl_string, $fn); // create output filename
+
+ // write per level
+ $rpl_string = !$this->getLogFlag(Flag::per_group) ? '' :
+ // normalize level, replace all non alphanumeric characters with -
+ '_' . (
+ // if return is only - then set error string
+ preg_match(
+ "/^-+$/",
+ $level_string = preg_replace("/[^A-Za-z0-9-_]/", '-', $group_id) ?? ''
+ ) ?
+ 'INVALID-LEVEL-STRING' :
+ $level_string
+ );
+ $fn = str_replace('{GROUP}', $rpl_string, $fn); // create output filename
+ // set per class, but don't use get_class as we will only get self
+ $rpl_string = !$this->getLogFlag(Flag::per_class) ? '' : '_'
+ // set sub class settings
+ . str_replace('\\', '-', Support::getCallerClass());
+ $fn = str_replace('{CLASS}', $rpl_string, $fn); // create output filename
+
+ // if request to write to one file
+ $rpl_string = !$this->getLogFlag(Flag::per_page) ?
+ '' :
+ '_' . System::getPageName(System::NO_EXTENSION);
+ $fn = str_replace('{PAGENAME}', $rpl_string, $fn); // create output filename
+
+ // if run id, we auto add ymd, so we ignore the log file date
+ if ($this->getLogFlag(Flag::per_run)) {
+ $rpl_string = '_' . $this->getLogUniqueId(); // add 8 char unique string
+ } elseif ($this->getLogFlag(Flag::per_date)) {
+ $rpl_string = '_' . $this->getLogDate(); // add date to file
+ } else {
+ $rpl_string = '';
+ }
+ $fn = str_replace('{DATE_RUNID}', $rpl_string, $fn); // create output filename
+ $this->log_file_name = $fn;
+
+ return $fn;
+ }
+
+ /**
+ * writes error msg data to file for current level
+ *
+ * @param Level $level Log Level we wnat to write to
+ * @param string|Stringable $message Log message to write
+ * @param string $group_id A group
+ * @return bool True if message written, False if not
+ */
+ private function writeErrorMsg(
+ Level $level,
+ string|\Stringable $message,
+ string $group_id = ''
+ ): bool {
+ // only write if write is requested
+ if (!$this->checkLogLevel($level)) {
+ return false;
+ }
+
+ // build logging file name
+ // fn is log folder + file name
+ $fn = $this->log_folder . $this->buildLogFileName($level, $group_id);
+
+ // write to file
+ // first check if max file size is is set and file is bigger
+ if (
+ $this->log_max_filesize > 0 &&
+ (filesize($fn) > $this->log_max_filesize)
+ ) {
+ // for easy purpose, rename file only to attach timestamp, no sequence numbering
+ rename($fn, $fn . '.' . date("YmdHis"));
+ }
+ $fp = fopen($fn, 'a');
+ if ($fp === false) {
+ echo "";
+ return false;
+ }
+ fwrite($fp, $message . "\n");
+ fclose($fp);
+ return true;
+ }
+
+ /**
+ * Prepare the log message with all needed info blocks:
+ * [timestamp] [host name] [file path + file] [running uid] {class} - message
+ *
+ * @param string $level_str Log level we will write to
+ * @param string|Stringable $message The message to write
+ * @param mixed[] $context Any additional info we want to attach in any format
+ * @param string $group_id A group id, only used in DEBUG level,
+ * if empty set to log level
+ * @return string
+ */
+ private function prepareLog(
+ string $level_str,
+ string|\Stringable $message,
+ array $context = [],
+ string $group_id = '',
+ ): string {
+ // file + line: call not this but one before (the one that calls this)
+ $file_line = Support::getCallerFileLine(2) ??
+ System::getPageName(System::FULL_PATH);
+ // get the last class entry and wrie that
+ $class = Support::getCallerClass();
+ // method/function: prepareLog->(debug|info|...)->[THIS]
+ $method = Support::getCallerMethod(3);
+ if ($method !== null) {
+ $class .= '::' . $method;
+ }
+ // get timestamp
+ $timestamp = Support::printTime();
+
+ // if group id is empty replace it with current level
+ $group_str = $level_str;
+ if (!empty($group_id)) {
+ $group_str .= ':' . $group_id;
+ }
+ // additional context
+ $context_str = '';
+ if ($context != []) {
+ // TODO this here has to be changed to something better
+ $context_str = ' ' . print_r($context, true);
+ }
+ // build log string
+ return '[' . $timestamp . '] '
+ . '[' . $this->host_name . '] '
+ . '[' . $file_line . '] '
+ . '[' . $this->running_uid . '] '
+ . '{' . $class . '} '
+ . '<' . strtoupper($group_str) . '> '
+ . $message
+ . $context_str;
+ }
+
+ // *********************************************************************
+ // PUBLIC STATIC METHJODS
+ // *********************************************************************
+
+ /**
+ * set the log level
+ *
+ * from Monolog\Logger
+ *
+ * @param string|int|Level $level
+ * @return Level
+ */
+ public static function processLogLevel(string|int|Level $level): Level
+ {
+ if ($level instanceof Level) {
+ return $level;
+ }
+
+ if (\is_string($level)) {
+ if (\is_numeric($level)) {
+ $levelEnum = Level::tryFrom((int)$level);
+ if ($levelEnum === null) {
+ throw new InvalidArgumentException(
+ 'Level "' . $level . '" is not defined, use one of: '
+ /** @phan-suppress-next-line PhanUselessBinaryAddRight */
+ . implode(', ', Level::NAMES + Level::VALUES)
+ );
+ }
+ return $levelEnum;
+ }
+
+ // Contains first char of all log levels and avoids using strtoupper() which may have
+ // strange results depending on locale (for example, "i" will become "Ä°" in Turkish locale)
+ $upper = strtr(substr($level, 0, 1), 'dinweca', 'DINWECA')
+ . strtolower(substr($level, 1));
+ if (defined(Level::class . '::' . $upper)) {
+ return constant(Level::class . '::' . $upper);
+ }
+
+ throw new InvalidArgumentException(
+ 'Level "' . $level . '" is not defined, use one of: '
+ /** @phan-suppress-next-line PhanUselessBinaryAddRight */
+ . implode(', ', Level::NAMES + Level::VALUES)
+ );
+ }
+
+ $levelEnum = Level::tryFrom($level);
+ if ($levelEnum === null) {
+ throw new InvalidArgumentException(
+ 'Level "' . var_export($level, true) . '" is not defined, use one of: '
+ /** @phan-suppress-next-line PhanUselessBinaryAddRight */
+ . implode(', ', Level::NAMES + Level::VALUES)
+ );
+ }
+
+ return $levelEnum;
+ }
+
+ // *********************************************************************
+ // PUBLIC METHODS
+ // *********************************************************************
+
+ // **** GET/SETTER
+
+ // log level set and get
+
+ /**
+ * set new log level
+ *
+ * @param string|int|Level $level
+ * @return void
+ */
+ public function setLoggingLevel(string|int|Level $level): void
+ {
+ $this->log_level = $this->processLogLevel($level);
+ }
+
+ /**
+ * return current set log level
+ *
+ * @return Level
+ */
+ public function getLoggingLevel(): Level
+ {
+ return $this->log_level;
+ }
+
+ /**
+ * this is for older JS_DEBUG flags
+ *
+ * @return bool True, we are at debug level
+ */
+ public function getJsDebug(): bool
+ {
+ return $this->log_level === Level::Debug ? true : false;
+ }
+
+ // log file id set (file name prefix)
+
+ /**
+ * sets the internal log file prefix id
+ * string must be a alphanumeric string
+ *
+ * @param string $string log file id string value
+ * @return bool
+ */
+ public function setLogFileId(string $string): bool
+ {
+ if (!preg_match("/^[\w\.\-]+$/", $string)) {
+ return false;
+ }
+ $this->log_file_id = $string;
+ return true;
+ }
+
+ /**
+ * return current set log file id
+ *
+ * @return string
+ */
+ public function getLogFileId(): string
+ {
+ return $this->log_file_id;
+ }
+
+ // log unique id set (for per run)
+
+ /**
+ * Sets a unique id based on current date (y/m/d, h:i:s) and a unique id (8 chars)
+ * if override is set to true it will be newly set, else if already set nothing changes
+ *
+ * @param bool $override True to force new set
+ * @return void
+ */
+ public function setLogUniqueId(bool $override = false): void
+ {
+ if (empty($this->log_file_unique_id) || $override == true) {
+ $this->log_file_unique_id =
+ date('Y-m-d_His') . '_U_'
+ . substr(hash(
+ 'sha1',
+ random_bytes(63)
+ ), 0, 8);
+ }
+ }
+
+ /**
+ * Return current set log file unique id,
+ * empty string for not set
+ *
+ * @return string
+ */
+ public function getLogUniqueId(): string
+ {
+ return $this->log_file_unique_id;
+ }
+
+ // general log date
+
+ /**
+ * set the log file date to Y-m-d
+ * must be set if log_per_date is set
+ *
+ * @return void
+ */
+ public function setLogDate(): void
+ {
+ $this->log_file_date = date('Y-m-d');
+ }
+
+ /**
+ * get the current set log file_date
+ *
+ * @return string
+ */
+ public function getLogDate(): string
+ {
+ return $this->log_file_date;
+ }
+
+ // general flag set
+
+ /**
+ * set one of the basic flags
+ *
+ * @param Flag $flag flag level to set
+ * @return void
+ */
+ public function setLogFlag(Flag $flag): void
+ {
+ $this->log_flags |= $flag->value;
+ }
+
+ /**
+ * unset given from the log flags
+ *
+ * @param Flag $flag flag level to unset
+ * @return void
+ */
+ public function unsetLogFlag(Flag $flag): void
+ {
+ $this->log_flags &= ~$flag->value;
+ }
+
+ /**
+ * check if a given flag is set
+ *
+ * @param Flag $flag
+ * @return bool
+ */
+ public function getLogFlag(Flag $flag): bool
+ {
+ if ($this->log_flags & $flag->value) {
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Return all set log flags as int
+ *
+ * @return int
+ */
+ public function getLogFlags(): int
+ {
+ return $this->log_flags;
+ }
+
+ // log folder/file
+
+ /**
+ * set new log folder, check that folder is writeable
+ * If not setable keep older log folder setting
+ *
+ * @param string $log_folder Folder to set
+ * @return bool If not setable, return false
+ */
+ public function setLogFolder(string $log_folder): bool
+ {
+ if (!is_writeable($log_folder)) {
+ return false;
+ }
+ // check if log_folder has a trailing /
+ if (substr($log_folder, -1, 1) != DIRECTORY_SEPARATOR) {
+ $log_folder .= DIRECTORY_SEPARATOR;
+ }
+ $this->log_folder = $log_folder;
+ return true;
+ }
+
+ /**
+ * get current set log folder
+ *
+ * @return string
+ */
+ public function getLogFolder(): string
+ {
+ return $this->log_folder;
+ }
+
+ // note that set log filder is dynamic during log write
+
+ /**
+ * get last set log file name
+ *
+ * @return string
+ */
+ public function getLogFile(): string
+ {
+ return $this->log_file_name;
+ }
+
+ // max log file size
+
+ /**
+ * set mag log file size
+ *
+ * @param int $file_size Set max file size in bytes, 0 for no limit
+ * @return bool False for invalid number
+ */
+ public function setLogMaxFileSize(int $file_size): bool
+ {
+ if ($file_size < 0) {
+ return false;
+ }
+ if ($file_size < self::MIN_LOG_MAX_FILESIZE) {
+ return false;
+ }
+ $this->log_max_filesize = $file_size;
+ return true;
+ }
+
+ /**
+ * Return current set log max file size in bytes
+ *
+ * @return int Max size in bytes, 0 for no limit
+ */
+ public function getLogMaxFileSize(): int
+ {
+ return $this->log_max_filesize;
+ }
+
+ // *********************************************************************
+ // OPTIONS CALLS
+ // *********************************************************************
+
+ /**
+ * get option
+ *
+ * @param string $option_key Which option key to search
+ * @return string|bool|int|null Returns null on not found
+ */
+ public function getOption(string $option_key): string|bool|int|null
+ {
+ return $this->options[$option_key] ?? null;
+ }
+
+ // *********************************************************************
+ // MAIN CALLS
+ // *********************************************************************
+
+ /**
+ * DEBUG: 100
+ *
+ * write debug data to error_msg array
+ *
+ * @param string $group_id id for error message, groups messages together
+ * @param string|Stringable $message the actual error message
+ * @param string $prefix Attach some block before $string.
+ * Will not be stripped even
+ * when strip is true
+ * if strip is false, recommended to add that to $string
+ * @param mixed[] $context
+ * @return bool True if logged, false if not logged
+ */
+ public function debug(
+ string $group_id,
+ string|\Stringable $message,
+ string $prefix = '',
+ array $context = []
+ ): bool {
+ return $this->writeErrorMsg(
+ $this->log_level,
+ $this->prepareLog(
+ Level::Debug->getName(),
+ $prefix . $message,
+ $context,
+ $group_id
+ ),
+ $group_id
+ );
+ }
+
+ /**
+ * INFO: 200
+ *
+ * @param string|Stringable $message
+ * @param mixed[] $context
+ * @return bool
+ */
+ public function info(string|\Stringable $message, array $context = []): bool
+ {
+ return $this->writeErrorMsg(
+ Level::Info,
+ $this->prepareLog(
+ Level::Info->getName(),
+ $message,
+ $context,
+ )
+ );
+ }
+
+ /**
+ * NOTICE: 250
+ *
+ * @param string|Stringable $message
+ * @param mixed[] $context
+ * @return bool
+ */
+ public function notice(string|\Stringable $message, array $context = []): bool
+ {
+ return $this->writeErrorMsg(
+ Level::Notice,
+ $this->prepareLog(
+ Level::Notice->getName(),
+ $message,
+ $context,
+ )
+ );
+ }
+
+ /**
+ * WARNING: 300
+ *
+ * @param string|Stringable $message
+ * @param mixed[] $context
+ * @return bool
+ */
+ public function warning(string|\Stringable $message, array $context = []): bool
+ {
+ return $this->writeErrorMsg(
+ Level::Warning,
+ $this->prepareLog(
+ Level::Warning->getName(),
+ $message,
+ $context,
+ )
+ );
+ }
+
+ /**
+ * ERROR: 400
+ *
+ * @param string|Stringable $message
+ * @param mixed[] $context
+ * @return bool
+ */
+ public function error(string|\Stringable $message, array $context = []): bool
+ {
+ return $this->writeErrorMsg(
+ Level::Error,
+ $this->prepareLog(
+ Level::Error->getName(),
+ $message,
+ $context,
+ )
+ );
+ }
+
+ /**
+ * CTRITICAL: 500
+ *
+ * @param string|Stringable $message
+ * @param mixed[] $context
+ * @return bool
+ */
+ public function critical(string|\Stringable $message, array $context = []): bool
+ {
+ return $this->writeErrorMsg(
+ Level::Critical,
+ $this->prepareLog(
+ Level::Critical->getName(),
+ $message,
+ $context,
+ )
+ );
+ }
+
+ /**
+ * ALERT: 550
+ *
+ * @param string|Stringable $message
+ * @param mixed[] $context
+ * @return bool
+ */
+ public function alert(string|\Stringable $message, array $context = []): bool
+ {
+ return $this->writeErrorMsg(
+ Level::Alert,
+ $this->prepareLog(
+ Level::Alert->getName(),
+ $message,
+ $context,
+ )
+ );
+ }
+
+ /**
+ * EMERGENCY: 600
+ *
+ * @param string|Stringable $message
+ * @param mixed[] $context
+ * @return bool
+ */
+ public function emergency(string|\Stringable $message, array $context = []): bool
+ {
+ return $this->writeErrorMsg(
+ Level::Emergency,
+ $this->prepareLog(
+ Level::Emergency->getName(),
+ $message,
+ $context,
+ )
+ );
+ }
+
+ // *********************************************************************
+ // DEPRECATED SUPPORT CALLS
+ // *********************************************************************
+
+ // legacy, but there are too many implemented
+
+ /**
+ * A replacement for the \CoreLibs\Debug\Support::printAr
+ * But this does not wrap it in
+ * Do not use this without using it in a string in debug function
+ *
+ * @param array $a Array to format
+ * @return string print_r formated
+ */
+ public function prAr(array $a): string
+ {
+ return Support::printArray($a, true);
+ }
+
+ /**
+ * Convert bool value to string value
+ *
+ * @param bool $bool Bool value to be transformed
+ * @param string $true Override default string 'true'
+ * @param string $false Override default string 'false'
+ * @return string $true or $false string for true/false bool
+ */
+ public function prBl(
+ bool $bool,
+ string $true = 'true',
+ string $false = 'false'
+ ): string {
+ return Support::printBool($bool, '', $true, $false, true);
+ }
+
+ /**
+ * Dump data as string without html
+ *
+ * @param mixed $data Any data
+ * @param bool $strip If false, do not strip, default is true
+ * @return string Output data for debug
+ */
+ public function dV(mixed $data, bool $strip = true): string
+ {
+ return Support::dumpVar($data, $strip);
+ }
+
+ /**
+ * Export var data to string
+ *
+ * @param mixed $data
+ * @return string
+ */
+ public function eV(mixed $data): string
+ {
+ return Support::exportVar($data, true);
+ }
+
+ // *********************************************************************
+ // DEPRECATED METHODS
+ // *********************************************************************
+
+ /**
+ * Everything below here is deprecated and will be removed
+ */
+
+ /**
+ * Temporary method to read all class variables for testing purpose
+ *
+ * @param string $name what variable to return
+ * @return mixed can be anything, bool, string, int, array
+ * @deprecated Use either log->getOption or log->get[Content] to fetch info
+ */
+ public function getSetting(string $name): mixed
+ {
+ // for debug purpose only
+ return $this->{$name};
+ }
+
+ /**
+ * sets the internal log file prefix id
+ * string must be a alphanumeric string
+ * if non valid string is given it returns the previous set one only
+ *
+ * @param string $string log file id string value
+ * @return string returns the set log file id string
+ * @deprecated Use Debug\Logging->setLogId() and Debug\Logging->getLogId()
+ */
+ public function basicSetLogId(string $string): string
+ {
+ $this->setLogFileId($string);
+ return $this->getLogFileId();
+ }
+
+ /**
+ * old name for setLogLevel
+ *
+ * @param string $type debug, echo, print
+ * @param string $flag on/off
+ * array $array of levels to turn on/off debug
+ * @return bool Return false if type or flag is invalid
+ * @deprecated Use setLogLevel
+ */
+ public function debugFor(string $type, string $flag): bool
+ {
+ trigger_error(
+ 'debugFor() is deprecated',
+ E_USER_DEPRECATED
+ );
+ return false;
+ }
+
+ /**
+ * set log level settings for All types
+ * if invalid type, skip
+ *
+ * @param string $type Type to get: debug, echo, print
+ * @param bool $set True or False
+ * @return bool Return false if type invalid
+ * @deprecated Log levels (group id) are no longer supported
+ */
+ public function setLogLevelAll(string $type, bool $set): bool
+ {
+ trigger_error(
+ 'setLogLevelAll() is deprecated',
+ E_USER_DEPRECATED
+ );
+ return false;
+ }
+
+ /**
+ * get the current log level setting for All level blocks
+ *
+ * @param string $type Type to get: debug, echo, print
+ * @return bool False on failure, or the boolean flag from the all var
+ * @deprecated Log levels (group id) are no longer supported
+ */
+ public function getLogLevelAll(string $type): bool
+ {
+ trigger_error(
+ 'getLogLevelAll() is deprecated',
+ E_USER_DEPRECATED
+ );
+ return false;
+ }
+
+ /**
+ * passes list of level names, to turn on debug
+ * eg $foo->debugFor('print', 'on', ['LOG', 'DEBUG', 'INFO']);
+ *
+ * @param string $type debug, echo, print
+ * @param string $flag on/off
+ * @param array $debug_on Array of levels to turn on/off debug
+ * To turn off a level set 'Level' => false,
+ * If not set, switches to on
+ * @return bool Return false if type or flag invalid
+ * also false if debug array is empty
+ * @deprecated Log levels (group id) are no longer supported
+ */
+ public function setLogLevel(string $type, string $flag, array $debug_on): bool
+ {
+ trigger_error(
+ 'setLogLevel() is deprecated',
+ E_USER_DEPRECATED
+ );
+ return false;
+ }
+
+ /**
+ * return the log level for the array type normal and not (disable)
+ *
+ * @param string $type debug, echo, print
+ * @param string $flag on/off
+ * @param string|null $level if not null then check if this array entry is set
+ * else return false
+ * @return array|bool if $level is null, return array, else boolean true/false
+ * @deprecated Log levels (group id) are no longer supported
+ */
+ public function getLogLevel(string $type, string $flag, ?string $level = null): array|bool
+ {
+ trigger_error(
+ 'getLogLevel() is deprecated',
+ E_USER_DEPRECATED
+ );
+ return false;
+ }
+
+ /**
+ * set flags for per log level type
+ * - level: set per sub group level
+ * - class: split by class
+ * - page: split per page called
+ * - run: for each run
+ *
+ * @param string $type Type to get: level, class, page, run
+ * @param bool $set True or False
+ * @return bool Return false if type invalid
+ * @deprecated Set flags with setLogFlag
+ */
+ public function setLogPer(string $type, bool $set): bool
+ {
+ trigger_error(
+ 'setLogPer() is deprecated',
+ E_USER_DEPRECATED
+ );
+ return false;
+ }
+
+ /**
+ * return current set log per flag in bool
+ *
+ * @param string $type Type to get: level, class, page, run
+ * @return bool True of false for turned on or off
+ * @deprecated Get flags with setLogFlag
+ */
+ public function getLogPer(string $type): bool
+ {
+ trigger_error(
+ 'getLogPer() is deprecated',
+ E_USER_DEPRECATED
+ );
+ return false;
+ }
+
+ // *********************************************************************
+ // DEBUG METHODS
+ // *********************************************************************
+
+ /**
+ * only for debug
+ *
+ * @return void
+ */
+ public function logger2Debug(): void
+ {
+ print "Options: " . Support::dumpVar($this->options) . "
";
+ print "OPT set level: " . $this->getLoggingLevel()->getName() . "
";
+ $this->setLoggingLevel(Level::Info);
+ print "NEW set level: " . $this->getLoggingLevel()->getName() . "
";
+ foreach (
+ [
+ Level::Debug, Level::Info, Level::Notice, Level::Warning,
+ Level::Error, Level::Critical, Level::Alert, Level::Emergency
+ ] as $l
+ ) {
+ if ($this->log_level->isHigherThan($l)) {
+ print "L: " . $this->log_level->getName() . " > " . $l->getName() . "
";
+ }
+ if ($this->log_level->includes($l)) {
+ print "L: " . $this->log_level->getName() . " <= " . $l->getName() . "
";
+ }
+ if ($this->log_level->isLowerThan($l)) {
+ print "L: " . $this->log_level->getName() . " < " . $l->getName() . "
";
+ }
+ echo "
";
+ }
+ // back to options level
+ $this->initLogLevel();
+ print "OPT set level: " . $this->getLoggingLevel()->getName() . "
";
+ }
+}
+
+// __END__
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/Generate.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/Generate.php
index 90daccc8..6e7e9dfc 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/Generate.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/Generate.php
@@ -219,96 +219,97 @@ declare(strict_types=1);
namespace CoreLibs\Output\Form;
use CoreLibs\Get\System;
+use CoreLibs\Debug\Support;
class Generate extends \CoreLibs\DB\Extended\ArrayIO
{
// for the load statetment describes which elements from
// the load query should be shown and i which format
/** @var array */
- public $field_array = [];
+ public array $field_array = [];
/** @var string */
- public $load_query; // the query needed for loading a data set (one row in the table)
+ public string $load_query; // the query needed for loading a data set (one row in the table)
/** @var string */
- public $col_name; // the name of the columen (before _) [used for order button]
+ public string $col_name; // the name of the columen (before _) [used for order button]
/** @var int */
- public $yes; // the yes flag that triggers the template to show ALL and not only new/load
+ public int $yes; // the yes flag that triggers the template to show ALL and not only new/load
/** @var string */
- public $msg; // the error msg
+ public string $msg; // the error msg
/** @var int */
- public $error; // the error flag set for printing red error msg
+ public int $error; // the error flag set for printing red error msg
/** @var int */
- public $warning; // warning flag, for information (saved, loaded, etc)
+ public int $warning; // warning flag, for information (saved, loaded, etc)
/** @var string */
- public $archive_pk_name; // the pk name for the load select form
+ public string $archive_pk_name; // the pk name for the load select form
/** @var string */
- private $int_pk_name; // primary key, only internal usage
+ private string $int_pk_name; // primary key, only internal usage
/** @var array */
- public $reference_array = []; // reference arrays -> stored in $this->reference_array[$table_name] => [];
+ public array $reference_array = []; // reference arrays -> stored in $this->reference_array[$table_name] => [];
// NOTE: should be changed to this @var mixed[]
/** @var array */
- public $element_list; // element list for elements next to each other as a special sub group
+ public array $element_list; // element list for elements next to each other as a special sub group
/** @var array */
- public $table_array = [];
+ public array $table_array = [];
/** @var string */
- public $my_page_name; // the name of the page without .php extension
+ public string $my_page_name; // the name of the page without .php extension
/** @var bool */
- public $mobile_phone = false;
+ public bool $mobile_phone = false;
/** @var string */
- public $email_regex;
+ public string $email_regex;
// buttons and checkboxes
/** @var string */
- public $archive;
+ public string $archive;
/** @var string */
- public $new;
+ public string $new;
/** @var string */
- public $really_new;
+ public string $really_new;
/** @var string */
- public $delete;
+ public string $delete;
/** @var string */
- public $really_delete;
+ public string $really_delete;
/** @var string */
- public $save;
+ public string $save;
/** @var string */
- public $remove_button;
+ public string $remove_button;
// security values
/** @var int base acl for current page */
- private $base_acl_level = 0;
+ private int $base_acl_level = 0;
/** @var int admin master flag (1/0) */
- private $acl_admin = 0;
+ private int $acl_admin = 0;
/** @var array */
- public $security_level;
+ public array $security_level;
/** @var array Login ACL */
- public $login_acl = [];
+ public array $login_acl = [];
// layout publics
/** @var int */
- public $table_width;
+ public int $table_width;
// internal lang & encoding vars
/** @var string */
- public $lang_dir = '';
+ public string $lang_dir = '';
/** @var string */
- public $lang;
+ public string $lang;
/** @var string */
- public $lang_short;
+ public string $lang_short;
/** @var string */
- public $domain;
+ public string $domain;
/** @var string */
- public $encoding;
+ public string $encoding;
// language
/** @var \CoreLibs\Language\L10n */
- public $l;
+ public \CoreLibs\Language\L10n $l;
// log
- /** @var \CoreLibs\Debug\Logging */
- public $log;
+ /** @var \CoreLibs\Logging\Logging */
+ public \CoreLibs\Logging\Logging $log;
// now some default error msgs (english)
/** @var array */
- public $language_array = [];
+ public array $language_array = [];
/**
* construct form generator
*
* @param array $db_config db config array, mandatory
- * @param \CoreLibs\Debug\Logging $log Logging class
+ * @param \CoreLibs\Logging\Logging $log Logging class
* @param \CoreLibs\Language\L10n $l10n l10n language class
* @param array $login_acl Login ACL array,
* at least base/admin should be set
@@ -319,7 +320,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
*/
public function __construct(
array $db_config,
- \CoreLibs\Debug\Logging $log,
+ \CoreLibs\Logging\Logging $log,
\CoreLibs\Language\L10n $l10n,
array $login_acl,
?array $table_arrays = null,
@@ -327,7 +328,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
// init logger if not set
$this->log = $log;
// don't log per class
- $this->log->setLogPer('class', false);
+ $this->log->unsetLogFlag(\CoreLibs\Logging\Logger\Flag::per_class);
// init the language class
$this->l = $l10n;
// parse and read, legacy stuff
@@ -388,7 +389,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
$this->load_query = $config_array['load_query'];
}
if (empty($this->load_query)) {
- $this->log->debug('INIT ERROR', 'Missing Load Query for: ' . $this->my_page_name);
+ $this->log->error('Missing Load Query for: ' . $this->my_page_name);
}
$this->archive_pk_name = 'a_' . $this->pk_name;
$this->col_name = str_replace('_id', '', $this->pk_name);
@@ -485,7 +486,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
/** @var TableArrays\Interface\TableArraysInterface|false $class */
$class = new $class_string($this);
} catch (\Throwable $t) {
- $this->log->debug('CLASS LOAD', 'Failed loading: ' . $class_string . ' => ' . $t->getMessage());
+ $this->log->critical('CLASS LOADING: Failed loading: ' . $class_string . ' => ' . $t->getMessage());
return false;
}
if (is_object($class)) {
@@ -827,7 +828,7 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
return $return_array;
}
if (empty($this->load_query)) {
- $this->log->debug('LOAD LIST ERROR', 'Missing load list query');
+ $this->log->error('Missing load list query');
return $return_array;
}
@@ -2617,8 +2618,8 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
}
}
// add lost error ones
- $this->log->debug('ERROR', 'P: ' . $data['prefix'] . ', '
- . $this->log->prAr($_POST['ERROR'][$data['prefix']] ?? []));
+ $this->log->error('P: ' . $data['prefix'] . ', '
+ . Support::prAr($_POST['ERROR'][$data['prefix']] ?? []));
if ($this->error && !empty($_POST['ERROR'][$data['prefix']])) {
$prfx = $data['prefix']; // short
$_post_data = [];
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditAccess.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditAccess.php
index 3701e54c..53cad379 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditAccess.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditAccess.php
@@ -7,7 +7,7 @@ namespace CoreLibs\Output\Form\TableArrays;
class EditAccess implements Interface\TableArraysInterface
{
/** @var \CoreLibs\Output\Form\Generate */
- private $form;
+ private \CoreLibs\Output\Form\Generate $form;
/**
* constructor
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditGroups.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditGroups.php
index 0ff66ebc..9ad6413f 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditGroups.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditGroups.php
@@ -7,7 +7,7 @@ namespace CoreLibs\Output\Form\TableArrays;
class EditGroups implements Interface\TableArraysInterface
{
/** @var \CoreLibs\Output\Form\Generate */
- private $form;
+ private \CoreLibs\Output\Form\Generate $form;
/**
* constructor
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditLanguages.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditLanguages.php
index b2a3ba9b..0c4b1e08 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditLanguages.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditLanguages.php
@@ -7,7 +7,7 @@ namespace CoreLibs\Output\Form\TableArrays;
class EditLanguages implements Interface\TableArraysInterface
{
/** @var \CoreLibs\Output\Form\Generate */
- private $form;
+ private \CoreLibs\Output\Form\Generate $form;
/**
* constructor
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditMenuGroup.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditMenuGroup.php
index 48826bb8..e8945be4 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditMenuGroup.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditMenuGroup.php
@@ -7,7 +7,7 @@ namespace CoreLibs\Output\Form\TableArrays;
class EditMenuGroup implements Interface\TableArraysInterface
{
/** @var \CoreLibs\Output\Form\Generate */
- private $form;
+ private \CoreLibs\Output\Form\Generate $form;
/**
* constructor
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditPages.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditPages.php
index 6ecd26e5..1ac90390 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditPages.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditPages.php
@@ -7,7 +7,7 @@ namespace CoreLibs\Output\Form\TableArrays;
class EditPages implements Interface\TableArraysInterface
{
/** @var \CoreLibs\Output\Form\Generate */
- private $form;
+ private \CoreLibs\Output\Form\Generate $form;
/**
* constructor
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditSchemas.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditSchemas.php
index 8417ac1f..c81a0d1e 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditSchemas.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditSchemas.php
@@ -7,7 +7,7 @@ namespace CoreLibs\Output\Form\TableArrays;
class EditSchemas implements Interface\TableArraysInterface
{
/** @var \CoreLibs\Output\Form\Generate */
- private $form;
+ private \CoreLibs\Output\Form\Generate $form;
/**
* constructor
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditUsers.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditUsers.php
index a85cb0e9..6d87753a 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditUsers.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditUsers.php
@@ -7,7 +7,7 @@ namespace CoreLibs\Output\Form\TableArrays;
class EditUsers implements Interface\TableArraysInterface
{
/** @var \CoreLibs\Output\Form\Generate */
- private $form;
+ private \CoreLibs\Output\Form\Generate $form;
/**
* constructor
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditVisibleGroup.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditVisibleGroup.php
index 98a2f223..91da1cab 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditVisibleGroup.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Output/Form/TableArrays/EditVisibleGroup.php
@@ -7,7 +7,7 @@ namespace CoreLibs\Output\Form\TableArrays;
class EditVisibleGroup implements Interface\TableArraysInterface
{
/** @var \CoreLibs\Output\Form\Generate */
- private $form;
+ private \CoreLibs\Output\Form\Generate $form;
/**
* constructor
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Output/ProgressBar.php b/www/vendor/egrajp/corelibs-composer-all/src/Output/ProgressBar.php
index 03c09ef9..6affd992 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Output/ProgressBar.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Output/ProgressBar.php
@@ -23,13 +23,13 @@ class ProgressBar
// private vars
/** @var string */
- public $code; // unique code
+ public string $code; // unique code
/** @var string */
- public $status = 'new'; // current status (new,show,hide)
+ public string $status = 'new'; // current status (new,show,hide)
/** @var float|int */
- public $step = 0; // current step
+ public float|int $step = 0; // current step
/** @var array */
- public $position = [ // current bar position
+ public array $position = [ // current bar position
'left' => null,
'top' => null,
'width' => null,
@@ -37,43 +37,43 @@ class ProgressBar
];
/** @var int */
- public $clear_buffer_size = 1; // we need to send this before the lfush to get browser output
+ public int $clear_buffer_size = 1; // we need to send this before the lfush to get browser output
/** @var int */
- public $clear_buffer_size_init = 1024 * 1024; // if I don't send that junk, it won't send anything
+ public int $clear_buffer_size_init = 1024 * 1024; // if I don't send that junk, it won't send anything
// public vars
/** @var int */
- public $min = 0; // minimal steps
+ public int $min = 0; // minimal steps
/** @var int */
- public $max = 100; // maximal steps
+ public int $max = 100; // maximal steps
/** @var int */
- public $left = 5; // bar position from left
+ public int $left = 5; // bar position from left
/** @var int */
- public $top = 5; // bar position from top
+ public int $top = 5; // bar position from top
/** @var int */
- public $width = 300; // bar width
+ public int $width = 300; // bar width
/** @var int */
- public $height = 25; // bar height
+ public int $height = 25; // bar height
/** @var int */
- public $pedding = 0; // bar pedding
+ public int $pedding = 0; // bar pedding
/** @var string */
- public $color = '#0033ff'; // bar color
+ public string $color = '#0033ff'; // bar color
/** @var string */
- public $bgr_color = '#c0c0c0'; // bar background color
+ public string $bgr_color = '#c0c0c0'; // bar background color
/** @var string */
- public $bgr_color_master = '#ffffff'; // master div background color
+ public string $bgr_color_master = '#ffffff'; // master div background color
/** @var int */
- public $border = 1; // bar border width
+ public int $border = 1; // bar border width
/** @var string */
- public $brd_color = '#000000'; // bar border color
+ public string $brd_color = '#000000'; // bar border color
/** @var string */
- public $direction = 'right'; // direction of motion (right,left,up,down)
+ public string $direction = 'right'; // direction of motion (right,left,up,down)
/** @var array */
- public $frame = ['show' => false]; // ProgressBar Frame
+ public array $frame = ['show' => false]; // ProgressBar Frame
/* 'show' => false, # frame show (true/false)
'left' => 200, # frame position from left
'top' => 100, # frame position from top
@@ -86,7 +86,7 @@ class ProgressBar
/** @#var array{string}{string: string|int} */
/** @var mixed[][] */
- public $label = []; // ProgressBar Labels
+ public array $label = []; // ProgressBar Labels
/* 'name' => [ # label name
'type' => 'text', # label type (text,button,step,percent,crossbar)
'value' => 'Please wait ...', # label value
@@ -105,7 +105,7 @@ class ProgressBar
/** @var string */
// output strings
- public $prefix_message = '';
+ public string $prefix_message = '';
/**
* progress bar constructor
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Security/SymmetricEncryption.php b/www/vendor/egrajp/corelibs-composer-all/src/Security/SymmetricEncryption.php
index cd99f584..b106cea1 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Security/SymmetricEncryption.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Security/SymmetricEncryption.php
@@ -2,7 +2,9 @@
/**
* very simple symmetric encryption
- * Better use: https://paragonie.com/project/halite
+ * Better use:
+ * https://paragonie.com/project/halite
+ * https://github.com/paragonie/halite
*
* current code is just to encrypt and decrypt
*
diff --git a/www/vendor/egrajp/corelibs-composer-all/src/Template/SmartyExtend.php b/www/vendor/egrajp/corelibs-composer-all/src/Template/SmartyExtend.php
index 9b2d916d..3d926b1c 100644
--- a/www/vendor/egrajp/corelibs-composer-all/src/Template/SmartyExtend.php
+++ b/www/vendor/egrajp/corelibs-composer-all/src/Template/SmartyExtend.php
@@ -24,134 +24,132 @@ class SmartyExtend extends \Smarty
{
// internal translation engine
/** @var \CoreLibs\Language\L10n */
- public $l10n;
+ public \CoreLibs\Language\L10n $l10n;
// lang & encoding
/** @var string */
- public $lang_dir = '';
+ public string $lang_dir = '';
/** @var string */
- public $lang;
+ public string $lang;
/** @var string */
- public $locale_set;
+ public string $lang_short;
/** @var string */
- public $lang_short;
+ public string $domain;
/** @var string */
- public $domain;
- /** @var string */
- public $encoding;
+ public string $encoding;
// page name
/** @var string */
- public $page_name;
+ public string $page_name;
// array for data parsing
/** @var array */
- public $HEADER = [];
+ public array $HEADER = [];
/** @var array */
- public $DATA = [];
+ public array $DATA = [];
/** @var array */
- public $DEBUG_DATA = [];
+ public array $DEBUG_DATA = [];
/** @var array */
- private $CONTENT_DATA = [];
+ private array $CONTENT_DATA = [];
// control vars
/** @var bool */
- public $USE_PROTOTYPE = USE_PROTOTYPE;
+ public bool $USE_PROTOTYPE = USE_PROTOTYPE;
/** @var bool */
- public $USE_JQUERY = USE_JQUERY;
+ public bool $USE_JQUERY = USE_JQUERY;
/** @var bool */
- public $USE_SCRIPTACULOUS = USE_SCRIPTACULOUS;
+ public bool $USE_SCRIPTACULOUS = USE_SCRIPTACULOUS;
// sub content input vars
/** @var bool */
- public $USE_TINY_MCE = false;
+ public bool $USE_TINY_MCE = false;
/** @var bool */
- public $JS_DATEPICKR = false;
+ public bool $JS_DATEPICKR = false;
/** @var bool */
- public $JS_FLATPICKR = false;
+ public bool $JS_FLATPICKR = false;
/** @var bool */
- public $JS_FILE_UPLOADER = false;
+ public bool $JS_FILE_UPLOADER = false;
/** @var bool */
- public $DEBUG_TMPL = false;
+ public bool $DEBUG_TMPL = false;
/** @var bool */
- public $USE_INCLUDE_TEMPLATE = false;
+ public bool $USE_INCLUDE_TEMPLATE = false;
// cache & compile
/** @var string */
- public $CACHE_ID = '';
+ public string $CACHE_ID = '';
/** @var string */
- public $COMPILE_ID = '';
+ public string $COMPILE_ID = '';
// template vars
/** @var string */
- public $MASTER_TEMPLATE_NAME;
+ public string $MASTER_TEMPLATE_NAME;
/** @var string */
- public $PAGE_FILE_NAME;
+ public string $PAGE_FILE_NAME;
/** @var string */
- public $CONTENT_INCLUDE;
+ public string $CONTENT_INCLUDE;
/** @var string */
- public $FORM_NAME;
+ public string $FORM_NAME;
/** @var string */
- public $FORM_ACTION;
+ public string $FORM_ACTION;
/** @var string */
- public $L_TITLE;
+ public string $L_TITLE;
/** @var string|int */
- public $PAGE_WIDTH;
+ public string|int $PAGE_WIDTH;
// smarty include/set var
/** @var string */
- public $TEMPLATE_PATH;
+ public string $TEMPLATE_PATH;
/** @var string */
- public $TEMPLATE_NAME;
+ public string $TEMPLATE_NAME;
/** @var string */
- public $INC_TEMPLATE_NAME;
+ public string $INC_TEMPLATE_NAME;
/** @var string */
- public $JS_TEMPLATE_NAME;
+ public string $JS_TEMPLATE_NAME;
/** @var string */
- public $CSS_TEMPLATE_NAME;
+ public string $CSS_TEMPLATE_NAME;
/** @var string|null */
- public $TEMPLATE_TRANSLATE;
+ public string|null $TEMPLATE_TRANSLATE;
/** @var string|null */
- public $JS_TRANSLATE;
+ public string|null $JS_TRANSLATE;
// core group
/** @var string */
- public $JS_CORE_TEMPLATE_NAME;
+ public string $JS_CORE_TEMPLATE_NAME;
/** @var string */
- public $CSS_CORE_TEMPLATE_NAME;
+ public string $CSS_CORE_TEMPLATE_NAME;
/** @var string */
- public $JS_CORE_INCLUDE;
+ public string $JS_CORE_INCLUDE;
/** @var string */
- public $CSS_CORE_INCLUDE;
+ public string $CSS_CORE_INCLUDE;
// local names
/** @var string */
- public $JS_SPECIAL_TEMPLATE_NAME = '';
+ public string $JS_SPECIAL_TEMPLATE_NAME = '';
/** @var string */
- public $CSS_SPECIAL_TEMPLATE_NAME = '';
+ public string $CSS_SPECIAL_TEMPLATE_NAME = '';
/** @var string */
- public $JS_INCLUDE;
+ public string $JS_INCLUDE;
/** @var string */
- public $CSS_INCLUDE;
+ public string $CSS_INCLUDE;
/** @var string */
- public $JS_SPECIAL_INCLUDE;
+ public string $JS_SPECIAL_INCLUDE;
/** @var string */
- public $CSS_SPECIAL_INCLUDE;
+ public string $CSS_SPECIAL_INCLUDE;
/** @var string */
- public $ADMIN_JAVASCRIPT;
+ public string $ADMIN_JAVASCRIPT;
/** @var string */
- public $ADMIN_STYLESHEET;
+ public string $ADMIN_STYLESHEET;
/** @var string */
- public $FRONTEND_JAVASCRIPT;
+ public string $FRONTEND_JAVASCRIPT;
/** @var string */
- public $FRONTEND_STYLESHEET;
+ public string $FRONTEND_STYLESHEET;
// other smarty folder vars
/** @var string */
- public $INCLUDES;
+ public string $INCLUDES;
/** @var string */
- public $JAVASCRIPT;
+ public string $JAVASCRIPT;
/** @var string */
- public $CSS;
+ public string $CSS;
/** @var string */
- public $FONT;
+ public string $FONT;
/** @var string */
- public $PICTURES;
+ public string $PICTURES;
/** @var string */
- public $CACHE_PICTURES;
+ public string $CACHE_PICTURES;
/** @var string */
- public $CACHE_PICTURES_ROOT;
+ public string $CACHE_PICTURES_ROOT;
// constructor class, just sets the language stuff
/**
@@ -222,6 +220,7 @@ class SmartyExtend extends \Smarty
// core CS
$this->CSS_CORE_INCLUDE = '';
if (
+ !empty($this->CSS_CORE_TEMPLATE_NAME) &&
file_exists($this->CSS . $this->CSS_CORE_TEMPLATE_NAME) &&
is_file($this->CSS . $this->CSS_CORE_TEMPLATE_NAME)
) {
@@ -230,6 +229,7 @@ class SmartyExtend extends \Smarty
// core JS
$this->JS_CORE_INCLUDE = '';
if (
+ !empty($this->JS_CORE_TEMPLATE_NAME) &&
file_exists($this->JAVASCRIPT . $this->JS_CORE_TEMPLATE_NAME) &&
is_file($this->JAVASCRIPT . $this->JS_CORE_TEMPLATE_NAME)
) {
@@ -398,7 +398,7 @@ class SmartyExtend extends \Smarty
// javascript translate data as template for auto translate
if (empty($this->TEMPLATE_TRANSLATE)) {
$this->TEMPLATE_TRANSLATE = 'jsTranslate-'
- . $this->locale_set . '.' . $this->encoding
+ . $this->l10n->getLocaleSet() . '.' . $this->encoding
. '.tpl';
} else {
// we assume we have some fixed set
@@ -408,12 +408,12 @@ class SmartyExtend extends \Smarty
if (strpos($this->TEMPLATE_TRANSLATE, '.tpl')) {
$this->TEMPLATE_TRANSLATE = str_replace(
'.tpl',
- '-' . $this->locale_set . '.' . $this->encoding . '.tpl',
+ '-' . $this->l10n->getLocaleSet() . '.' . $this->encoding . '.tpl',
$this->TEMPLATE_TRANSLATE
);
} else {
$this->TEMPLATE_TRANSLATE .= '-'
- . $this->locale_set . '.' . $this->encoding
+ . $this->l10n->getLocaleSet() . '.' . $this->encoding
. '.tpl';
}
}
@@ -423,7 +423,7 @@ class SmartyExtend extends \Smarty
}
if (empty($this->JS_TRANSLATE)) {
$this->JS_TRANSLATE = 'translate-'
- . $this->locale_set . '.' . $this->encoding . '.js';
+ . $this->l10n->getLocaleSet() . '.' . $this->encoding . '.js';
} else {
// we assume we have some fixed set
// we must add _.
@@ -432,12 +432,12 @@ class SmartyExtend extends \Smarty
if (strpos($this->JS_TRANSLATE, '.js')) {
$this->JS_TRANSLATE = str_replace(
'.js',
- '-' . $this->locale_set . '.' . $this->encoding . '.js',
+ '-' . $this->l10n->getLocaleSet() . '.' . $this->encoding . '.js',
$this->JS_TRANSLATE
);
} else {
$this->JS_TRANSLATE .= '-'
- . $this->locale_set . '.' . $this->encoding
+ . $this->l10n->getLocaleSet() . '.' . $this->encoding
. '.js';
}
}
@@ -675,10 +675,12 @@ class SmartyExtend extends \Smarty
$this->HEADER['DEFAULT_ENCODING'] = $set_default_encoding;
// form name
- $this->DATA['FORM_NAME'] = !$this->FORM_NAME ?
+ $this->DATA['FORM_NAME'] = empty($this->FORM_NAME) ?
str_replace('.php', '', $this->page_name) :
$this->FORM_NAME;
- $this->DATA['FORM_ACTION'] = $this->FORM_ACTION;
+ $this->DATA['FORM_ACTION'] = empty($this->FORM_ACTION) ?
+ '' :
+ $this->FORM_ACTION;
// special for admin
if ($admin_call === true) {
// depreacte call globals cms on null 4mcs
@@ -735,7 +737,7 @@ class SmartyExtend extends \Smarty
}
// html title
// set local page title
- $this->HEADER['HTML_TITLE'] = !$this->L_TITLE ?
+ $this->HEADER['HTML_TITLE'] = empty($this->L_TITLE) ?
ucfirst(str_replace('_', ' ', \CoreLibs\Get\System::getPageName(1)))
. (!empty($set_g_title) ? '-' . $this->l10n->__($set_g_title) : '') :
$this->l10n->__($this->L_TITLE);
diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/ACL/CoreLibsACLLoginTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/ACL/CoreLibsACLLoginTest.php
index 5ca89254..60958dcf 100644
--- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/ACL/CoreLibsACLLoginTest.php
+++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/ACL/CoreLibsACLLoginTest.php
@@ -68,13 +68,10 @@ final class CoreLibsACLLoginTest extends TestCase
// logger is always needed
// define basic connection set valid and one invalid
- self::$log = new \CoreLibs\Debug\Logging([
+ self::$log = new \CoreLibs\Logging\Logging([
// 'log_folder' => __DIR__ . DIRECTORY_SEPARATOR . 'log',
'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
- 'file_id' => 'CoreLibs-ACL-Login-Test',
- 'debug_all' => true,
- 'echo_all' => false,
- 'print_all' => true,
+ 'log_file_id' => 'CoreLibs-ACL-Login-Test',
]);
// test database we need to connect do, if not possible this test is skipped
self::$db = new \CoreLibs\DB\IO(
diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Create/CoreLibsCreateEmailTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Create/CoreLibsCreateEmailTest.php
index c0301004..3d170be7 100644
--- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Create/CoreLibsCreateEmailTest.php
+++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Create/CoreLibsCreateEmailTest.php
@@ -22,12 +22,9 @@ final class CoreLibsCreateEmailTest extends TestCase
*/
public static function setUpBeforeClass(): void
{
- self::$log = new \CoreLibs\Debug\Logging([
+ self::$log = new \CoreLibs\Logging\Logging([
'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
- 'file_id' => 'CoreLibs-Create-Email-Test',
- 'debug_all' => true,
- 'echo_all' => false,
- 'print_all' => true,
+ 'log_file_id' => 'CoreLibs-Create-Email-Test',
]);
}
@@ -624,7 +621,7 @@ final class CoreLibsCreateEmailTest extends TestCase
// force new set for each run
self::$log->setLogUniqueId(true);
// set on of unique log id
- self::$log->setLogPer('run', true);
+ self::$log->setLogFlag(\CoreLibs\Logging\Logger\Flag::per_run);
// init logger
$status = \CoreLibs\Create\Email::sendEmail(
$subject,
@@ -646,7 +643,9 @@ final class CoreLibsCreateEmailTest extends TestCase
// assert content: must load JSON from log file
if ($status == 2) {
// open file, get last entry with 'SEND EMAIL JSON' key
- $file = file_get_contents(self::$log->getLogFileName());
+ $file = file_get_contents(
+ self::$log->getLogFolder() . self::$log->getLogFile()
+ );
if ($file !== false) {
// extract SEND EMAIL JSON line
$found = preg_match_all("/^.* - (.*)$/m", $file, $matches);
diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Create/CoreLibsCreateUidsTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Create/CoreLibsCreateUidsTest.php
index a914cb93..3612ee89 100644
--- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Create/CoreLibsCreateUidsTest.php
+++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Create/CoreLibsCreateUidsTest.php
@@ -21,45 +21,83 @@ final class CoreLibsCreateUidsTest extends TestCase
public function uniqIdProvider(): array
{
return [
+ // number length
+ 'too short' => [
+ 0 => 1,
+ 1 => 4,
+ 2 => null
+ ],
+ 'valid length: 10' => [
+ 0 => 10,
+ 1 => 10,
+ 2 => null
+ ],
+ 'valid length: 9, auto length' => [
+ 0 => 9,
+ 1 => 8,
+ 2 => null
+ ],
+ 'valid length: 9, force length' => [
+ 0 => 9,
+ 1 => 9,
+ 2 => true,
+ ],
+ 'very long: 512' => [
+ 0 => 512,
+ 1 => 512,
+ 2 => null
+ ],
+ // below is all legacy
'md5 hash' => [
0 => 'md5',
1 => 32,
+ 2 => null
],
'sha256 hash' => [
0 => 'sha256',
- 1 => 64
+ 1 => 64,
+ 2 => null
],
'ripemd160 hash' => [
0 => 'ripemd160',
- 1 => 40
+ 1 => 40,
+ 2 => null
],
'adler32 hash' => [
0 => 'adler32',
- 1 => 8
+ 1 => 8,
+ 2 => null
],
- 'not in list hash but valid' => [
+ 'not in list, set default length' => [
0 => 'sha3-512',
- 1 => strlen(hash('sha3-512', 'A'))
+ 1 => 64,
+ 2 => null
],
'default hash not set' => [
0 => null,
1 => 64,
+ 2 => null
],
'invalid name' => [
0 => 'iamnotavalidhash',
1 => 64,
+ 2 => null
],
- 'auto: ' . \CoreLibs\Create\Uids::DEFAULT_HASH => [
- 0 => \CoreLibs\Create\Uids::DEFAULT_HASH,
- 1 => strlen(hash(\CoreLibs\Create\Uids::DEFAULT_HASH, 'A'))
+ // auto calls
+ 'auto: ' . \CoreLibs\Create\Uids::DEFAULT_UNNIQ_ID_LENGTH => [
+ 0 => \CoreLibs\Create\Uids::DEFAULT_UNNIQ_ID_LENGTH,
+ 1 => 64,
+ 2 => null
],
'auto: ' . \CoreLibs\Create\Uids::STANDARD_HASH_LONG => [
0 => \CoreLibs\Create\Uids::STANDARD_HASH_LONG,
- 1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_LONG, 'A'))
+ 1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_LONG, 'A')),
+ 2 => null
],
'auto: ' . \CoreLibs\Create\Uids::STANDARD_HASH_SHORT => [
0 => \CoreLibs\Create\Uids::STANDARD_HASH_SHORT,
- 1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_SHORT, 'A'))
+ 1 => strlen(hash(\CoreLibs\Create\Uids::STANDARD_HASH_SHORT, 'A')),
+ 2 => null
],
];
}
@@ -105,25 +143,26 @@ final class CoreLibsCreateUidsTest extends TestCase
*
* @covers ::uniqId
* @dataProvider uniqIdProvider
- * @testdox uniqId $input will be length $expected [$_dataName]
+ * @testdox uniqId $input will be length $expected (Force $flag) [$_dataName]
*
- * @param string|null $input
+ * @param int|string|null $input
* @param string $expected
+ * @param bool|null $flag
* @return void
*/
- public function testUniqId(?string $input, int $expected): void
+ public function testUniqId(int|string|null $input, int $expected, ?bool $flag): void
{
if ($input === null) {
- $this->assertEquals(
- $expected,
- strlen(\CoreLibs\Create\Uids::uniqId())
- );
+ $uniq_id_length = strlen(\CoreLibs\Create\Uids::uniqId());
+ } elseif ($flag === null) {
+ $uniq_id_length = strlen(\CoreLibs\Create\Uids::uniqId($input));
} else {
- $this->assertEquals(
- $expected,
- strlen(\CoreLibs\Create\Uids::uniqId($input))
- );
+ $uniq_id_length = strlen(\CoreLibs\Create\Uids::uniqId($input, $flag));
}
+ $this->assertEquals(
+ $expected,
+ $uniq_id_length
+ );
}
/**
diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/DB/CoreLibsDBIOTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/DB/CoreLibsDBIOTest.php
index 20e90fda..b60d4549 100644
--- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/DB/CoreLibsDBIOTest.php
+++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/DB/CoreLibsDBIOTest.php
@@ -132,13 +132,10 @@ final class CoreLibsDBIOTest extends TestCase
);
}
// define basic connection set valid and one invalid
- self::$log = new \CoreLibs\Debug\Logging([
+ self::$log = new \CoreLibs\Logging\Logging([
// 'log_folder' => __DIR__ . DIRECTORY_SEPARATOR . 'log',
'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
- 'file_id' => 'CoreLibs-DB-IO-Test',
- 'debug_all' => false,
- 'echo_all' => false,
- 'print_all' => false,
+ 'log_file_id' => 'CoreLibs-DB-IO-Test',
]);
$db = new \CoreLibs\DB\IO(
self::$db_config['valid'],
diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Debug/CoreLibsDebugLoggingTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Debug/CoreLibsDebugLoggingLegacyTest.php
similarity index 96%
rename from www/vendor/egrajp/corelibs-composer-all/test/phpunit/Debug/CoreLibsDebugLoggingTest.php
rename to www/vendor/egrajp/corelibs-composer-all/test/phpunit/Debug/CoreLibsDebugLoggingLegacyTest.php
index 6b7daad0..b06c86bd 100644
--- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Debug/CoreLibsDebugLoggingTest.php
+++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Debug/CoreLibsDebugLoggingLegacyTest.php
@@ -10,12 +10,13 @@ use PHPUnit\Framework\TestCase;
/**
* Test class for Debug\Logging
- * @coversDefaultClass \CoreLibs\Debug\Logging
- * @testdox \CoreLibs\Debug\Logging method tests
+ * @coversDefaultClass \CoreLibs\Debug\LoggingLegacy
+ * @testdox \CoreLibs\Debug\LoggingLegacy method tests
*/
-final class CoreLibsDebugLoggingTest extends TestCase
+final class CoreLibsDebugLoggingLegacyTest extends TestCase
{
private const LOG_FOLDER = __DIR__ . DIRECTORY_SEPARATOR . 'log' . DIRECTORY_SEPARATOR;
+
/**
* test set for options BASIC
*
@@ -24,7 +25,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
* 1: expected
* 2: override
* override:
- * - constant for COSNTANTS
+ * - constant for CONSTANTS
* - global for _GLOBALS
*
* @return array
@@ -138,7 +139,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
// catch this with the message
$this->expectExceptionMessage($deprecation_message);
}
- $log = new \CoreLibs\Debug\Logging($options);
+ $log = new \CoreLibs\Debug\LoggingLegacy($options);
// reset error handler
restore_error_handler();
// check that settings match
@@ -308,7 +309,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
// catch this with the message
$this->expectExceptionMessage($deprecation_message);
}
- $log = new \CoreLibs\Debug\Logging($options);
+ $log = new \CoreLibs\Debug\LoggingLegacy($options);
// reset error handler
restore_error_handler();
// check current
@@ -385,7 +386,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
bool $expected_get
): void {
// neutral start with default
- $log = new \CoreLibs\Debug\Logging([
+ $log = new \CoreLibs\Debug\LoggingLegacy([
'file_id' => 'testSetGetLogLevelAll',
'log_folder' => self::LOG_FOLDER
]);
@@ -510,7 +511,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
$expected_get
): void {
// neutral start with default
- $log = new \CoreLibs\Debug\Logging([
+ $log = new \CoreLibs\Debug\LoggingLegacy([
'file_id' => 'testSetGetLogLevel',
'log_folder' => self::LOG_FOLDER
]);
@@ -592,7 +593,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
bool $expected_get
): void {
// neutral start with default
- $log = new \CoreLibs\Debug\Logging([
+ $log = new \CoreLibs\Debug\LoggingLegacy([
'file_id' => 'testSetGetLogPer',
'log_folder' => self::LOG_FOLDER
]);
@@ -624,7 +625,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
public function testSetGetLogPrintFileDate(bool $input, bool $expected_set, bool $expected_get): void
{
// neutral start with default
- $log = new \CoreLibs\Debug\Logging([
+ $log = new \CoreLibs\Debug\LoggingLegacy([
'file_id' => 'testSetGetLogPrintFileDate',
'log_folder' => self::LOG_FOLDER
]);
@@ -693,7 +694,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
*/
public function testPrAr(array $input, string $expected): void
{
- $log = new \CoreLibs\Debug\Logging([
+ $log = new \CoreLibs\Debug\LoggingLegacy([
'file_id' => 'testPrAr',
'log_folder' => self::LOG_FOLDER
]);
@@ -757,7 +758,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
*/
public function testPrBl(bool $input, ?string $true, ?string $false, string $expected): void
{
- $log = new \CoreLibs\Debug\Logging([
+ $log = new \CoreLibs\Debug\LoggingLegacy([
'file_id' => 'testPrBl',
'log_folder' => self::LOG_FOLDER
]);
@@ -932,7 +933,7 @@ final class CoreLibsDebugLoggingTest extends TestCase
// remove any files named /tmp/error_log_TestDebug*.log
array_map('unlink', glob($options['log_folder'] . 'error_msg_' . $options['file_id'] . '*.log'));
// init logger
- $log = new \CoreLibs\Debug\Logging($options);
+ $log = new \CoreLibs\Debug\LoggingLegacy($options);
// * debug (A/B)
// NULL check for strip/prefix
$this->assertEquals(
@@ -1046,13 +1047,13 @@ final class CoreLibsDebugLoggingTest extends TestCase
public function testLogUniqueId(bool $option, bool $override): void
{
if ($option === true) {
- $log = new \CoreLibs\Debug\Logging([
+ $log = new \CoreLibs\Debug\LoggingLegacy([
'file_id' => 'testLogUniqueId',
'log_folder' => self::LOG_FOLDER,
'per_run' => $option
]);
} else {
- $log = new \CoreLibs\Debug\Logging([
+ $log = new \CoreLibs\Debug\LoggingLegacy([
'file_id' => 'testLogUniqueId',
'log_folder' => self::LOG_FOLDER
]);
diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Debug/CoreLibsDebugSupportTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Debug/CoreLibsDebugSupportTest.php
index e5bc52ae..f8463233 100644
--- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Debug/CoreLibsDebugSupportTest.php
+++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Debug/CoreLibsDebugSupportTest.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace tests;
use PHPUnit\Framework\TestCase;
+use CoreLibs\Debug\Support;
/**
* Test class for Debug\Support
@@ -40,6 +41,32 @@ final class CoreLibsDebugSupportTest extends TestCase
];
}
+ /**
+ * Undocumented function
+ *
+ * @cover ::printTime
+ * @dataProvider printTimeProvider
+ * @testdox printTime test with $microtime and match to regex [$_dataName]
+ *
+ * @param int|null $mircrotime
+ * @param string $expected
+ * @return void
+ */
+ public function testPrintTime(?int $microtime, string $regex): void
+ {
+ if ($microtime === null) {
+ $this->assertMatchesRegularExpression(
+ $regex,
+ Support::printTime()
+ );
+ } else {
+ $this->assertMatchesRegularExpression(
+ $regex,
+ Support::printTime($microtime)
+ );
+ }
+ }
+
/**
* Undocumented function
*
@@ -50,18 +77,55 @@ final class CoreLibsDebugSupportTest extends TestCase
return [
'empty array' => [
0 => [],
- 1 => "Array\n(\n)\n
"
+ 1 => "Array\n(\n)\n
",
+ 2 => "Array\n(\n)\n",
],
'simple array' => [
0 => ['a', 'b'],
1 => "Array\n(\n"
. " [0] => a\n"
. " [1] => b\n"
- . ")\n
"
+ . ")\n",
+ 2 => "Array\n(\n"
+ . " [0] => a\n"
+ . " [1] => b\n"
+ . ")\n",
],
];
}
+ /**
+ * Undocumented function
+ *
+ * @cover ::printAr
+ * @cover ::printArray
+ * @dataProvider printArrayProvider
+ * @testdox printAr/printArray $input will be $expected [$_dataName]
+ *
+ * @param array $input
+ * @param string $expected
+ * @param string $expected_strip
+ * @return void
+ */
+ public function testPrintAr(array $input, string $expected, string $expected_strip): void
+ {
+ $this->assertEquals(
+ $expected,
+ Support::printAr($input),
+ 'assert printAr'
+ );
+ $this->assertEquals(
+ $expected,
+ Support::printArray($input),
+ 'assert printArray'
+ );
+ $this->assertEquals(
+ $expected_strip,
+ Support::prAr($input),
+ 'assert prAr'
+ );
+ }
+
/**
* Undocumented function
*
@@ -73,27 +137,31 @@ final class CoreLibsDebugSupportTest extends TestCase
'true input default' => [
0 => true,
1 => [],
- 2 => 'true'
+ 2 => 'true',
+ 3 => 'true',
],
'false input default' => [
0 => false,
1 => [],
- 2 => 'false'
+ 2 => 'false',
+ 3 => 'false'
],
'false input param name' => [
0 => false,
1 => [
'name' => 'param test'
],
- 2 => 'param test: false'
+ 2 => 'param test: false',
+ 3 => 'false'
],
'true input param name, true override' => [
0 => true,
1 => [
'name' => 'param test',
- 'true' => 'ok'
+ 'true' => 'ok',
],
- 2 => 'param test: ok'
+ 2 => 'param test: ok',
+ 3 => 'ok',
],
'false input param name, true override, false override' => [
0 => false,
@@ -102,11 +170,77 @@ final class CoreLibsDebugSupportTest extends TestCase
'true' => 'ok',
'false' => 'not',
],
- 2 => 'param test: not'
+ 2 => 'param test: not',
+ 3 => 'not'
],
];
}
+ /**
+ * Undocumented function
+ *
+ * @cover ::printBool
+ * @dataProvider printBoolProvider
+ * @testdox printBool $input will be $expected [$_dataName]
+ *
+ * @param bool $input
+ * @param array $params
+ * @param string $expected
+ * @param string $expected_strip
+ * @return void
+ */
+ public function testPrintBool(bool $input, array $params, string $expected, string $expected_strip): void
+ {
+ if (
+ isset($params['name']) &&
+ isset($params['true']) &&
+ isset($params['false'])
+ ) {
+ $string = Support::printBool(
+ $input,
+ $params['name'],
+ $params['true'],
+ $params['false']
+ );
+ $string_strip = Support::prBl(
+ $input,
+ $params['true'],
+ $params['false']
+ );
+ } elseif (isset($params['name']) && isset($params['true'])) {
+ $string = Support::printBool(
+ $input,
+ $params['name'],
+ $params['true']
+ );
+ $string_strip = Support::prBl(
+ $input,
+ $params['true'],
+ );
+ } elseif (isset($params['name'])) {
+ $string = Support::printBool(
+ $input,
+ $params['name']
+ );
+ $string_strip = Support::prBl(
+ $input
+ );
+ } else {
+ $string = Support::printBool($input);
+ $string_strip = Support::prBl($input);
+ }
+ $this->assertEquals(
+ $expected,
+ $string,
+ 'assert printBool'
+ );
+ $this->assertEquals(
+ $expected_strip,
+ $string_strip,
+ 'assert prBl'
+ );
+ }
+
/**
* Undocumented function
*
@@ -169,12 +303,10 @@ final class CoreLibsDebugSupportTest extends TestCase
'an array, no html' => [
['a', 'b'],
true,
- "##HTMLPRE##"
- . "Array\n(\n"
+ "Array\n(\n"
. " [0] => a\n"
. " [1] => b\n"
- . ")\n"
- . "##/HTMLPRE##",
+ . ")\n",
],
// resource
'a resource' => [
@@ -191,6 +323,253 @@ final class CoreLibsDebugSupportTest extends TestCase
];
}
+ /**
+ * Undocumented function
+ *
+ * @cover ::printToString
+ * @dataProvider printToStringProvider
+ * @testdox printToString $input with $flag will be $expected [$_dataName]
+ *
+ * @param mixed $input anything
+ * @param boolean|null $flag html flag, only for string and array
+ * @param string $expected always string
+ * @return void
+ */
+ public function testPrintToString(mixed $input, ?bool $flag, string $expected): void
+ {
+ if ($flag === null) {
+ // if expected starts with / and ends with / then this is a regex compare
+ if (
+ substr($expected, 0, 1) == '/' &&
+ substr($expected, -1, 1) == '/'
+ ) {
+ $this->assertMatchesRegularExpression(
+ $expected,
+ Support::printToString($input)
+ );
+ } else {
+ $this->assertEquals(
+ $expected,
+ Support::printToString($input)
+ );
+ }
+ } else {
+ $this->assertEquals(
+ $expected,
+ Support::printToString($input, $flag)
+ );
+ }
+ }
+
+ /**
+ * Undocumented function
+ *
+ * @return array
+ */
+ public function providerDumpExportVar(): array
+ {
+ return [
+ 'string' => [
+ 'input' => 'string',
+ 'flag' => null,
+ 'expected_dump' => 'string(6) "string"' . "\n",
+ 'expected_export' => "'string'
",
+ ],
+ 'string, no html' => [
+ 'input' => 'string',
+ 'flag' => true,
+ 'expected_dump' => 'string(6) "string"' . "\n",
+ 'expected_export' => "'string'",
+ ],
+ // int
+ 'int' => [
+ 'input' => 6,
+ 'flag' => null,
+ 'expected_dump' => 'int(6)' . "\n",
+ 'expected_export' => "6
",
+ ],
+ // float
+ 'float' => [
+ 'input' => 1.6,
+ 'flag' => null,
+ 'expected_dump' => 'float(1.6)' . "\n",
+ 'expected_export' => "1.6
",
+ ],
+ // bool
+ 'bool' => [
+ 'input' => true,
+ 'flag' => null,
+ 'expected_dump' => 'bool(true)' . "\n",
+ 'expected_export' => "true
",
+ ],
+ // array
+ 'array' => [
+ 'input' => ['string', true],
+ 'flag' => null,
+ 'expected_dump' => "array(2) {\n"
+ . " [0]=>\n"
+ . " string(6) \"string\"\n"
+ . " [1]=>\n"
+ . " bool(true)\n"
+ . "}\n",
+ 'expected_export' => "array (\n"
+ . " 0 => 'string',\n"
+ . " 1 => true,\n"
+ . ")
",
+ ],
+ // more
+ ];
+ }
+
+ /**
+ * Undocumented function
+ *
+ * @cover ::dumpVar
+ * @cover ::exportVar
+ * @dataProvider providerDumpExportVar
+ * @testdox dump/exportVar $input with $flag will be $expected_dump / $expected_export [$_dataName]
+ *
+ * @param mixed $input
+ * @param bool|null $flag
+ * @param string $expected_dump
+ * @param string $expected_export
+ * @return void
+ */
+ public function testDumpExportVar(mixed $input, ?bool $flag, string $expected_dump, string $expected_export): void
+ {
+ if ($flag === null) {
+ $dump = Support::dumpVar($input);
+ $export = Support::exportVar($input);
+ } else {
+ $dump = Support::dumpVar($input, $flag);
+ $export = Support::exportVar($input, $flag);
+ }
+ $this->assertEquals(
+ $expected_dump,
+ $dump,
+ 'assert dumpVar'
+ );
+ $this->assertEquals(
+ $expected_export,
+ $export,
+ 'assert dumpVar'
+ );
+ }
+
+ /**
+ * Undocumented function
+ *
+ * @cover ::getCallerFileLine
+ * @testWith ["/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/www/vendor/phpunit/phpunit/src/Framework/TestCase.php:1608"]
+ * @testdox getCallerFileLine check if it returns $expected [$_dataName]
+ *
+ * @param string $expected
+ * @return void
+ */
+ public function testGetCallerFileLine(string $expected): void
+ {
+ $this->assertEquals(
+ $expected,
+ Support::getCallerFileLine()
+ );
+ }
+
+ /**
+ * Undocumented function
+ *
+ * @cover ::getCallerMethod
+ * @testWith ["testGetCallerMethod"]
+ * @testdox getCallerMethod check if it returns $expected [$_dataName]
+ *
+ * @return void
+ */
+ public function testGetCallerMethod(string $expected): void
+ {
+ $this->assertEquals(
+ $expected,
+ Support::getCallerMethod()
+ );
+ }
+
+ /**
+ * Undocumented function
+ *
+ * @cover ::getCallerMethodList
+ * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
+ * @testdox getCallerMethodList check if it returns $expected [$_dataName]
+ *
+ * @param array $expected
+ * @return void
+ */
+ public function testGetCallerMethodList(array $expected): void
+ {
+ $compare = Support::getCallerMethodList();
+ // 10: legact
+ // 11: direct
+ // 12: full call
+ switch (count($compare)) {
+ case 10:
+ // add nothing
+ $this->assertEquals(
+ $expected,
+ Support::getCallerMethodList(),
+ 'assert expected 10'
+ );
+ break;
+ case 11:
+ // add one "run" before "runBare"
+ array_splice(
+ $expected,
+ 7,
+ 0,
+ ['run']
+ );
+ $this->assertEquals(
+ $expected,
+ Support::getCallerMethodList(),
+ 'assert expected 11'
+ );
+ break;
+ case 12:
+ // add two "run" before "runBare"
+ array_splice(
+ $expected,
+ 7,
+ 0,
+ ['run']
+ );
+ array_splice(
+ $expected,
+ 0,
+ 0,
+ ['include']
+ );
+ $this->assertEquals(
+ $expected,
+ Support::getCallerMethodList(),
+ 'assert expected 12'
+ );
+ break;
+ }
+ }
+
+ /**
+ * Undocumented function
+ *
+ * @cover ::getCallerClass
+ * @testWith ["PHPUnit\\TextUI\\Command"]
+ * @testdox getCallerClass check if it returns $expected [$_dataName]
+ *
+ * @return void
+ */
+ public function testGetCallerClass(string $expected): void
+ {
+ $this->assertEquals(
+ $expected,
+ Support::getCallerClass()
+ );
+ }
+
/**
* Undocumented function
*
@@ -236,205 +615,6 @@ final class CoreLibsDebugSupportTest extends TestCase
];
}
- /**
- * Undocumented function
- *
- * @cover ::printTime
- * @dataProvider printTimeProvider
- * @testdox printTime test with $microtime and match to regex [$_dataName]
- *
- * @param int|null $mircrotime
- * @param string $expected
- * @return void
- */
- public function testPrintTime(?int $microtime, string $regex): void
- {
- if ($microtime === null) {
- $this->assertMatchesRegularExpression(
- $regex,
- \CoreLibs\Debug\Support::printTime()
- );
- } else {
- $this->assertMatchesRegularExpression(
- $regex,
- \CoreLibs\Debug\Support::printTime($microtime)
- );
- }
- }
-
- /**
- * Undocumented function
- *
- * @cover ::printAr
- * @cover ::printArray
- * @dataProvider printArrayProvider
- * @testdox printAr/printArray $input will be $expected [$_dataName]
- *
- * @param array $input
- * @param string $expected
- * @return void
- */
- public function testPrintAr(array $input, string $expected): void
- {
- $this->assertEquals(
- $expected,
- \CoreLibs\Debug\Support::printAr($input),
- 'assert printAr'
- );
- $this->assertEquals(
- $expected,
- \CoreLibs\Debug\Support::printArray($input),
- 'assert printArray'
- );
- }
-
- /**
- * Undocumented function
- *
- * @cover ::printBool
- * @dataProvider printBoolProvider
- * @testdox printBool $input will be $expected [$_dataName]
- *
- * @param bool $input
- * @param array $params
- * @param string $expected
- * @return void
- */
- public function testPrintBool(bool $input, array $params, string $expected): void
- {
- if (
- isset($params['name']) &&
- isset($params['true']) &&
- isset($params['false'])
- ) {
- $string = \CoreLibs\Debug\Support::printBool(
- $input,
- $params['name'],
- $params['true'],
- $params['false']
- );
- } elseif (isset($params['name']) && isset($params['true'])) {
- $string = \CoreLibs\Debug\Support::printBool(
- $input,
- $params['name'],
- $params['true']
- );
- } elseif (isset($params['name'])) {
- $string = \CoreLibs\Debug\Support::printBool(
- $input,
- $params['name']
- );
- } else {
- $string = \CoreLibs\Debug\Support::printBool($input);
- }
- $this->assertEquals(
- $expected,
- $string,
- 'assert printBool'
- );
- }
-
- /**
- * Undocumented function
- *
- * @cover ::printToString
- * @dataProvider printToStringProvider
- * @testdox printToString $input with $flag will be $expected [$_dataName]
- *
- * @param mixed $input anything
- * @param boolean|null $flag html flag, only for string and array
- * @param string $expected always string
- * @return void
- */
- public function testPrintToString(mixed $input, ?bool $flag, string $expected): void
- {
- if ($flag === null) {
- // if expected starts with / and ends with / then this is a regex compare
- if (
- substr($expected, 0, 1) == '/' &&
- substr($expected, -1, 1) == '/'
- ) {
- $this->assertMatchesRegularExpression(
- $expected,
- \CoreLibs\Debug\Support::printToString($input)
- );
- } else {
- $this->assertEquals(
- $expected,
- \CoreLibs\Debug\Support::printToString($input)
- );
- }
- } else {
- $this->assertEquals(
- $expected,
- \CoreLibs\Debug\Support::printToString($input, $flag)
- );
- }
- }
-
- /**
- * Undocumented function
- *
- * @cover ::getCallerMethod
- * @testWith ["testGetCallerMethod"]
- * @testdox getCallerMethod check if it returns $expected [$_dataName]
- *
- * @return void
- */
- public function testGetCallerMethod(string $expected): void
- {
- $this->assertEquals(
- $expected,
- \CoreLibs\Debug\Support::getCallerMethod()
- );
- }
-
- /**
- * Undocumented function
- *
- * @cover ::getCallerMethodList
- * @testWith [["main", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"],["include", "main", "run", "run", "run", "run", "run", "run", "run", "runBare", "runTest", "testGetCallerMethodList"]]
- * @testdox getCallerMethodList check if it returns $expected [$_dataName]
- *
- * @param array $expected
- * @return void
- */
- public function testGetCallerMethodList(array $expected, array $expected_group): void
- {
- $compare = \CoreLibs\Debug\Support::getCallerMethodList();
- // if we direct call we have 10, if we call as folder we get 11
- if (count($compare) == 10) {
- $this->assertEquals(
- $expected,
- \CoreLibs\Debug\Support::getCallerMethodList(),
- 'assert expected 10'
- );
- } else {
- $this->assertEquals(
- $expected_group,
- \CoreLibs\Debug\Support::getCallerMethodList(),
- 'assert expected group'
- );
- }
- }
-
- /**
- * Undocumented function
- *
- * @cover ::getCallerClass
- * @testWith ["PHPUnit\\TextUI\\Command"]
- * @testdox getCallerClass check if it returns $expected [$_dataName]
- *
- * @return void
- */
- public function testGetCallerClass(string $expected): void
- {
- $this->assertEquals(
- $expected,
- \CoreLibs\Debug\Support::getCallerClass()
- );
- }
-
/**
* Undocumented function
*
@@ -453,19 +633,19 @@ final class CoreLibsDebugSupportTest extends TestCase
if ($replace === null && $flag === null) {
$this->assertEquals(
$expected,
- \CoreLibs\Debug\Support::debugString($input),
+ Support::debugString($input),
'assert all default'
);
} elseif ($flag === null) {
$this->assertEquals(
$expected,
- \CoreLibs\Debug\Support::debugString($input, $replace),
+ Support::debugString($input, $replace),
'assert flag default'
);
} else {
$this->assertEquals(
$expected,
- \CoreLibs\Debug\Support::debugString($input, $replace, $flag),
+ Support::debugString($input, $replace, $flag),
'assert all set'
);
}
diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Get/CoreLibsGetSystemTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Get/CoreLibsGetSystemTest.php
index eef6aec9..221553cc 100644
--- a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Get/CoreLibsGetSystemTest.php
+++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Get/CoreLibsGetSystemTest.php
@@ -67,17 +67,17 @@ final class CoreLibsGetSystemTest extends TestCase
'original set' => [
0 => null,
1 => 'NOHOST',
- 2 => 'NOPORT',
+ 2 => 0,
],
'override set no port' => [
0 => 'foo.org',
1 => 'foo.org',
- 2 => '80'
+ 2 => 80
],
'override set with port' => [
0 => 'foo.org:443',
1 => 'foo.org',
- 2 => '443'
+ 2 => 443
]
];
}
@@ -138,10 +138,10 @@ final class CoreLibsGetSystemTest extends TestCase
*
* @param string|null $input
* @param string $expected_host
- * @param string $expected_port
+ * @param int $expected_port
* @return void
*/
- public function testGetHostNanme(?string $input, string $expected_host, string $expected_port): void
+ public function testGetHostNanme(?string $input, string $expected_host, int $expected_port): void
{
// print "HOSTNAME: " . $_SERVER['HTTP_HOST'] . "
";
// print "SERVER: " . print_r($_SERVER, true) . "\n";
diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/CoreLibsLoggingLoggingTest.php b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/CoreLibsLoggingLoggingTest.php
new file mode 100644
index 00000000..fd75ebdd
--- /dev/null
+++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/CoreLibsLoggingLoggingTest.php
@@ -0,0 +1,797 @@
+ [
+ 'options' => [
+ 'log_folder' => DIRECTORY_SEPARATOR . 'tmp',
+ 'log_file_id' => 'testClassInit',
+ ],
+ 'expected' => [
+ 'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
+ 'log_level' => Level::Debug,
+ 'log_file_id' => 'testClassInit',
+ ],
+ 'override' => [],
+ ],
+ // -> deprecation warning, log_folder must be set
+ 'no log folder set' => [
+ 'options' => [
+ 'log_file_id' => 'testClassInit'
+ ],
+ 'expected' => [
+ 'log_folder' => getcwd() . DIRECTORY_SEPARATOR,
+ 'log_level' => Level::Debug,
+ 'log_file_id' => 'testClassInit',
+ ],
+ 'override' => []
+ ],
+ // -> upcoming deprecated
+ 'file_id set but not log_file_id' => [
+ 'options' => [
+ 'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
+ 'file_id' => 'testClassInit',
+ ],
+ 'expected' => [
+ 'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
+ 'log_level' => Level::Debug,
+ 'log_file_id' => 'testClassInit',
+ ],
+ 'override' => [],
+ ],
+ // both file_id and log_file_id set -> WARNING
+ 'file_id and log_file_id set' => [
+ 'options' => [
+ 'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
+ 'file_id' => 'testClassInit',
+ 'log_file_id' => 'testClassInit',
+ ],
+ 'expected' => [
+ 'log_folder' => DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
+ 'log_level' => Level::Debug,
+ 'log_file_id' => 'testClassInit',
+ ],
+ 'override' => [],
+ ],
+ // no log file id set -> error,
+ 'nothing set' => [
+ 'options' => [],
+ 'expected' => [
+ 'log_folder' => getcwd() . DIRECTORY_SEPARATOR,
+ 'log_level' => Level::Debug,
+ 'log_file_id' => 'NOHOST-0_PHPUnit-TextUI-Command',
+ ],
+ 'override' => []
+ ]
+ ];
+ }
+
+ /**
+ * init logging class
+ *
+ * @dataProvider optionsProvider
+ * @testdox init test [$_dataName]
+ *
+ * @param array $options
+ * @param array $expected
+ * @param array $override
+ * @return void
+ */
+ public function testClassInit(array $options, array $expected, array $override): void
+ {
+ if (!empty($override['constant'])) {
+ foreach ($override['constant'] as $var => $value) {
+ if (!defined($var)) {
+ define($var, $value);
+ }
+ }
+ // for deprecated no log_folder set
+ // if base is defined and it does have AAASetupData set
+ // change the log_folder "Debug" to "AAASetupData"
+ if (
+ defined('BASE') &&
+ strpos(BASE, DIRECTORY_SEPARATOR . 'AAASetupData') !== false
+ ) {
+ $expected['log_folder'] = str_replace(
+ DIRECTORY_SEPARATOR . 'Debug',
+ DIRECTORY_SEPARATOR . 'AAASetupData',
+ $expected['log_folder']
+ );
+ }
+ }
+ // if not log folder and constant set -> expect E_USER_DEPRECATION
+ if (!empty($override['constant']) && empty($options['log_folder'])) {
+ // the deprecation message
+ $deprecation_message = 'options: log_folder must be set. '
+ . 'Setting via BASE and LOG constants is deprecated';
+ // convert E_USER_DEPRECATED to a exception
+ set_error_handler(
+ static function (int $errno, string $errstr): never {
+ throw new \Exception($errstr, $errno);
+ },
+ E_USER_DEPRECATED
+ );
+ // catch this with the message
+ $this->expectExceptionMessage($deprecation_message);
+ }
+ // alert for log file id with globals
+ if (!empty($override['constant']) && empty($options['log_file_id'])) {
+ //
+ }
+ // alert for log file id and file id set
+ if (
+ !empty($options['log_file_id']) &&
+ !empty($options['file_id'])
+ ) {
+ set_error_handler(
+ static function (int $errno, string $errstr): never {
+ throw new \InvalidArgumentException($errstr, $errno);
+ },
+ E_USER_WARNING
+ );
+ $error_message = 'options: "file_id" is deprecated use: "log_file_id".';
+ $this->expectExceptionMessage($error_message);
+ $this->expectException(\InvalidArgumentException::class);
+ set_error_handler(
+ static function (int $errno, string $errstr): never {
+ throw new \Exception($errstr, $errno);
+ },
+ E_USER_DEPRECATED
+ );
+ $this->expectException(\Exception::class);
+ // $error_message = 'options: both log_file_id and log_id are set at the same time, will use log_file_id';
+ // $this->expectExceptionMessage($error_message);
+ }
+ // empty log folder
+ if (empty($override['constant']) && empty($options['log_folder'])) {
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessageMatches("/^Missing mandatory option: \"/");
+ } elseif (empty($options['log_file_id']) && !empty($options['file_id'])) {
+ // the deprecation message
+ $deprecation_message = 'options: "file_id" is deprecated use: "log_file_id".';
+ // convert E_USER_DEPRECATED to a exception
+ set_error_handler(
+ static function (int $errno, string $errstr): never {
+ throw new \Exception($errstr, $errno);
+ },
+ E_USER_DEPRECATED
+ );
+ // catch this with the message
+ $this->expectExceptionMessage($deprecation_message);
+ }
+ $log = new \CoreLibs\Logging\Logging($options);
+ // reset error handler
+ restore_error_handler();
+ // check that settings match
+ $this->assertEquals(
+ $expected['log_folder'],
+ $log->getLogFolder(),
+ 'log folder not matching'
+ );
+ $this->assertEquals(
+ $expected['log_file_id'],
+ $log->getLogFileId(),
+ 'log file id not matching'
+ );
+ }
+
+ // test all setters/getters
+
+ // setLoggingLevel
+ // getLoggingLevel
+ // getJsDebug
+
+ /**
+ * Undocumented function
+ *
+ * @covers ::setLoggingLevel
+ * @covers ::getLoggingLevel
+ * @covers ::getJsDebug
+ * @testdox setLoggingLevel set/get checks
+ *
+ * @return void
+ */
+ public function testSetLoggingLevel(): void
+ {
+ // valid that is not Debug
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testSetLoggingLevel',
+ 'log_folder' => self::LOG_FOLDER,
+ 'log_level' => Level::Info
+ ]);
+ $this->assertEquals(
+ Level::Info,
+ $log->getLoggingLevel()
+ );
+ $this->assertFalse(
+ $log->getJsDebug()
+ );
+ // not set, should be debug]
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testSetLoggingLevel',
+ 'log_folder' => self::LOG_FOLDER,
+ ]);
+ $this->assertEquals(
+ Level::Debug,
+ $log->getLoggingLevel()
+ );
+ $this->assertTrue(
+ $log->getJsDebug()
+ );
+ // invalid, should be debug, will throw excpetion too
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessage('Option: "log_level" is not of instance \CoreLibs\Logging\Logger\Level');
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testSetLoggingLevel',
+ 'log_folder' => self::LOG_FOLDER,
+ 'log_level' => 'I'
+ ]);
+ $this->assertEquals(
+ Level::Debug,
+ $log->getLoggingLevel()
+ );
+ $this->assertTrue(
+ $log->getJsDebug()
+ );
+ // set valid, then change
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testSetLoggingLevel',
+ 'log_folder' => self::LOG_FOLDER,
+ 'log_level' => Level::Info
+ ]);
+ $this->assertEquals(
+ Level::Info,
+ $log->getLoggingLevel()
+ );
+ $log->setLoggingLevel(Level::Notice);
+ $this->assertEquals(
+ Level::Notice,
+ $log->getLoggingLevel()
+ );
+ // illegal logging level
+ $this->expectException(\Psr\Log\InvalidArgumentException::class);
+ $this->expectExceptionMessageMatches("/^Level \"NotGood\" is not defined, use one of: /");
+ $log->setLoggingLevel('NotGood');
+ }
+
+ // setLogFileId
+ // getLogFileId
+
+ /**
+ * Undocumented function
+ *
+ * @covers ::setLogFileId
+ * @covers ::getLogFileId
+ * @testdox setLogFileId set/get checks
+ *
+ * @return void
+ */
+ public function testLogFileId(): void
+ {
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testLogFileId',
+ 'log_folder' => self::LOG_FOLDER
+ ]);
+ // bad, keep same
+ $log->setLogFileId('$$##$%#$%&');
+ $this->assertEquals(
+ 'testLogFileId',
+ $log->getLogFileId()
+ );
+ // good, change
+ $log->setLogFileId('validID');
+ $this->assertEquals(
+ 'validID',
+ $log->getLogFileId()
+ );
+ // invalid on init
+ $this->expectException(\Psr\Log\InvalidArgumentException::class);
+ $this->expectExceptionMessage('LogFileId: no log file id set');
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => '$$$"#"#$"#$',
+ 'log_folder' => self::LOG_FOLDER
+ ]);
+ }
+
+ // setLogUniqueId
+ // getLogUniqueId
+
+ /**
+ * Undocumented function
+ *
+ * @return array
+ */
+ public function logUniqueIdProvider(): array
+ {
+ return [
+ 'option set' => [
+ 'option' => true,
+ 'override' => false,
+ ],
+ 'direct set' => [
+ 'option' => false,
+ 'override' => false,
+ ],
+ 'override set' => [
+ 'option' => false,
+ 'override' => true,
+ ],
+ 'option and override set' => [
+ 'option' => false,
+ 'override' => true,
+ ],
+ ];
+ }
+
+ /**
+ * Undocumented function
+ *
+ * @covers ::setLogUniqueId
+ * @covers ::getLogUniqueId
+ * @dataProvider logUniqueIdProvider
+ * @testdox per run log id set test: option: $option, override: $override [$_dataName]
+ *
+ * @param bool $option
+ * @param bool $override
+ * @return void
+ */
+ public function testLogUniqueId(bool $option, bool $override): void
+ {
+ if ($option === true) {
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testLogUniqueId',
+ 'log_folder' => self::LOG_FOLDER,
+ 'log_per_run' => $option
+ ]);
+ } else {
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testLogUniqueId',
+ 'log_folder' => self::LOG_FOLDER
+ ]);
+ $log->setLogUniqueId();
+ }
+ $per_run_id = $log->getLogUniqueId();
+ $this->assertMatchesRegularExpression(
+ "/^\d{4}-\d{2}-\d{2}_\d{6}_U_[a-z0-9]{8}$/",
+ $per_run_id,
+ 'assert per log run id 1st'
+ );
+ if ($override === true) {
+ $log->setLogUniqueId(true);
+ $per_run_id_2nd = $log->getLogUniqueId();
+ $this->assertMatchesRegularExpression(
+ "/^\d{4}-\d{2}-\d{2}_\d{6}_U_[a-z0-9]{8}$/",
+ $per_run_id_2nd,
+ 'assert per log run id 2nd'
+ );
+ $this->assertNotEquals(
+ $per_run_id,
+ $per_run_id_2nd,
+ '1st and 2nd don\'t match'
+ );
+ }
+ }
+
+ // setLogDate
+ // getLogDate
+
+ /**
+ * Undocumented function
+ *
+ * @covers ::setLogDate
+ * @covers ::getLogDate
+ * @testdox setLogDate set/get checks
+ *
+ * @return void
+ */
+ public function testSetLogDate(): void
+ {
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testLogFileId',
+ 'log_folder' => self::LOG_FOLDER,
+ 'log_per_date' => true,
+ ]);
+ $this->assertEquals(
+ date('Y-m-d'),
+ $log->getLogDate()
+ );
+ }
+
+ // setLogFlag
+ // getLogFlag
+ // unsetLogFlag
+ // getLogFlags
+ // Logger\Flag
+
+ /**
+ * Undocumented function
+ *
+ * @covers Logger\Flag
+ * @testdox Logger\Flag enum test
+ *
+ * @return void
+ */
+ public function testLoggerFlag(): void
+ {
+ // logger flags to check that they exist
+ $flags = [
+ 'all_off' => 0,
+ 'per_run' => 1,
+ 'per_date' => 2,
+ 'per_group' => 4,
+ 'per_page' => 8,
+ 'per_class' => 16,
+ 'per_level' => 32,
+ ];
+ // from int -> return value
+ foreach ($flags as $name => $value) {
+ $this->assertEquals(
+ Flag::fromName($name),
+ Flag::fromValue($value)
+ );
+ }
+ }
+
+ /**
+ * Undocumented function
+ *
+ * @covers ::setLogFlag
+ * @covers ::getLogFlag
+ * @covers ::unsetLogFlag
+ * @covers ::getLogFlags
+ * @testdox setLogDate set/get checks
+ *
+ * @return void
+ */
+ public function testSetLogFlag(): void
+ {
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testSetLogFlag',
+ 'log_folder' => self::LOG_FOLDER,
+ ]);
+ // set valid log flag
+ $log->setLogFlag(Flag::per_run);
+ $this->assertTrue(
+ $log->getLogFlag(Flag::per_run)
+ );
+ // flags seum
+ $this->assertEquals(
+ Flag::per_run->value,
+ $log->getLogFlags(),
+ );
+ // unset valid log flag
+ $log->unsetLogFlag(Flag::per_run);
+ $this->assertFalse(
+ $log->getLogFlag(Flag::per_run)
+ );
+ // illegal Flags cannot be set, they will throw eerros onrun
+
+ // test multi set and sum is equals set
+ $log->setLogFlag(Flag::per_date);
+ $log->setLogFlag(Flag::per_group);
+ $this->assertEquals(
+ Flag::per_date->value + Flag::per_group->value,
+ $log->getLogFlags()
+ );
+ }
+
+ // setLogFolder
+ // getLogFolder
+
+ /**
+ * Undocumented function
+ *
+ * @covers ::setLogFolder
+ * @covers ::getLogFolder
+ * @testdox setLogFolder set/get checks, init check
+ *
+ * @return void
+ */
+ public function testSetLogFolder(): void
+ {
+ // set to good folder
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testSetLogFolder',
+ 'log_folder' => self::LOG_FOLDER,
+ ]);
+ $this->assertEquals(
+ self::LOG_FOLDER,
+ $log->getLogFolder()
+ );
+ // set to a good other folder
+ $log->setLogFolder(DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR);
+ $this->assertEquals(
+ DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
+ $log->getLogFolder()
+ );
+ // good other folder with missing trailing slash
+ $log->setLogFolder(DIRECTORY_SEPARATOR . 'tmp');
+ $this->assertEquals(
+ DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
+ $log->getLogFolder()
+ );
+ // a bad folder -> last good folder
+ $log->setLogFolder('I-am-not existing');
+ $this->assertEquals(
+ DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR,
+ $log->getLogFolder()
+ );
+ // init with a bad folder
+ $this->expectException(\Psr\Log\InvalidArgumentException::class);
+ $this->expectExceptionMessage('Folder: "I-am-bad" is not writeable for logging');
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testSetLogFolderInvalid',
+ 'log_folder' => 'I-am-bad',
+ ]);
+ }
+
+ // getLogFile (no set, only correct after log run)
+
+ // setLogMaxFileSize
+ // getLogMaxFileSize
+
+ /**
+ * Undocumented function
+ *
+ * @covers ::setLogMaxFileSize
+ * @covers ::getLogMaxFileSize
+ * @testdox setLogMaxFileSize set/get checks, init check
+ *
+ * @return void
+ */
+ public function testSetLogMaxFileSize(): void
+ {
+ // init set to 0
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testSetLogMaxFileSize',
+ 'log_folder' => self::LOG_FOLDER,
+ ]);
+ $this->assertEquals(
+ 0,
+ $log->getLogMaxFileSize()
+ );
+ // set to new, valid size
+ $file_size = 200 * 1024;
+ $valid = $log->setLogMaxFileSize($file_size);
+ $this->assertTrue($valid);
+ $this->assertEquals(
+ $file_size,
+ $log->getLogMaxFileSize()
+ );
+ // invalid size, < 0, will be last and return false
+ $valid = $log->setLogMaxFileSize(-1);
+ $this->assertFalse($valid);
+ $this->assertEquals(
+ $file_size,
+ $log->getLogMaxFileSize()
+ );
+ // too small (< MIN_LOG_MAX_FILESIZE)
+ $valid = $log->setLogMaxFileSize($log::MIN_LOG_MAX_FILESIZE - 1);
+ $this->assertFalse($valid);
+ $this->assertEquals(
+ $file_size,
+ $log->getLogMaxFileSize()
+ );
+ }
+
+ // getOption (option params)
+
+ /**
+ * Undocumented function
+ *
+ * @covers ::getOption
+ * @testdox getOption checks
+ *
+ * @return void
+ */
+ public function testGetOption(): void
+ {
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testGetOption',
+ 'log_folder' => self::LOG_FOLDER,
+ ]);
+ $this->assertEquals(
+ self::LOG_FOLDER,
+ $log->getOption('log_folder')
+ );
+ // not found
+ $this->assertNull(
+ $log->getOption('I_do not exist')
+ );
+ }
+
+ // test all logger functions
+ // debug (special)
+ // info
+ // notice
+ // warning
+ // error
+ // critical
+ // alert
+ // emergency
+
+ /**
+ * Undocumented function
+ *
+ * @covers ::debug
+ * @testdox debug checks
+ *
+ * @return void
+ */
+ public function testDebug(): void
+ {
+ // init logger
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'testDebug',
+ 'log_folder' => self::LOG_FOLDER,
+ ]);
+ // clean all data in folder first
+ array_map('unlink', glob($log->getLogFolder() . $log->getLogFileId() . '*.log'));
+
+ $group_id = 'G';
+ $message = 'D';
+ $log_status = $log->debug($group_id, $message);
+ $this->assertTrue($log_status, 'debug write successful');
+ $file_content = file_get_contents(
+ $log->getLogFolder() . $log->getLogFile()
+ ) ?: '';
+ $log_level = $log->getLoggingLevel()->getName();
+ // [2023-05-30 15:51:39.36128800] [NOHOST:0]
+ // [www/vendor/bin/phpunit] [7b9d0747] {PHPUnit\TextUI\Command}
+ // D
+ $this->assertMatchesRegularExpression(
+ "/" . self::REGEX_BASE
+ . "<$log_level:$group_id>\s{1}" // log level / group id
+ . "$message" // message
+ . "/",
+ $file_content
+ );
+ }
+
+ public function providerLoggingLevelWrite(): array
+ {
+ return [
+ 'info' => [
+ 'message' => 'I',
+ 'file_id' => Level::Info->name,
+ 'level' => Level::Info
+ ],
+ 'notice' => [
+ 'message' => 'N',
+ 'file_id' => Level::Notice->name,
+ 'level' => Level::Notice
+ ],
+ 'warning' => [
+ 'message' => 'W',
+ 'file_id' => Level::Warning->name,
+ 'level' => Level::Warning
+ ],
+ 'error' => [
+ 'message' => 'E',
+ 'file_id' => Level::Error->name,
+ 'level' => Level::Error
+ ],
+ 'crticial' => [
+ 'message' => 'C',
+ 'file_id' => Level::Critical->name,
+ 'level' => Level::Critical
+ ],
+ 'alert' => [
+ 'message' => 'A',
+ 'file_id' => Level::Alert->name,
+ 'level' => Level::Alert
+ ],
+ 'emergency' => [
+ 'message' => 'Em',
+ 'file_id' => Level::Emergency->name,
+ 'level' => Level::Emergency
+ ],
+ ];
+ }
+
+ /**
+ * Undocumented function
+ *
+ * @covers ::info
+ * @covers ::notice
+ * @covers ::warning
+ * @covers ::error
+ * @covers ::critical
+ * @covers ::alert
+ * @covers ::emergency
+ * @dataProvider providerLoggingLevelWrite
+ * @testdox logging level write checks for $level [$_dataName]
+ *
+ * @return void
+ */
+ public function testLoggingLevelWrite(string $message, string $file_id, Level $level): void
+ {
+ // init logger
+ $log = new \CoreLibs\Logging\Logging([
+ 'log_file_id' => 'test' . $file_id,
+ 'log_folder' => self::LOG_FOLDER,
+ 'log_level' => $level,
+ ]);
+ // clean all data in folder first
+ array_map('unlink', glob($log->getLogFolder() . $log->getLogFileId() . '*.log'));
+
+ switch ($level->value) {
+ case 200:
+ $log_status = $log->info($message);
+ break;
+ case 250:
+ $log_status = $log->notice($message);
+ break;
+ case 300:
+ $log_status = $log->warning($message);
+ break;
+ case 400:
+ $log_status = $log->error($message);
+ break;
+ case 500:
+ $log_status = $log->critical($message);
+ break;
+ case 550:
+ $log_status = $log->alert($message);
+ break;
+ case 600:
+ $log_status = $log->emergency($message);
+ break;
+ }
+ $this->assertTrue($log_status, 'log write successful');
+ $file_content = file_get_contents(
+ $log->getLogFolder() . $log->getLogFile()
+ ) ?: '';
+ $log_level = $log->getLoggingLevel()->getName();
+ $this->assertMatchesRegularExpression(
+ "/" . self::REGEX_BASE
+ . "<$log_level>\s{1}" // log level / group id
+ . "$message" // message
+ . "/",
+ $file_content,
+ 'log message regex'
+ );
+ }
+
+ // deprecated calls check?
+}
+
+// __END__
diff --git a/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/log/.gitignore b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/log/.gitignore
new file mode 100644
index 00000000..2a50fc00
--- /dev/null
+++ b/www/vendor/egrajp/corelibs-composer-all/test/phpunit/Logging/log/.gitignore
@@ -0,0 +1,3 @@
+*log
+*LOG
+!.gitignore
diff --git a/www/vendor/psr/log/LICENSE b/www/vendor/psr/log/LICENSE
new file mode 100644
index 00000000..474c952b
--- /dev/null
+++ b/www/vendor/psr/log/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2012 PHP Framework Interoperability Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/www/vendor/psr/log/README.md b/www/vendor/psr/log/README.md
new file mode 100644
index 00000000..a9f20c43
--- /dev/null
+++ b/www/vendor/psr/log/README.md
@@ -0,0 +1,58 @@
+PSR Log
+=======
+
+This repository holds all interfaces/classes/traits related to
+[PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md).
+
+Note that this is not a logger of its own. It is merely an interface that
+describes a logger. See the specification for more details.
+
+Installation
+------------
+
+```bash
+composer require psr/log
+```
+
+Usage
+-----
+
+If you need a logger, you can use the interface like this:
+
+```php
+logger = $logger;
+ }
+
+ public function doSomething()
+ {
+ if ($this->logger) {
+ $this->logger->info('Doing work');
+ }
+
+ try {
+ $this->doSomethingElse();
+ } catch (Exception $exception) {
+ $this->logger->error('Oh no!', array('exception' => $exception));
+ }
+
+ // do something useful
+ }
+}
+```
+
+You can then pick one of the implementations of the interface to get a logger.
+
+If you want to implement the interface, you can require this package and
+implement `Psr\Log\LoggerInterface` in your code. Please read the
+[specification text](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
+for details.
diff --git a/www/vendor/psr/log/composer.json b/www/vendor/psr/log/composer.json
new file mode 100644
index 00000000..879fc6f5
--- /dev/null
+++ b/www/vendor/psr/log/composer.json
@@ -0,0 +1,26 @@
+{
+ "name": "psr/log",
+ "description": "Common interface for logging libraries",
+ "keywords": ["psr", "psr-3", "log"],
+ "homepage": "https://github.com/php-fig/log",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "PHP-FIG",
+ "homepage": "https://www.php-fig.org/"
+ }
+ ],
+ "require": {
+ "php": ">=8.0.0"
+ },
+ "autoload": {
+ "psr-4": {
+ "Psr\\Log\\": "src"
+ }
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.x-dev"
+ }
+ }
+}
diff --git a/www/vendor/psr/log/src/AbstractLogger.php b/www/vendor/psr/log/src/AbstractLogger.php
new file mode 100644
index 00000000..d60a091a
--- /dev/null
+++ b/www/vendor/psr/log/src/AbstractLogger.php
@@ -0,0 +1,15 @@
+logger = $logger;
+ }
+}
diff --git a/www/vendor/psr/log/src/LoggerInterface.php b/www/vendor/psr/log/src/LoggerInterface.php
new file mode 100644
index 00000000..b3a24b5f
--- /dev/null
+++ b/www/vendor/psr/log/src/LoggerInterface.php
@@ -0,0 +1,125 @@
+log(LogLevel::EMERGENCY, $message, $context);
+ }
+
+ /**
+ * Action must be taken immediately.
+ *
+ * Example: Entire website down, database unavailable, etc. This should
+ * trigger the SMS alerts and wake you up.
+ *
+ * @param string|\Stringable $message
+ * @param array $context
+ *
+ * @return void
+ */
+ public function alert(string|\Stringable $message, array $context = []): void
+ {
+ $this->log(LogLevel::ALERT, $message, $context);
+ }
+
+ /**
+ * Critical conditions.
+ *
+ * Example: Application component unavailable, unexpected exception.
+ *
+ * @param string|\Stringable $message
+ * @param array $context
+ *
+ * @return void
+ */
+ public function critical(string|\Stringable $message, array $context = []): void
+ {
+ $this->log(LogLevel::CRITICAL, $message, $context);
+ }
+
+ /**
+ * Runtime errors that do not require immediate action but should typically
+ * be logged and monitored.
+ *
+ * @param string|\Stringable $message
+ * @param array $context
+ *
+ * @return void
+ */
+ public function error(string|\Stringable $message, array $context = []): void
+ {
+ $this->log(LogLevel::ERROR, $message, $context);
+ }
+
+ /**
+ * Exceptional occurrences that are not errors.
+ *
+ * Example: Use of deprecated APIs, poor use of an API, undesirable things
+ * that are not necessarily wrong.
+ *
+ * @param string|\Stringable $message
+ * @param array $context
+ *
+ * @return void
+ */
+ public function warning(string|\Stringable $message, array $context = []): void
+ {
+ $this->log(LogLevel::WARNING, $message, $context);
+ }
+
+ /**
+ * Normal but significant events.
+ *
+ * @param string|\Stringable $message
+ * @param array $context
+ *
+ * @return void
+ */
+ public function notice(string|\Stringable $message, array $context = []): void
+ {
+ $this->log(LogLevel::NOTICE, $message, $context);
+ }
+
+ /**
+ * Interesting events.
+ *
+ * Example: User logs in, SQL logs.
+ *
+ * @param string|\Stringable $message
+ * @param array $context
+ *
+ * @return void
+ */
+ public function info(string|\Stringable $message, array $context = []): void
+ {
+ $this->log(LogLevel::INFO, $message, $context);
+ }
+
+ /**
+ * Detailed debug information.
+ *
+ * @param string|\Stringable $message
+ * @param array $context
+ *
+ * @return void
+ */
+ public function debug(string|\Stringable $message, array $context = []): void
+ {
+ $this->log(LogLevel::DEBUG, $message, $context);
+ }
+
+ /**
+ * Logs with an arbitrary level.
+ *
+ * @param mixed $level
+ * @param string|\Stringable $message
+ * @param array $context
+ *
+ * @return void
+ *
+ * @throws \Psr\Log\InvalidArgumentException
+ */
+ abstract public function log($level, string|\Stringable $message, array $context = []): void;
+}
diff --git a/www/vendor/psr/log/src/NullLogger.php b/www/vendor/psr/log/src/NullLogger.php
new file mode 100644
index 00000000..c1cc3c06
--- /dev/null
+++ b/www/vendor/psr/log/src/NullLogger.php
@@ -0,0 +1,30 @@
+logger) { }`
+ * blocks.
+ */
+class NullLogger extends AbstractLogger
+{
+ /**
+ * Logs with an arbitrary level.
+ *
+ * @param mixed $level
+ * @param string|\Stringable $message
+ * @param array $context
+ *
+ * @return void
+ *
+ * @throws \Psr\Log\InvalidArgumentException
+ */
+ public function log($level, string|\Stringable $message, array $context = []): void
+ {
+ // noop
+ }
+}