Merge pull request #2245 from zazabe/fix-stream-media

Remove unreliable hasStreamPublish method from StreamChannel_Media
cargomedia · Jul 7, 2016 · b8dd3ef · b8dd3ef
2 parents 2c2bb6f + 91b15d2
commit b8dd3ef
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/library/CM/MediaStreams/Service.php b/library/CM/MediaStreams/Service.php
@@ -27,9 +27,7 @@ public function checkStreams() {
             if ($streamChannel instanceof CM_StreamChannel_DisallowInterface) {
                 /** @var CM_Model_StreamChannel_Media|CM_StreamChannel_DisallowInterface $streamChannel */
                 $streamChannelIsValid = $streamChannel->isValid();
-                if ($streamChannel->hasStreamPublish()) {
-                    /** @var CM_Model_Stream_Publish $streamPublish */
-                    $streamPublish = $streamChannel->getStreamPublish();
+                if ($streamPublish = $streamChannel->findStreamPublish()) {
                     if (!$streamChannelIsValid || !$this->_isPublishAllowed($streamPublish)) {
                         $this->_stopStream($streamPublish);
                     }

diff --git a/library/CM/Model/StreamChannel/Media.php b/library/CM/Model/StreamChannel/Media.php
@@ -30,22 +30,30 @@ public function getMediaId() {
         return $mediaId;
     }
 
+    /**
+     * @return CM_Model_Stream_Publish|null
+     */
+    public function findStreamPublish() {
+        return $this->getStreamPublishs()->getItem(0);
+    }
+
     /**
      * @return CM_Model_Stream_Publish
      * @throws CM_Exception_Invalid
      */
     public function getStreamPublish() {
-        if (!$this->hasStreamPublish()) {
+        $publish = $this->findStreamPublish();
+        if (null === $publish) {
             throw new CM_Exception_Invalid('StreamChannel `' . $this->getId() . '` has no StreamPublish.');
         }
-        return $this->getStreamPublishs()->getItem(0);
+        return $publish;
     }
 
     /**
-     * @return boolean
+     * @return bool
      */
     public function hasStreamPublish() {
-        return (boolean) $this->getStreamPublishs()->getCount();
+        return null !== $this->findStreamPublish();
     }
 
     /**
@@ -57,8 +65,8 @@ public function getServerId() {
 
     public function jsonSerialize() {
         $array = parent::jsonSerialize();
-        if ($this->hasStreamPublish()) {
-            $array['user'] = $this->getStreamPublish()->getUser();
+        if ($publish = $this->findStreamPublish()) {
+            $array['user'] = $publish->getUser();
         }
         return $array;
     }

diff --git a/tests/library/CM/MediaStreams/ServiceTest.php b/tests/library/CM/MediaStreams/ServiceTest.php
@@ -8,8 +8,7 @@ public function testCheckStreamsInvalidStreamChannel() {
 
         $streamChannel = $this->mockClass('CM_Model_StreamChannel_Media', ['CM_StreamChannel_DisallowInterface'])->newInstanceWithoutConstructor();
         $streamChannel->mockMethod('isValid')->set(false);
-        $streamChannel->mockMethod('hasStreamPublish')->set(true);
-        $streamChannel->mockMethod('getStreamPublish')->set($streamPublish);
+        $streamChannel->mockMethod('findStreamPublish')->set($streamPublish);
         $streamChannel->mockMethod('getStreamSubscribes')->set([$streamSubscribe]);
 
         $streamRepository = $this->mockClass('CM_MediaStreams_StreamRepository')->newInstanceWithoutConstructor();
@@ -37,8 +36,7 @@ public function testCheckStreamsValidStreamChannel() {
 
         $streamChannel = $this->mockClass('CM_Model_StreamChannel_Media', ['CM_StreamChannel_DisallowInterface'])->newInstanceWithoutConstructor();
         $streamChannel->mockMethod('isValid')->set(true);
-        $streamChannel->mockMethod('hasStreamPublish')->set(true);
-        $streamChannel->mockMethod('getStreamPublish')->set($streamPublish);
+        $streamChannel->mockMethod('findStreamPublish')->set($streamPublish);
         $streamChannel->mockMethod('getStreamSubscribes')->set([$streamSubscribe]);
 
         $streamRepository = $this->mockClass('CM_MediaStreams_StreamRepository')->newInstanceWithoutConstructor();
@@ -75,8 +73,7 @@ public function testCheckStreamsNoConnectionsDisallowed() {
 
         $streamChannel = $this->mockClass('CM_Model_StreamChannel_Media')->newInstanceWithoutConstructor();
         $isValidMethod = $streamChannel->mockMethod('isValid');
-        $streamChannel->mockMethod('hasStreamPublish')->set(true);
-        $streamChannel->mockMethod('getStreamPublish')->set($streamPublish);
+        $streamChannel->mockMethod('findStreamPublish')->set($streamPublish);
         $streamChannel->mockMethod('getStreamSubscribes')->set([$streamSubscribe]);
 
         $streamRepository = $this->mockClass('CM_MediaStreams_StreamRepository')->newInstanceWithoutConstructor();