From 77c6d53a4dad77d082cbd13a4d405403f7e54946 Mon Sep 17 00:00:00 2001 From: Gerrit Drost Date: Wed, 4 Jun 2014 16:59:30 +0200 Subject: [PATCH] Made changes as suggested in pull request. Getters have been removed from IoServer and desired properties have been made public. --- src/Ratchet/App.php | 4 ++-- src/Ratchet/Server/IoServer.php | 20 +------------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/Ratchet/App.php b/src/Ratchet/App.php index e59c074..cc724fc 100644 --- a/src/Ratchet/App.php +++ b/src/Ratchet/App.php @@ -96,7 +96,7 @@ class App { * @return FlashPolicy */ public function getFlashPolicy() { - return $this->flashServer->getApp(); + return $this->flashServer->app; } /** @@ -105,7 +105,7 @@ class App { * @return \React\Socket\ServerInterface */ public function getFlashSocket() { - return $this->flashServer->getSocket(); + return $this->flashServer->socket; } /** diff --git a/src/Ratchet/Server/IoServer.php b/src/Ratchet/Server/IoServer.php index 587dcd5..160a1fc 100644 --- a/src/Ratchet/Server/IoServer.php +++ b/src/Ratchet/Server/IoServer.php @@ -33,7 +33,7 @@ class IoServer { * The socket server the Ratchet Application is run off of * @var \React\Socket\ServerInterface */ - protected $socket; + public $socket; /** * @param \Ratchet\MessageComponentInterface $app The Ratchet application stack to host @@ -59,24 +59,6 @@ class IoServer { $this->handlers[1] = array($this, 'handleEnd'); $this->handlers[2] = array($this, 'handleError'); } - - /** - * Returns the Ratchet App - * - * @return \Ratchet\MessageComponentInterface - */ - public function getApp() { - return $this->app; - } - - /** - * Returns the Socket - * - * @return \React\Socket\ServerInterface - */ - public function getSocket() { - return $this->socket; - } /** * @param \Ratchet\MessageComponentInterface $component The application that I/O will call when events are received