Merge pull request #74 from Dratejinn/release/4.0.0

Release/4.0.0

Author: WarriorXK

VERSION

@@ -1 +1 @@
-3.1.5
+4.0.0

composer.json

@@ -21,7 +21,7 @@
     "require": {
         "php": "^7.4.0 || ^8.0.0",
         "ext-sockets": "*",
-        "psr/log": "^1.0"
+        "psr/log": "^1.0 || ^2.0 || ^3.0"
     },
     "autoload": {
         "psr-4": {
@@ -48,7 +48,7 @@
     ],
     "config": {
         "platform": {
-            "php": "7.4"
+            "php": "8.1"
         }
     }
 }

composer.lock

@@ -129,26 +129,11 @@ final class PHPWebSockets {
         511 => 'Network Authentication Required',
     ];
 
-    /**
-     * If we should add debug traces in the constructor of AUpdate
-     *
-     * @var bool
-     */
-    private static $_TraceAllUpdates = FALSE;
+    private static bool $_TraceAllUpdates = FALSE;
 
-    /**
-     * The current version of PHPWebSockets
-     *
-     * @var string|null
-     */
-    private static $_Version = NULL;
+    private static ?string $_Version = NULL;
 
-    /**
-     * The log handler function
-     *
-     * @var \Psr\Log\LoggerInterface
-     */
-    private static $_Logger = NULL;
+    private static ?LoggerInterface $_Logger = NULL;
 
     /**
      * Checks for updates for the provided IStreamContainer objects
@@ -483,7 +468,10 @@ public static function SetTraceAllUpdates(bool $value) : void {
      * @return void
      */
     public static function Log(string $logLevel, $message, array $context = []) : void {
-        self::GetLogger()->log($logLevel, $message, $context);
+        $logger = self::getLogger();
+        if ($logger) {
+            $logger->log($logLevel, $message, $context);
+        }
     }
 
     /**
@@ -502,12 +490,7 @@ public static function SetLogger(LoggerInterface $logger) : void {
      *
      * @return \Psr\Log\LoggerInterface
      */
-    public static function GetLogger() : LoggerInterface {
-
-        if (self::$_Logger === NULL) {
-            self::$_Logger = new \PHPWebSockets\BasicLogger();
-        }
-
+    public static function GetLogger() : ?LoggerInterface {
         return self::$_Logger;
     }
 

src/PHPWebSockets.php

@@ -64,7 +64,7 @@ public function __construct(Server $server, $stream) {
 
         // Inherit the logger from the server
         $serverLogger = $server->getLogger();
-        if ($serverLogger !== \PHPWebSockets::GetLogger()) {
+        if ($serverLogger && $serverLogger !== \PHPWebSockets::GetLogger()) {
             $this->setLogger($serverLogger);
         }
 

src/PHPWebSockets/BasicLogger.php

@@ -97,7 +97,7 @@ public function __construct(Server $server, $stream, string $streamName, int $in
 
         // Inherit the logger from the server
         $serverLogger = $server->getLogger();
-        if ($serverLogger !== \PHPWebSockets::GetLogger()) {
+        if ($serverLogger && $serverLogger !== \PHPWebSockets::GetLogger()) {
             $this->setLogger($serverLogger);
         }
 

src/PHPWebSockets/Server/AcceptingConnection.php

@@ -34,12 +34,7 @@
 
 trait TLogAware {
 
-    /**
-     * The logger
-     *
-     * @var \Psr\Log\LoggerInterface|null
-     */
-    protected $_logger = NULL;
+    protected ?LoggerInterface $_logger = NULL;
 
     /**
      * Sets the logger
@@ -57,10 +52,9 @@ public function setLogger(LoggerInterface $logger) : void {
      *
      * @return \Psr\Log\LoggerInterface
      */
-    public function getLogger() : LoggerInterface {
-
+    public function getLogger() : ?LoggerInterface {
         if ($this->_logger === NULL) {
-            return \PHPWebSockets::GetLogger();
+            $this->_logger = \PHPWebSockets::GetLogger();
         }
 
         return $this->_logger;
@@ -76,10 +70,11 @@ public function getLogger() : LoggerInterface {
      * @return void
      */
     protected function _log(string $level, string $message, array $context = []) : void {
-
-        $this->getLogger()->log($level, $message, array_merge([
-            'subject' => $this,
-        ], $context));
-
+        $logger = $this->getLogger();
+        if ($logger) {
+            $logger->log($level, $message, array_merge([
+                'subject' => $this,
+            ], $context));
+        }
     }
 }