Merge remote-tracking branch 'ratchet/master' into v0.5

CHANGELOG.md

@@ -12,6 +12,11 @@ CHANGELOG
   * BC: `Ratchet\Session\Storage\Proxy\VirtualSessionStorage` requires `Ratchet\Session\OptionsHandler`
   * `ComponentInterface::onError()` now accepts `Throwable` instead of `Exception`
 
+* 0.4.4 (2021-12-11)
+  * Correct and update dependencies for forward compatibility
+  * Added context for React Socket server to App
+  * Use non-deprecated Guzzle API calls
+
 * 0.4.3 (2020-06-04)
   * BF: Fixed interface acceptable regression in `App`
   * Update RFC6455 library with latest fixes

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2020 Chris Boden
+Copyright (c) 2011 Chris Boden
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

SECURITY.md

@@ -0,0 +1,8 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report security issues to:
+
+* Chris Boden [cboden@gmail.com](cboden@gmail.com)
+* Matt Bonneau [matt@bonneau.net](matt@bonneau.net)

composer.json

@@ -32,11 +32,12 @@
     }
   , "require": {
         "php": "^7.3 || ^8.0"
-      , "ratchet/rfc6455": "^0.3"
+      , "ratchet/rfc6455": "^0.3.1"
       , "react/socket": "^1.0 || ^0.8 || ^0.7 || ^0.6 || ^0.5"
-      , "guzzlehttp/psr7": "^1.0"
-      , "symfony/http-foundation": "^2.6|^3.0|^4.0|^5.0"
-      , "symfony/routing": "^2.6|^3.0|^4.0|^5.0"
+      , "react/event-loop": ">=0.4"
+      , "guzzlehttp/psr7": "^1.7|^2.0"
+      , "symfony/http-foundation": "^2.6|^3.0|^4.0|^5.0|^6.0"
+      , "symfony/routing": "^2.6|^3.0|^4.0|^5.0|^6.0"
     }
   , "require-dev": {
         "phpunit/phpunit": "^8.5",

src/Ratchet/App.php

@@ -61,8 +61,9 @@ class App {
      * @param int           $port       Port to listen on. If 80, assuming production, Flash on 843 otherwise expecting Flash to be proxied through 8843
      * @param string        $address    IP address to bind to. Default is localhost/proxy only. '0.0.0.0' for any machine.
      * @param LoopInterface $loop       Specific React\EventLoop to bind the application to. null will create one for you.
+     * @param array         $context
      */
-    public function __construct($httpHost = 'localhost', $port = 8080, $address = '127.0.0.1', LoopInterface $loop = null) {
+    public function __construct($httpHost = 'localhost', $port = 8080, $address = '127.0.0.1', LoopInterface $loop = null, $context = array()) {
         if (extension_loaded('xdebug') && getenv('RATCHET_DISABLE_XDEBUG_WARN') === false) {
             trigger_error('XDebug extension detected. Remember to disable this if performance testing or going live!', E_USER_WARNING);
         }
@@ -74,7 +75,7 @@ public function __construct($httpHost = 'localhost', $port = 8080, $address = '1
         $this->httpHost = $httpHost;
         $this->port = $port;
 
-        $socket = new Reactor($address . ':' . $port, $loop);
+        $socket = new Reactor($address . ':' . $port, $loop, $context);
 
         $this->routes  = new RouteCollection;
         $this->_server = new IoServer(new HttpServer(new Router(new UrlMatcher($this->routes, new RequestContext))), $socket, $loop);

src/Ratchet/ConnectionInterface.php

@@ -5,7 +5,7 @@
  * The version of Ratchet being used
  * @var string
  */
-const VERSION = 'Ratchet/0.4.3';
+const VERSION = 'Ratchet/0.4.4';
 
 /**
  * A proxy object representing a connection to the application

src/Ratchet/Http/CloseResponseTrait.php

@@ -1,7 +1,7 @@
 <?php
 namespace Ratchet\Http;
 use Ratchet\ConnectionInterface;
-use GuzzleHttp\Psr7 as gPsr;
+use GuzzleHttp\Psr7\Message;
 use GuzzleHttp\Psr7\Response;
 
 trait CloseResponseTrait {
@@ -16,7 +16,7 @@ private function close(ConnectionInterface $conn, $code = 400, array $additional
             'X-Powered-By' => \Ratchet\VERSION
         ], $additional_headers));
 
-        $conn->send(gPsr\str($response));
+        $conn->send(Message::toString($response));
         $conn->close();
     }
-}
+}

src/Ratchet/Http/HttpRequestParser.php

@@ -2,7 +2,7 @@
 namespace Ratchet\Http;
 use Ratchet\MessageInterface;
 use Ratchet\ConnectionInterface;
-use GuzzleHttp\Psr7 as gPsr;
+use GuzzleHttp\Psr7\Message;
 
 /**
  * This class receives streaming data from a client request
@@ -59,6 +59,6 @@ public function isEom($message) {
      * @return \Psr\Http\Message\RequestInterface
      */
     public function parse($headers) {
-        return gPsr\parse_request($headers);
+        return Message::parseRequest($headers);
     }
 }

src/Ratchet/Http/Router.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Routing\Matcher\UrlMatcherInterface;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use GuzzleHttp\Psr7 as gPsr;
+use GuzzleHttp\Psr7\Query;
 use Throwable;
 
 class Router implements HttpServerInterface {
@@ -62,9 +62,9 @@ public function onOpen(ConnectionInterface $conn, RequestInterface $request = nu
                 $parameters[$key] = $value;
             }
         }
-        $parameters = array_merge($parameters, gPsr\parse_query($uri->getQuery() ?: ''));
+        $parameters = array_merge($parameters, Query::parse($uri->getQuery() ?: ''));
 
-        $request = $request->withUri($uri->withQuery(gPsr\build_query($parameters)));
+        $request = $request->withUri($uri->withQuery(Query::build($parameters)));
 
         $conn->controller = $route['_controller'];
         $conn->controller->onOpen($conn, $request);

src/Ratchet/Session/Storage/VirtualSessionStorage.php

@@ -1,9 +1,10 @@
 <?php
 namespace Ratchet\Session\Storage;
 use Ratchet\Session\OptionsHandlerInterface;
+use Symfony\Component\HttpFoundation\Session\Storage\MetadataBag;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
 use Ratchet\Session\Storage\Proxy\VirtualProxy;
-use Ratchet\Session\Serialize\HandlerInterface;
+use Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy;
 
 class VirtualSessionStorage extends NativeSessionStorage {
     /**
@@ -14,12 +15,7 @@ class VirtualSessionStorage extends NativeSessionStorage {
     /** @var OptionsHandlerInterface */
     private $optionsHandler;
 
-    /**
-     * @param \SessionHandlerInterface                    $handler
-     * @param string                                      $sessionId The ID of the session to retrieve
-     * @param \Ratchet\Session\Serialize\HandlerInterface $serializer
-     */
-    public function __construct(\SessionHandlerInterface $handler, $sessionId, HandlerInterface $serializer, OptionsHandlerInterface $optionsHandler) {
+    public function __construct(array $options = [], AbstractProxy|\SessionHandlerInterface $handler = null, MetadataBag $metaBag = null) {
         $this->optionsHandler = $optionsHandler;
         $this->setSaveHandler($handler);
         $this->saveHandler->setId($sessionId);
@@ -30,7 +26,7 @@ public function __construct(\SessionHandlerInterface $handler, $sessionId, Handl
     /**
      * {@inheritdoc}
      */
-    public function start() {
+    public function start(): bool {
         if ($this->started && !$this->closed) {
             return true;
         }
@@ -56,8 +52,8 @@ public function start() {
     /**
      * {@inheritdoc}
      */
-    public function regenerate($destroy = false, $lifetime = null) {
-        // .. ?
+    public function regenerate(bool $destroy = false, int $lifetime = null): bool {
+        return true;
     }
 
     /**

src/Ratchet/Wamp/Topic.php

@@ -86,13 +86,15 @@ public function remove(ConnectionInterface $conn) {
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function getIterator() {
         return $this->subscribers;
     }
 
     /**
      * {@inheritdoc}
      */
+    #[\ReturnTypeWillChange]
     public function count() {
         return $this->subscribers->count();
     }

src/Ratchet/WebSocket/WsServer.php

@@ -14,7 +14,7 @@
 use Ratchet\RFC6455\Handshake\ServerNegotiator;
 use Ratchet\RFC6455\Handshake\RequestVerifier;
 use React\EventLoop\LoopInterface;
-use GuzzleHttp\Psr7 as gPsr;
+use GuzzleHttp\Psr7\Message;
 use Throwable;
 
 /**
@@ -117,7 +117,7 @@ public function onOpen(ConnectionInterface $conn, RequestInterface $request = nu
 
         $response = $this->handshakeNegotiator->handshake($request)->withHeader('X-Powered-By', \Ratchet\VERSION);
 
-        $conn->send(gPsr\str($response));
+        $conn->send(Message::toString($response));
 
         if (101 !== $response->getStatusCode()) {
             return $conn->close();