From f84129642b348ad4cb7f798d5517a0b286b80feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCck?= Date: Thu, 16 Feb 2017 11:40:12 +0100 Subject: [PATCH] Mark all connector classes as final Classes should be used via composition rather than extension. This reduces our API footprint and avoids future BC breaks by avoiding exposing its internal assumptions. --- src/Connector.php | 2 +- src/DnsConnector.php | 3 +-- src/SecureConnector.php | 3 +-- src/TcpConnector.php | 4 +--- src/TimeoutConnector.php | 5 +---- src/UnixConnector.php | 2 +- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/Connector.php b/src/Connector.php index a1b79d2..4a07c81 100644 --- a/src/Connector.php +++ b/src/Connector.php @@ -15,7 +15,7 @@ * @see DnsConnector for the newer replacement * @see ConnectorInterface for the base interface */ -class Connector implements ConnectorInterface +final class Connector implements ConnectorInterface { private $connector; diff --git a/src/DnsConnector.php b/src/DnsConnector.php index b40f032..a91329f 100644 --- a/src/DnsConnector.php +++ b/src/DnsConnector.php @@ -3,11 +3,10 @@ namespace React\SocketClient; use React\Dns\Resolver\Resolver; -use React\Stream\Stream; use React\Promise; use React\Promise\CancellablePromiseInterface; -class DnsConnector implements ConnectorInterface +final class DnsConnector implements ConnectorInterface { private $connector; private $resolver; diff --git a/src/SecureConnector.php b/src/SecureConnector.php index 1704674..2dee858 100644 --- a/src/SecureConnector.php +++ b/src/SecureConnector.php @@ -5,9 +5,8 @@ use React\EventLoop\LoopInterface; use React\Stream\Stream; use React\Promise; -use React\Promise\CancellablePromiseInterface; -class SecureConnector implements ConnectorInterface +final class SecureConnector implements ConnectorInterface { private $connector; private $streamEncryption; diff --git a/src/TcpConnector.php b/src/TcpConnector.php index 8e4890d..9b29852 100644 --- a/src/TcpConnector.php +++ b/src/TcpConnector.php @@ -3,12 +3,10 @@ namespace React\SocketClient; use React\EventLoop\LoopInterface; -use React\Dns\Resolver\Resolver; use React\Stream\Stream; use React\Promise; -use React\Promise\Deferred; -class TcpConnector implements ConnectorInterface +final class TcpConnector implements ConnectorInterface { private $loop; private $context; diff --git a/src/TimeoutConnector.php b/src/TimeoutConnector.php index f2bd25c..67e4f9f 100644 --- a/src/TimeoutConnector.php +++ b/src/TimeoutConnector.php @@ -5,11 +5,8 @@ use React\SocketClient\ConnectorInterface; use React\EventLoop\LoopInterface; use React\Promise\Timer; -use React\Stream\Stream; -use React\Promise\Promise; -use React\Promise\CancellablePromiseInterface; -class TimeoutConnector implements ConnectorInterface +final class TimeoutConnector implements ConnectorInterface { private $connector; private $timeout; diff --git a/src/UnixConnector.php b/src/UnixConnector.php index 44d225a..9da4590 100644 --- a/src/UnixConnector.php +++ b/src/UnixConnector.php @@ -14,7 +14,7 @@ * Unix domain sockets use atomic operations, so we can as well emulate * async behavior. */ -class UnixConnector implements ConnectorInterface +final class UnixConnector implements ConnectorInterface { private $loop;