diff --git a/README.md b/README.md index 976f613..0acb0ea 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Log4php (joaomfrebelo) +# Log4php (viridem) This project is a fork of Apache log4php, to make it compatible with php version 8.0 and above. diff --git a/composer.json b/composer.json index e20a1d2..3692989 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "joaomfrebelo/log4php", + "name": "viridem/log4php", "description": "A versatile logging framework for PHP. Forked from apache/log4php", "keywords": [ "log", @@ -10,9 +10,9 @@ "type": "library", "license": "Apache-2.0", "support": { - "issues": "https://github.com/joaomfrebelo/log4php/issues", - "source": "https://github.com/joaomfrebelo/log4php", - "email": "joaomfrebelo@gmail.com" + "issues": "https://github.com/viridem-team/log4php/issues", + "source": "https://github.com/viridem-team/log4php", + "email": "github@viridem.ca" }, "autoload": { "classmap": [ @@ -20,10 +20,10 @@ ] }, "require": { - "php": "8.0.* || 8.1.* || 8.2.* || 8.3.*", + "php": "8.3.* || 8.4.* || 8.5.*", "ext-libxml": "*", "ext-simplexml": "*", - "mongodb/mongodb": "^1.15.0", + "mongodb/mongodb": "^2.0.0", "ext-mongodb": "*", "ext-pdo": "*" }, diff --git a/src/main/php/helpers/LoggerOptionConverter.php b/src/main/php/helpers/LoggerOptionConverter.php index eba7fe4..e665bd1 100644 --- a/src/main/php/helpers/LoggerOptionConverter.php +++ b/src/main/php/helpers/LoggerOptionConverter.php @@ -100,8 +100,8 @@ public static function toIntegerEx($value): int if (is_integer($value)) { return $value; } - if (is_numeric($value) && ($value == (integer)$value)) { - return (integer)$value; + if (is_numeric($value) && ($value == (int)$value)) { + return (int)$value; } throw new LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to integer."); @@ -117,8 +117,8 @@ public static function toPositiveIntegerEx($value): int if (is_integer($value) && $value > 0) { return $value; } - if (is_numeric($value) && ($value == (integer)$value) && $value > 0) { - return (integer)$value; + if (is_numeric($value) && ($value == (int)$value) && $value > 0) { + return (int)$value; } throw new LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to a positive integer."); @@ -140,7 +140,7 @@ public static function toLevelEx($value): LoggerLevel } /** - * Converts a value to a valid file size (integer). + * Converts a value to a valid file size (int). * * Supports 'KB', 'MB' and 'GB' suffixes, where KB = 1024 B etc. * @@ -164,7 +164,7 @@ public static function toFileSizeEx(mixed $value): int } if (is_numeric($value)) { - return (integer)$value; + return (int)$value; } if (!is_string($value)) { @@ -190,7 +190,7 @@ public static function toFileSizeEx(mixed $value): int break; } - return (integer)$size; + return (int)$size; } throw new LoggerException("Given value [$value] cannot be converted to a file size."); diff --git a/src/main/php/helpers/LoggerPatternParser.php b/src/main/php/helpers/LoggerPatternParser.php index 3b77a3e..decbf2a 100644 --- a/src/main/php/helpers/LoggerPatternParser.php +++ b/src/main/php/helpers/LoggerPatternParser.php @@ -232,13 +232,13 @@ private function parseModifiers($modifiers): LoggerFormattingInfo $parts = explode('.', $modifiers); if (!empty($parts[0])) { - $minPart = (integer)$parts[0]; + $minPart = (int)$parts[0]; $info->min = abs($minPart); $info->padLeft = ($minPart > 0); } if (!empty($parts[1])) { - $maxPart = (integer)$parts[1]; + $maxPart = (int)$parts[1]; $info->max = abs($maxPart); $info->trimLeft = ($maxPart < 0); } diff --git a/src/main/php/pattern/LoggerPatternConverterClass.php b/src/main/php/pattern/LoggerPatternConverterClass.php index 3b01cf0..b26bdb3 100644 --- a/src/main/php/pattern/LoggerPatternConverterClass.php +++ b/src/main/php/pattern/LoggerPatternConverterClass.php @@ -42,7 +42,7 @@ public function activateOptions(): void { // Parse the option (desired output length) if (isset($this->option) && is_numeric($this->option) && $this->option >= 0) { - $this->length = (integer)$this->option; + $this->length = (int)$this->option; } } diff --git a/src/main/php/pattern/LoggerPatternConverterLogger.php b/src/main/php/pattern/LoggerPatternConverterLogger.php index 85ab727..73b556b 100644 --- a/src/main/php/pattern/LoggerPatternConverterLogger.php +++ b/src/main/php/pattern/LoggerPatternConverterLogger.php @@ -44,7 +44,7 @@ public function activateOptions(): void { // Parse the option (desired output length) if (isset($this->option) && is_numeric($this->option) && $this->option >= 0) { - $this->length = (integer)$this->option; + $this->length = (int)$this->option; } }