From 912671b49db5e2034e1ebb29cae6e26ea425619a Mon Sep 17 00:00:00 2001 From: David Dan Date: Tue, 3 Mar 2015 12:23:12 -0500 Subject: [PATCH] Don't announce subscriber_metaevents feature. It breaks crossbar and It's not fully supported anyway. --- src/Thruway/RealmManager.php | 31 ++++++++++++------------------- src/Thruway/Role/Subscriber.php | 2 +- 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/Thruway/RealmManager.php b/src/Thruway/RealmManager.php index f760c470..69cd1f41 100644 --- a/src/Thruway/RealmManager.php +++ b/src/Thruway/RealmManager.php @@ -51,23 +51,16 @@ class RealmManager */ public function __construct(ManagerInterface $manager = null) { - $this->realms = []; + $this->realms = []; + $this->manager = $manager ?: new ManagerDummy(); + $this->allowRealmAutocreate = true; + $this->defaultAuthorizationManager = new AllPermissiveAuthorizationManager(); - $this->setAllowRealmAutocreate(true); - $this->setDefaultAuthenticationManager(null); - - if ($manager === null) { - $manager = new ManagerDummy(); - } - - $this->manager = $manager; - - $this->setDefaultAuthorizationManager(new AllPermissiveAuthorizationManager()); } /** - * Get Realm bu realm name - * + * Get Realm by realm name + * * @param string $realmName * @throws \Thruway\Exception\InvalidRealmNameException * @throws \Thruway\Exception\RealmNotFoundException @@ -94,7 +87,7 @@ public function getRealm($realmName) /** * Add new realm - * + * * @param \Thruway\Realm $realm * @throws \Thruway\Exception\InvalidRealmNameException * @throws \Exception @@ -146,7 +139,7 @@ public static function validRealmName($name) /** * Get list realms - * + * * @return array */ public function getRealms() @@ -156,7 +149,7 @@ public function getRealms() /** * Set option allow auto create realm if not exist - * + * * @param boolean $allowRealmAutocreate */ public function setAllowRealmAutocreate($allowRealmAutocreate) @@ -166,7 +159,7 @@ public function setAllowRealmAutocreate($allowRealmAutocreate) /** * Get option allow auto create realm - * + * * @return boolean */ public function getAllowRealmAutocreate() @@ -176,7 +169,7 @@ public function getAllowRealmAutocreate() /** * Set default authentication manager - * + * * @param \Thruway\Authentication\AuthenticationManagerInterface $defaultAuthenticationManager */ public function setDefaultAuthenticationManager($defaultAuthenticationManager) @@ -186,7 +179,7 @@ public function setDefaultAuthenticationManager($defaultAuthenticationManager) /** * Get default authentication manager - * + * * @return \Thruway\Authentication\AuthenticationManagerInterface */ public function getDefaultAuthenticationManager() diff --git a/src/Thruway/Role/Subscriber.php b/src/Thruway/Role/Subscriber.php index 6b37eafb..85ae35a3 100644 --- a/src/Thruway/Role/Subscriber.php +++ b/src/Thruway/Role/Subscriber.php @@ -47,7 +47,7 @@ public function __construct() public function getFeatures() { $features = new \stdClass(); - $features->subscriber_metaevents = true; +// $features->subscriber_metaevents = true; return $features; }