Merge branch 'master' into refactor/async-server

Author: thekid

ChangeLog.md

@@ -3,6 +3,13 @@ Networking changelog
 
 ## ?.?.? / ????-??-??
 
+## 10.3.1 / 2022-08-28
+
+* Fixed package reflection for `peer.server` by deferring the check for
+  `ext/pcntl` until server implementations based on its functionality
+  are instantiated, not just loaded
+  (@thekid)
+
 ## 10.3.0 / 2022-08-26
 
 * Merged PR #24: Simplify peer.net API, implementing features sugggested

README.md

@@ -15,7 +15,7 @@ Basic low-level
 
 ```php
 package peer {
-  public enum peer.Sockets
+  public abstract enum peer.Sockets
 
   public class peer.AuthenticationException
   public class peer.BSDSocket
@@ -41,7 +41,7 @@ Networks and DNS
 
 ```php
 package peer.net {
-  public interface peer.net.InetAddress
+  public abstract class peer.net.InetAddress
 
   public class peer.net.Inet4Address
   public class peer.net.Inet6Address

src/main/php/peer/Socket.class.php

@@ -29,12 +29,12 @@ class Socket implements Channel, Value {
    * as value for the parameter "host", you must enclose the IP in
    * square brackets.
    *
-   * @param   string host hostname or IP address
-   * @param   int port
-   * @param   resource socket default NULL
+   * @param  string|peer.net.InetAddress $host either hostname or an IP address
+   * @param  int $port
+   * @param  resource $socket default NULL
    */
   public function __construct($host, $port, $socket= null) {
-    $this->host= $host;
+    $this->host= (string)$host;
     $this->port= $port;
     $this->_sock= $socket;
     $this->context= stream_context_create();

src/main/php/peer/server/ForkingServer.class.php

@@ -10,7 +10,19 @@
  */
 class ForkingServer extends Server {
   use Pcntl;
-  
+
+  /**
+   * Constructor
+   *
+   * @param  string $addr
+   * @param  int $port
+   * @throws lang.IllegalAccessException
+   */
+  public function __construct($addr, $port) {
+    self::extension();
+    parent::__construct($addr, $port);
+  }
+
   /**
    * Service
    *

src/main/php/peer/server/Pcntl.class.php

@@ -4,9 +4,10 @@
 
 trait Pcntl {
 
-  static function __static() {
+  /** Verify PCNTL extension is loaded and useable */
+  private static function extension() {
     if (!extension_loaded('pcntl')) {
-      throw new IllegalAccessException('PCNTL extension not available');
+      throw new IllegalAccessException('PCNTL extension not loaded');
     }
 
     // https://stackoverflow.com/questions/16262854/pcntl-not-working-on-ubuntu-for-security-reasons

src/main/php/peer/server/PreforkingServer.class.php

@@ -21,12 +21,14 @@ class PreforkingServer extends Server implements Traceable {
   /**
    * Constructor
    *
-   * @param   string addr
-   * @param   int port
-   * @param   int count default 10 number of children to fork
-   * @param   int maxrequests default 1000 maxmimum # of requests per child
+   * @param  string $addr
+   * @param  int $port
+   * @param  int $count default 10 number of children to fork
+   * @param  int $maxrequests default 1000 maxmimum # of requests per child
+   * @throws lang.IllegalAccessException
    */
   public function __construct($addr, $port, $count= 10, $maxrequests= 1000) {
+    self::extension();
     parent::__construct($addr, $port);
     $this->count= (int)$count;
     $this->maxrequests= (int)$maxrequests;