fructify / reload

src/Protocol/HttpProtocol.php

Doc Comments +3 added lines

@@ -80,6 +80,9 @@
         $conn->write($response);
     }
 
+    /**
+     * @param string $file
+     */
     protected function serveFile(SocketConnection $conn, $file)
     {
         if(($path = realpath($file)) === null){

Braces +18 added lines, -9 removed lines

@@ -20,14 +20,16 @@ 
 
     protected function initEvent(SocketServer $socket)
     {
-        $socket->on('connection', function(SocketConnection $conn){
+        $socket->on('connection', function(SocketConnection $conn)
+        {
             $this->onConnect($conn);
         });
     }
 
     protected function onConnect(SocketConnection $conn)
     {
-        $conn->on('data', function($data) use($conn){
+        $conn->on('data', function($data) use($conn)
+        {
             $this->onData($conn, $data);
         });
     }
@@ -40,7 +42,8 @@ 
 
     protected function handleRequest(SocketConnection $conn, Request $request)
     {
-        switch($request->getPathInfo()){
+        switch($request->getPathInfo())
+        {
             case '/livereload':
                 $this->initWebSocket($conn, $request);
                 break;
@@ -63,7 +66,8 @@ 
 
     protected function getRequestChangedFiles(Request $request)
     {
-        if(($files = $request->query->get('files')) != null){
+        if(($files = $request->query->get('files')) != null)
+        {
             return explode(',', $files);
         }
         $requestJson = json_decode($request->getContent(), true);
@@ -72,7 +76,8 @@ 
 
     protected function notifyChanged(SocketConnection $conn, Request $request)
     {
-        foreach($this->getRequestChangedFiles($request) as $file){
+        foreach($this->getRequestChangedFiles($request) as $file)
+        {
             $this->app->getOutput()->writeln(strftime('%T')." - info - Receive request reload $file", OutputInterface::VERBOSITY_VERBOSE);
             $this->app->reloadFile($file);
         }
@@ -82,7 +87,8 @@ 
 
     protected function serveFile(SocketConnection $conn, $file)
     {
-        if(($path = realpath($file)) === null){
+        if(($path = realpath($file)) === null)
+        {
             return ;
         }
         $content = file_get_contents($file);
@@ -101,7 +107,8 @@ 
     protected function doHttpHandshake($data)
     {
         $pos = strpos($data, "\r\n\r\n");
-        if($pos === false){
+        if($pos === false)
+        {
             return false;
         }
         $body = substr($data, $pos + 4);
@@ -119,8 +126,10 @@ 
     protected function parseHeaders($rawHeaders)
     {
         $headers = array();
-        foreach($rawHeaders as $headerLine){
-            if(($pos = strpos($headerLine, ':')) === false){
+        foreach($rawHeaders as $headerLine)
+        {
+            if(($pos = strpos($headerLine, ':')) === false)
+            {
                 continue;
             }
             $headers['HTTP_'.str_replace('-', '_', trim(strtoupper(substr($headerLine, 0, $pos))))] = trim(substr($headerLine, $pos + 1));

src/Protocol/WebSocket/Frame.php

Doc Comments +21 added lines

@@ -29,6 +29,7 @@ 
 
     /**
      *
+     * @param MessageQueue $data
      * @return Frame
      */
     public static function parse($data)
@@ -71,6 +72,9 @@ 
         return $frame;
     }
 
+    /**
+     * @param string $data
+     */
     protected function __construct($data = null, $final = true, $opcode = self::OP_TEXT)
     {
         $this->firstByte = ($final ? 0x80 : 0) + $opcode;
@@ -102,6 +106,9 @@ 
         $this->secondByte = $byte;
     }
 
+    /**
+     * @param string $data
+     */
     public function setData($data)
     {
         $this->data = '';
@@ -135,6 +142,9 @@ 
         return $maskingKey;
     }
 
+    /**
+     * @param string $maskingKey
+     */
     protected function applyMask($maskingKey, $payload = null)
     {
         $applied = '';
@@ -145,6 +155,9 @@ 
         return $applied;
     }
 
+    /**
+     * @param string $payload
+     */
     protected function maskPayload($payload)
     {
         if (!$this->isMask()) {
@@ -180,6 +193,9 @@ 
         }
     }
 
+    /**
+     * @param MessageQueue $encodedData
+     */
     public function decode($encodedData)
     {
         $this->isCoalesced = false;
@@ -252,6 +268,11 @@ 
         return pack('CC', $this->firstByte, $this->secondByte) . $this->extendedPayload . $this->maskPayload($this->data);
     }
 
+    /**
+     * @param string $data
+     * @param integer $secondByte
+     * @param string $extendedPayload
+     */
     protected function updatePayloadLength($data, &$secondByte, &$extendedPayload)
     {
         $secondByte &= 0x80;

Braces +39 added lines, -18 removed lines

@@ -33,12 +33,14 @@ 
      */
     public static function parse($data)
     {
-        if (!($data instanceof MessageQueue)) {
+        if (!($data instanceof MessageQueue))
+        {
             $data = new MessageQueue($data);
         }
         $frame = new static();
         $frameSize = $frame->decode($data);
-        if (!$frame->isCoalesced()) {
+        if (!$frame->isCoalesced())
+        {
             return $frameSize;
         }
         $data->shift($frameSize);
@@ -128,7 +130,8 @@ 
     public function generateMaskingKey()
     {
         $maskingKey = '';
-        for ($i = 0; $i < static::MASK_LENGTH; $i++) {
+        for ($i = 0; $i < static::MASK_LENGTH; $i++)
+        {
             $maskingKey .= pack('C', rand(0, 255));
         }
 
@@ -138,7 +141,8 @@ 
     protected function applyMask($maskingKey, $payload = null)
     {
         $applied = '';
-        for ($i = 0, $len = strlen($payload); $i < $len; $i++) {
+        for ($i = 0, $len = strlen($payload); $i < $len; $i++)
+        {
             $applied .= $payload[$i] ^ $maskingKey[$i % static::MASK_LENGTH];
         }
 
@@ -147,7 +151,8 @@ 
 
     protected function maskPayload($payload)
     {
-        if (!$this->isMask()) {
+        if (!$this->isMask())
+        {
             return $payload;
         }
         $maskingKey = $this->generateMaskingKey();
@@ -158,20 +163,27 @@ 
     public function getPayloadLength($encodedData)
     {
         $length = $this->secondByte & 0x7f;
-        if ($length < 126) {
+        if ($length < 126)
+        {
             return [$length, 0];
         }
 
-        if ($length == 126) { // with 2 bytes extended payload length
-            if (($packedPayloadLength = substr($encodedData, 2, 2)) === false) {
+        if ($length == 126)
+        {
+// with 2 bytes extended payload length
+            if (($packedPayloadLength = substr($encodedData, 2, 2)) === false)
+            {
                 return [0, 0];
             }
 
             return [unpack("n", $packedPayloadLength)[1] + 2, 2];
         }
 
-        if ($length == 127) { //with 8 bytes extended payload length
-            if (($packedPayloadLength = substr($encodedData, 2, 8)) === false) {
+        if ($length == 127)
+        {
+//with 8 bytes extended payload length
+            if (($packedPayloadLength = substr($encodedData, 2, 8)) === false)
+            {
                 return [0, 0];
             }
             $payloadLength = unpack("N2", $packedPayloadLength);
@@ -183,28 +195,33 @@ 
     public function decode($encodedData)
     {
         $this->isCoalesced = false;
-        if (strlen($encodedData) <= 2) {
+        if (strlen($encodedData) <= 2)
+        {
             return static::DECODE_STATUS_MORE_DATA;
         }
         $bytes = unpack("C2", $encodedData);
         $this->setFirstByte($bytes[1]);
         $this->setSecondByte($bytes[2]);
 
-        if (!$this->verifyPayload()) {
+        if (!$this->verifyPayload())
+        {
             return static::DECODE_STATUS_ERROR;
         }
         list($payloadLength, $extendedPayloadBytes) = $this->getPayloadLength($encodedData);
         $totalFramLength = 2 + $payloadLength;
-        if ($this->isMask()) {
+        if ($this->isMask())
+        {
             $totalFramLength += static::MASK_LENGTH;
         }
-        if ($payloadLength == 0 || strlen($encodedData) < $totalFramLength) {
+        if ($payloadLength == 0 || strlen($encodedData) < $totalFramLength)
+        {
             return static::DECODE_STATUS_MORE_DATA;
         }
         $maskingKey = substr($encodedData, 2 + $extendedPayloadBytes, static::MASK_LENGTH);
         $data = $this->applyMask($maskingKey, substr($encodedData, 2 + $extendedPayloadBytes + static::MASK_LENGTH));
         $this->setData($data);
-        if (strlen($encodedData) >= $totalFramLength) {
+        if (strlen($encodedData) >= $totalFramLength)
+        {
             $this->isCoalesced = true;
         }
 
@@ -233,7 +250,8 @@ 
 
     protected function verifyPayload()
     {
-        if ($this->getRSV1() && $this->getRSV2() && $this->getRSV3()) {
+        if ($this->getRSV1() && $this->getRSV2() && $this->getRSV3())
+        {
             return false;
         }
 
@@ -256,13 +274,16 @@ 
     {
         $secondByte &= 0x80;
         $size = strlen($data);
-        if ($size < 126) {
+        if ($size < 126)
+        {
             $secondByte |= $size;
 
             return;
         }
 
-        if ($size <= 65535) {  //use 2 bytes extended payload
+        if ($size <= 65535)
+        {
+//use 2 bytes extended payload
             $secondByte |= 126;
             $extendedPayload = pack("n", $size);
 

src/Protocol/WebSocket/MessageQueue.php

Braces +2 added lines, -1 removed lines

@@ -36,7 +36,8 @@
 
     public function shift($size)
     {
-        if ($size > strlen($this->data)) {
+        if ($size > strlen($this->data))
+        {
             return false;
         }
 

src/Protocol/WebSocket/WebSocket.php

Braces +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
             strtolower($request->headers->get('Upgrade')) != 'websocket' ||
             !$this->checkProtocolVrsion($request) ||
             !$this->checkSecKey($key)
-          ){
+          ) {
             return false;
         }
         $acceptKey = $this->generateAcceptKey($key);

src/Protocol/WebSocketProtocol.php

Braces +8 added lines, -4 removed lines

@@ -25,7 +25,8 @@ 
 
     protected function handshake(HttpFoundation\Request $request)
     {
-        if (!($handshakeResponse = $this->websocket->handshake($request))) {
+        if (!($handshakeResponse = $this->websocket->handshake($request)))
+        {
             $this->conn->write(new Response('bad protocol', 400), true);
             return;
         }
@@ -35,7 +36,8 @@ 
     protected function initEvent()
     {
         $this->websocket = new WebSocket\WebSocket();
-        $this->conn->on('data', function($data){
+        $this->conn->on('data', function($data)
+        {
             $this->onData($data);
         });
     }
@@ -43,10 +45,12 @@ 
     protected function onData($data)
     {
         $frame = $this->websocket->onMessage($data);
-        if(!($frame instanceof WebSocket\Frame)) {
+        if(!($frame instanceof WebSocket\Frame))
+        {
             return;
         }
-        if(($command = json_decode($frame->getData(), true)) === null){
+        if(($command = json_decode($frame->getData(), true)) === null)
+        {
             return;
         }
         $this->conn->emit('command', array($command));

src/Protocol/LivereloadProtocol.php

Braces +8 added lines, -4 removed lines

@@ -41,10 +41,12 @@ 
 
     protected function initEvent()
     {
-        $this->conn->on('command', function($command){
+        $this->conn->on('command', function($command)
+        {
             $this->dispatchCommand($command);
         });
-        $this->conn->on('close', function(){
+        $this->conn->on('close', function()
+        {
             $this->shutdown();
         });
     }
@@ -62,7 +64,8 @@ 
 
     protected function dispatchCommand($command)
     {
-        switch($command['command']){
+        switch($command['command'])
+        {
             case 'hello':
                 $this->processCommandHello($command);
                 break;
@@ -73,7 +76,8 @@ 
 
     protected function processCommandHello($command)
     {
-        if($this->connected){
+        if($this->connected)
+        {
            return;
         }
         $this->app->getOutput()->writeln(strftime('%T')." - info - Livereload protocol initialized.", OutputInterface::VERBOSITY_VERBOSE);

src/Command/RunCommand.php

Braces +6 added lines, -3 removed lines

@@ -30,7 +30,8 @@ 
         $output->writeln('Quit the server with CONTROL-C.');
         $output->writeln('');
         $app = new ServerApplication($host, $port);
-        if(!$noWatching){
+        if(!$noWatching)
+        {
             $config = $this->loadConfig($input, $output);
             $app->watching($config['period'], $config);
         }
@@ -41,10 +42,12 @@ 
     protected function loadConfig(InputInterface $input, OutputInterface $output)
     {
         $configFile = $input->getOption('config');
-        if($configFile === null){
+        if($configFile === null)
+        {
             $configFile = 'livereload.json';
         }
-        if(!file_exists($configFile)){
+        if(!file_exists($configFile))
+        {
             throw new \Exception("$configFile not found.");
         }
 

src/Command/InitCommand.php

Braces +2 added lines, -1 removed lines

@@ -22,7 +22,8 @@
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $forceRewrite = $input->getOption('force');
-        if(!$forceRewrite && file_exists('livereload.json')){
+        if(!$forceRewrite && file_exists('livereload.json'))
+        {
             $output->writeln("<error>livereload.json file exists.\nplease use --force to overwrite.</error>");
             return;
         }

src/Application/ServerApplication.php

Braces +22 added lines, -11 removed lines

@@ -52,23 +52,29 @@ 
     {
         $this->watchConfig = $config;
         $this->scanFiles();
-        $this->loop->addPeriodicTimer($time, function(){
+        $this->loop->addPeriodicTimer($time, function()
+        {
             $this->watchingFileChange();
         });
     }
 
     protected function scanFiles($scanNewFile = true)
     {
-        foreach($this->watchConfig['watch'] as $path => $file){
+        foreach($this->watchConfig['watch'] as $path => $file)
+        {
             $finder = new Finder();
-            try{
-                foreach($finder->in($path)->name($file)->followLinks() as $file){
-                    if($file->getRealPath() && !isset($this->watchingFiles[$file->getRealpath()])){
+            try
+            {
+                foreach($finder->in($path)->name($file)->followLinks() as $file)
+                {
+                    if($file->getRealPath() && !isset($this->watchingFiles[$file->getRealpath()]))
+                    {
                         $this->watchingFiles[$file->getRealpath()] = $scanNewFile?$file->getMTime():0;
                     }
                 }
             }
-            catch(\InvalidArgumentException $e){
+            catch(\InvalidArgumentException $e)
+            {
                 continue;
             }
         }
@@ -77,9 +83,11 @@ 
     protected function watchingFileChange()
     {
         $this->scanFiles(false);
-        foreach($this->watchingFiles as $file => $time){
+        foreach($this->watchingFiles as $file => $time)
+        {
             $mtime = @filemtime($file);
-            if($mtime && $mtime > $time){
+            if($mtime && $mtime > $time)
+            {
                 $this->watchingFiles[$file] = $mtime;
                 $this->reloadFile($file);
             }
@@ -100,7 +108,8 @@ 
 
     public function addClient(Protocol\LivereloadProtocol $client)
     {
-        if(!in_array($client, $this->clients)){
+        if(!in_array($client, $this->clients))
+        {
             $this->clients[] = $client;
         }
     }
@@ -108,7 +117,8 @@ 
     public function removeClient(Protocol\LivereloadProtocol $client)
     {
         $index = array_search($client, $this->clients, true);
-        if($index === false){
+        if($index === false)
+        {
             return;
         }
         unset($this->clients[$index]);
@@ -116,7 +126,8 @@ 
 
     public function reloadFile($file)
     {
-        foreach($this->clients as $client){
+        foreach($this->clients as $client)
+        {
             $client->reload($file, $this->config);
         }
     }