Rename OptionsHandler to OptionsHandlerInterface

ratchetphp · May 21, 2020 · b6f8e2d · b6f8e2d · simPod · May 21, 2020
1 parent d29903c
commit b6f8e2d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/src/Ratchet/Session/OptionsHandler.php → ...tchet/Session/OptionsHandlerInterface.php b/src/Ratchet/Session/OptionsHandler.php → ...tchet/Session/OptionsHandlerInterface.php
@@ -2,7 +2,7 @@
 
 namespace Ratchet\Session;
 
-interface OptionsHandler
+interface OptionsHandlerInterface
 {
     public function get(string $name) : string;
 

diff --git a/src/Ratchet/Session/PhpOptionsHandler.php b/src/Ratchet/Session/PhpOptionsHandler.php
@@ -5,7 +5,7 @@
 use function ini_get;
 use function ini_set;
 
-final class PhpOptionsHandler implements OptionsHandler
+final class PhpOptionsHandler implements OptionsHandlerInterface
 {
     public function get(string $name) : string
     {

diff --git a/src/Ratchet/Session/SessionProvider.php b/src/Ratchet/Session/SessionProvider.php
@@ -3,7 +3,7 @@
 use Ratchet\ConnectionInterface;
 use Ratchet\Http\HttpServerInterface;
 use Psr\Http\Message\RequestInterface;
-use Ratchet\Session\OptionsHandler;
+use Ratchet\Session\OptionsHandlerInterface;
 use Ratchet\Session\PhpOptionsHandler;
 use Ratchet\Session\Storage\VirtualSessionStorage;
 use Ratchet\Session\Serialize\HandlerInterface;
@@ -39,14 +39,14 @@ class SessionProvider implements HttpServerInterface {
      */
     protected $_serializer;
 
-    /** @var OptionsHandler */
+    /** @var OptionsHandlerInterface */
     private $optionsHandler;
 
     /**
      * @param array<string, mixed> $options
      * @throws \RuntimeException
      */
-    public function __construct(HttpServerInterface $app, \SessionHandlerInterface $handler, array $options = array(), HandlerInterface $serializer = null, ?OptionsHandler $optionsHandler = null) {
+    public function __construct(HttpServerInterface $app, \SessionHandlerInterface $handler, array $options = array(), HandlerInterface $serializer = null, ?OptionsHandlerInterface $optionsHandler = null) {
         $this->_app           = $app;
         $this->_handler       = $handler;
         $this->_null          = new NullSessionHandler;

diff --git a/src/Ratchet/Session/Storage/Proxy/VirtualProxy.php b/src/Ratchet/Session/Storage/Proxy/VirtualProxy.php
@@ -1,7 +1,7 @@
 <?php
 namespace Ratchet\Session\Storage\Proxy;
 
-use Ratchet\Session\OptionsHandler;
+use Ratchet\Session\OptionsHandlerInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
 
 class VirtualProxy extends SessionHandlerProxy {
@@ -18,7 +18,7 @@ class VirtualProxy extends SessionHandlerProxy {
     /**
      * {@inheritdoc}
      */
-    public function __construct(\SessionHandlerInterface $handler, OptionsHandler $optionsHandler) {
+    public function __construct(\SessionHandlerInterface $handler, OptionsHandlerInterface $optionsHandler) {
         parent::__construct($handler);
 
         $this->saveHandlerName = 'user';

diff --git a/src/Ratchet/Session/Storage/VirtualSessionStorage.php b/src/Ratchet/Session/Storage/VirtualSessionStorage.php
@@ -1,6 +1,6 @@
 <?php
 namespace Ratchet\Session\Storage;
-use Ratchet\Session\OptionsHandler;
+use Ratchet\Session\OptionsHandlerInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
 use Ratchet\Session\Storage\Proxy\VirtualProxy;
 use Ratchet\Session\Serialize\HandlerInterface;
@@ -11,15 +11,15 @@ class VirtualSessionStorage extends NativeSessionStorage {
      */
     protected $_serializer;
 
-    /** @var OptionsHandler */
+    /** @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, OptionsHandler $optionsHandler) {
+    public function __construct(\SessionHandlerInterface $handler, $sessionId, HandlerInterface $serializer, OptionsHandlerInterface $optionsHandler) {
         $this->optionsHandler = $optionsHandler;
         $this->setSaveHandler($handler);
         $this->saveHandler->setId($sessionId);

diff --git a/tests/Session/InMemoryOptionsHandler.php b/tests/Session/InMemoryOptionsHandler.php
@@ -2,9 +2,9 @@
 
 namespace Ratchet\Tests\Session;
 
-use Ratchet\Session\OptionsHandler;
+use Ratchet\Session\OptionsHandlerInterface;
 
-final class InMemoryOptionsHandler implements OptionsHandler
+final class InMemoryOptionsHandler implements OptionsHandlerInterface
 {
     /** @var array<string, mixed> */
     private $options;