Completed
Branch 0.4-dev (d27253)
by Evgenij
03:26
created
src/Socket/AsyncSocketFactory.php 1 patch
Spacing   +6 added lines, -8 removed lines patch added patch discarded remove patch
@@ -74,19 +74,17 @@
 block discarded – undo
74 74
     {
75 75
         switch ($type) {
76 76
             case self::SOCKET_CLIENT:
77
-                $isPersistent  = isset($options[ self::SOCKET_OPTION_IS_PERSISTENT ]) &&
78
-                                 $options[ self::SOCKET_OPTION_IS_PERSISTENT ];
79
-                $persistentKey = isset($options[ self::SOCKET_OPTION_PERSISTENT_KEY ]) ?
80
-                    $options[ self::SOCKET_OPTION_PERSISTENT_KEY ] :
81
-                    null;
77
+                $isPersistent  = isset($options[self::SOCKET_OPTION_IS_PERSISTENT]) &&
78
+                                 $options[self::SOCKET_OPTION_IS_PERSISTENT];
79
+                $persistentKey = isset($options[self::SOCKET_OPTION_PERSISTENT_KEY]) ?
80
+                    $options[self::SOCKET_OPTION_PERSISTENT_KEY] : null;
82 81
 
83 82
                 return $isPersistent ?
84
-                    new PersistentClientSocket($persistentKey) :
85
-                    new ClientSocket();
83
+                    new PersistentClientSocket($persistentKey) : new ClientSocket();
86 84
             case self::SOCKET_SERVER:
87 85
                 return new ServerSocket();
88 86
             default:
89
-                throw new \InvalidArgumentException("Unexpected type {$type} used in " . __FUNCTION__);
87
+                throw new \InvalidArgumentException("Unexpected type {$type} used in ".__FUNCTION__);
90 88
         }
91 89
     }
92 90
 
Please login to merge, or discard this patch.
src/Socket/PersistentClientSocket.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
     protected function createSocketResource($address, $context)
41 41
     {
42 42
         $resource = stream_socket_client(
43
-            $address . ($this->persistentKey ? '/' . $this->persistentKey : ''),
43
+            $address.($this->persistentKey ? '/'.$this->persistentKey : ''),
44 44
             $errno,
45 45
             $errstr,
46 46
             null,
Please login to merge, or discard this patch.
src/Socket/Io/DatagramClientIo.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
         parent::__construct($socket, 0);
36 36
         if ($remoteAddress) {
37 37
             $components = parse_url($remoteAddress);
38
-            $this->remoteAddress = $components['host'] . ':' . $components['port'];
38
+            $this->remoteAddress = $components['host'].':'.$components['port'];
39 39
         }
40 40
     }
41 41
 
Please login to merge, or discard this patch.
src/RequestExecutor/LibEvent/LeBase.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -211,9 +211,9 @@
 block discarded – undo
211 211
     private function onEvent(LeEvent $event, $eventFlags)
212 212
     {
213 213
         $map = [
214
-            LeCallbackInterface::EVENT_READ    => [ EV_READ, RequestDescriptor::RDS_READ ],
215
-            LeCallbackInterface::EVENT_WRITE   => [ EV_WRITE, RequestDescriptor::RDS_WRITE ],
216
-            LeCallbackInterface::EVENT_TIMEOUT => [ EV_TIMEOUT, 0 ],
214
+            LeCallbackInterface::EVENT_READ    => [EV_READ, RequestDescriptor::RDS_READ],
215
+            LeCallbackInterface::EVENT_WRITE   => [EV_WRITE, RequestDescriptor::RDS_WRITE],
216
+            LeCallbackInterface::EVENT_TIMEOUT => [EV_TIMEOUT, 0],
217 217
         ];
218 218
 
219 219
         $descriptor = $event->getRequestDescriptor();
Please login to merge, or discard this patch.
src/Socket/AsyncSelector.php 1 patch
Spacing   +3 added lines, -4 removed lines patch added patch discarded remove patch
@@ -108,8 +108,7 @@  discard block
 block discarded – undo
108 108
      */
109 109
     private function calculateAttemptsCount($seconds, $usec)
110 110
     {
111
-        $result = $seconds !== null ? ceil(($seconds * 1E6 + $usec) / self::ATTEMPT_DELAY) :
112
-            self::ATTEMPT_COUNT_FOR_INFINITE_TIMEOUT;
111
+        $result = $seconds !== null ? ceil(($seconds * 1E6 + $usec) / self::ATTEMPT_DELAY) : self::ATTEMPT_COUNT_FOR_INFINITE_TIMEOUT;
113 112
         if ($result < self::ATTEMPT_COUNT_FOR_INFINITE_TIMEOUT) {
114 113
             $result = self::ATTEMPT_COUNT_FOR_INFINITE_TIMEOUT;
115 114
         }
@@ -328,8 +327,8 @@  discard block
 block discarded – undo
328 327
      */
329 328
     public function removeAllSocketOperations(StreamResourceInterface $streamResource)
330 329
     {
331
-        $opList = [ OperationInterface::OPERATION_READ,
332
-                    OperationInterface::OPERATION_WRITE  ];
330
+        $opList = [OperationInterface::OPERATION_READ,
331
+                    OperationInterface::OPERATION_WRITE];
333 332
 
334 333
         foreach ($opList as $op) {
335 334
             $this->removeSocketOperation($streamResource, $op);
Please login to merge, or discard this patch.
src/Socket/AbstractSocket.php 1 patch
Spacing   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -174,8 +174,7 @@  discard block
 block discarded – undo
174 174
                 '[#%s, %s]',
175 175
                 preg_replace('/Resource id #(\d+)/i', '$1', (string) $this->resource),
176 176
                 $this->remoteAddress
177
-            ) :
178
-            '[closed socket]';
177
+            ) : '[closed socket]';
179 178
     }
180 179
 
181 180
     /**
@@ -218,7 +217,7 @@  discard block
 block discarded – undo
218 217
             'unix' => self::SOCKET_TYPE_UNIX,
219 218
         ];
220 219
 
221
-        $regexp = '#^('. implode('|', array_keys($map)) . ')_socket$#';
220
+        $regexp = '#^('.implode('|', array_keys($map)).')_socket$#';
222 221
         foreach ($parts as $part) {
223 222
             if (preg_match($regexp, $part, $pockets)) {
224 223
                 return $map[$pockets[1]];
Please login to merge, or discard this patch.
src/RequestExecutor/Pipeline/AbstractOobHandler.php 1 patch
Spacing   +11 added lines, -12 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         $event  = new ReadEvent(
114 114
             $executor,
115 115
             $socket,
116
-            $meta[ RequestExecutorInterface::META_USER_CONTEXT ],
116
+            $meta[RequestExecutorInterface::META_USER_CONTEXT],
117 117
             $frame,
118 118
             true
119 119
         );
@@ -140,8 +140,7 @@  discard block
 block discarded – undo
140 140
         if (!$counter) {
141 141
             $meta    = $descriptor->getMetadata();
142 142
             $counter = new SpeedRateCounter($minRate, $duration);
143
-            $time    = $meta[RequestExecutorInterface::META_LAST_IO_START_TIME] ?:
144
-                        $meta[RequestExecutorInterface::META_CONNECTION_FINISH_TIME];
143
+            $time    = $meta[RequestExecutorInterface::META_LAST_IO_START_TIME] ?: $meta[RequestExecutorInterface::META_CONNECTION_FINISH_TIME];
145 144
             $counter->advance($time, 0);
146 145
             $descriptor->registerCounter($name, $counter);
147 146
         }
@@ -204,26 +203,26 @@  discard block
 block discarded – undo
204 203
         $map = [
205 204
             RequestDescriptor::COUNTER_RECV_MIN_RATE => [
206 205
                 'resetCounter' => RequestDescriptor::COUNTER_SEND_MIN_RATE,
207
-                'minSpeed'     => $meta[ RequestExecutorInterface::META_MIN_RECEIVE_SPEED ],
208
-                'duration'     => $meta[ RequestExecutorInterface::META_MIN_RECEIVE_SPEED_DURATION ],
206
+                'minSpeed'     => $meta[RequestExecutorInterface::META_MIN_RECEIVE_SPEED],
207
+                'duration'     => $meta[RequestExecutorInterface::META_MIN_RECEIVE_SPEED_DURATION],
209 208
                 'bytesCounter' => RequestExecutorInterface::META_BYTES_RECEIVED,
210 209
                 'speedCounter' => RequestExecutorInterface::META_RECEIVE_SPEED,
211
-                'exception'    => [ 'AsyncSockets\Exception\SlowSpeedTransferException', 'tooSlowDataReceiving' ],
210
+                'exception'    => ['AsyncSockets\Exception\SlowSpeedTransferException', 'tooSlowDataReceiving'],
212 211
             ],
213 212
             RequestDescriptor::COUNTER_SEND_MIN_RATE => [
214 213
                 'resetCounter' => RequestDescriptor::COUNTER_RECV_MIN_RATE,
215
-                'minSpeed'     => $meta[ RequestExecutorInterface::META_MIN_SEND_SPEED ],
216
-                'duration'     => $meta[ RequestExecutorInterface::META_MIN_SEND_SPEED_DURATION ],
214
+                'minSpeed'     => $meta[RequestExecutorInterface::META_MIN_SEND_SPEED],
215
+                'duration'     => $meta[RequestExecutorInterface::META_MIN_SEND_SPEED_DURATION],
217 216
                 'bytesCounter' => RequestExecutorInterface::META_BYTES_SENT,
218 217
                 'speedCounter' => RequestExecutorInterface::META_SEND_SPEED,
219
-                'exception'    => [ 'AsyncSockets\Exception\SlowSpeedTransferException', 'tooSlowDataSending' ],
218
+                'exception'    => ['AsyncSockets\Exception\SlowSpeedTransferException', 'tooSlowDataSending'],
220 219
             ],
221 220
         ];
222 221
 
223
-        if (!isset($map[ $name ])) {
224
-            throw new \LogicException('Can not process counter ' . $name . ' in transfer operation');
222
+        if (!isset($map[$name])) {
223
+            throw new \LogicException('Can not process counter '.$name.' in transfer operation');
225 224
         }
226 225
 
227
-        return $map[ $name ];
226
+        return $map[$name];
228 227
     }
229 228
 }
Please login to merge, or discard this patch.
src/Socket/Io/StreamedClientIo.php 1 patch
Spacing   +5 added lines, -7 removed lines patch added patch discarded remove patch
@@ -52,8 +52,7 @@  discard block
 block discarded – undo
52 52
         $this->verifySendResult('', stream_socket_sendto($resource, ''));
53 53
 
54 54
         $written = $isOutOfBand ?
55
-            $this->writeOobData($resource, $data) :
56
-            fwrite($resource, $data, strlen($data));
55
+            $this->writeOobData($resource, $data) : fwrite($resource, $data, strlen($data));
57 56
 
58 57
         $this->verifySendResult($data, $written);
59 58
 
@@ -74,7 +73,7 @@  discard block
 block discarded – undo
74 73
         if ($sendResult === false || $sendResult < 0) {
75 74
             throw new SendDataException(
76 75
                 $this->socket,
77
-                trim('Failed to send data. ' . $this->getLastPhpErrorMessage())
76
+                trim('Failed to send data. '.$this->getLastPhpErrorMessage())
78 77
             );
79 78
         }
80 79
 
@@ -148,7 +147,7 @@  discard block
 block discarded – undo
148 147
             if ($data === false) {
149 148
                 throw new RecvDataException(
150 149
                     $this->socket,
151
-                    trim('Failed to read data. ' . $this->getLastPhpErrorMessage())
150
+                    trim('Failed to read data. '.$this->getLastPhpErrorMessage())
152 151
                 );
153 152
             }
154 153
 
@@ -202,9 +201,8 @@  discard block
 block discarded – undo
202 201
     private function resolveReadAttempts(array $context, $currentAttempts)
203 202
     {
204 203
         return ($context['countCycles'] === 1 && empty($context['dataBeforeIo'])) ||
205
-               ($context['countCycles'] > 1   && $context['isStreamDataEmpty']) ?
206
-            $currentAttempts - 1 :
207
-            self::READ_ATTEMPTS;
204
+               ($context['countCycles'] > 1 && $context['isStreamDataEmpty']) ?
205
+            $currentAttempts - 1 : self::READ_ATTEMPTS;
208 206
 
209 207
     }
210 208
 
Please login to merge, or discard this patch.
src/Configuration/Configuration.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -95,11 +95,11 @@  discard block
 block discarded – undo
95 95
     {
96 96
         $options += $this->getDefaultOptions();
97 97
 
98
-        $this->connectTimeout   = (double) $options[ 'connectTimeout' ];
99
-        $this->ioTimeout        = (double) $options[ 'ioTimeout' ];
100
-        $this->preferredEngines = (array) $options[ 'preferredEngines' ];
98
+        $this->connectTimeout   = (double) $options['connectTimeout'];
99
+        $this->ioTimeout        = (double) $options['ioTimeout'];
100
+        $this->preferredEngines = (array) $options['preferredEngines'];
101 101
 
102
-        $this->streamContext = new StreamContext($options[ 'streamContext' ]);
102
+        $this->streamContext = new StreamContext($options['streamContext']);
103 103
         foreach (['minReceiveSpeed', 'minReceiveSpeedDuration', 'minSendSpeed', 'minSendSpeedDuration'] as $k) {
104 104
             $this->{$k} = $options[$k] !== null ? (int) $options[$k] : null;
105 105
         }
@@ -195,14 +195,14 @@  discard block
 block discarded – undo
195 195
         $result        = [];
196 196
         $socketTimeout = (double) ini_get('default_socket_timeout');
197 197
 
198
-        $result[ 'connectTimeout' ]          = $socketTimeout;
199
-        $result[ 'ioTimeout' ]               = $socketTimeout;
200
-        $result[ 'preferredEngines' ]        = [ 'libevent', 'native' ];
201
-        $result[ 'streamContext' ]           = null;
202
-        $result[ 'minReceiveSpeed' ]         = null;
203
-        $result[ 'minReceiveSpeedDuration' ] = null;
204
-        $result[ 'minSendSpeed' ]            = null;
205
-        $result[ 'minSendSpeedDuration' ]    = null;
198
+        $result['connectTimeout']          = $socketTimeout;
199
+        $result['ioTimeout']               = $socketTimeout;
200
+        $result['preferredEngines']        = ['libevent', 'native'];
201
+        $result['streamContext']           = null;
202
+        $result['minReceiveSpeed']         = null;
203
+        $result['minReceiveSpeedDuration'] = null;
204
+        $result['minSendSpeed']            = null;
205
+        $result['minSendSpeedDuration']    = null;
206 206
 
207 207
         return $result;
208 208
     }
Please login to merge, or discard this patch.