Merge pull request #30 from clue-labs/visibility

Update property visbility according to EventSource specs

Author: SimonFrings

src/EventSource.php

@@ -52,11 +52,6 @@
  */
 class EventSource extends EventEmitter
 {
-    /**
-     * @var string (read-only) last event ID received
-     */
-    public $lastEventId = '';
-
     // ready state
     const CONNECTING = 0;
     const OPEN = 1;
@@ -67,18 +62,46 @@ class EventSource extends EventEmitter
      * @see self::CONNECTING
      * @see self::OPEN
      * @see self::CLOSED
+     * @psalm-readonly-allow-private-mutation
      */
     public $readyState = self::CLOSED;
 
     /**
      * @var string (read-only) URL
+     * @readonly
      */
     public $url;
 
+    /**
+     * @var string last event ID received
+     */
+    private $lastEventId = '';
+
+    /**
+     * @var LoopInterface
+     * @readonly
+     */
     private $loop;
+
+    /**
+     * @var Browser
+     * @readonly
+     */
     private $browser;
+
+    /**
+     * @var ?\React\Promise\PromiseInterface
+     */
     private $request;
+
+    /**
+     * @var ?\React\EventLoop\TimerInterface
+     */
     private $timer;
+
+    /**
+     * @var float
+     */
     private $reconnectTime = 3.0;
 
     /**

src/MessageEvent.php

@@ -43,22 +43,26 @@ public static function parse($data)
 
     /**
      * @var string
+     * @readonly
      */
     public $data = '';
 
     /**
      * @var ?string
+     * @readonly
      */
     public $lastEventId = null;
 
     /**
      * @var string
+     * @readonly
      */
     public $type = 'message';
 
     /**
      * @internal
      * @var ?int
+     * @readonly
      */
     public $retry;
 }

tests/EventSourceTest.php

@@ -544,7 +544,11 @@ public function testEmitMessageOnceWhenCallingCloseFromMessageHandlerFromEventSt
 
         $this->assertInstanceOf('Clue\React\EventSource\MessageEvent', $message);
         $this->assertEquals('1', $message->lastEventId);
-        $this->assertEquals('1', $es->lastEventId);
+
+        $ref = new \ReflectionProperty($es, 'lastEventId');
+        $ref->setAccessible(true);
+
+        $this->assertEquals('1', $ref->getValue($es));
     }
 
     public function testReconnectAfterStreamClosesUsesLastEventIdFromParsedEventStreamForNextRequest()