Merge pull request #227 from kalessil/master

SCA with Php Inspections (EA Extended)

Author: WyriHaximus

examples/32-upgrade-chat.php

@@ -53,7 +53,7 @@
 
     // send anything that is received to the whole channel
     $in->on('data', function ($data) use ($username, $chat) {
-        $data = trim(preg_replace('/[^\w\d \.\,\-\!\?]/u', '', $data));
+        $data = trim(preg_replace('/[^\w \.\,\-\!\?]/u', '', $data));
 
         $chat->write($username . ': ' . $data . PHP_EOL);
     });

src/RequestHeaderParser.php

@@ -149,13 +149,15 @@ private function parseRequest($headers)
         }
 
         // only support HTTP/1.1 and HTTP/1.0 requests
-        if ($request->getProtocolVersion() !== '1.1' && $request->getProtocolVersion() !== '1.0') {
+        $protocolVersion = $request->getProtocolVersion();
+        if ($protocolVersion !== '1.1' && $protocolVersion !== '1.0') {
             throw new \InvalidArgumentException('Received request with invalid protocol version', 505);
         }
 
         // ensure absolute-form request-target contains a valid URI
-        if (strpos($request->getRequestTarget(), '://') !== false && substr($request->getRequestTarget(), 0, 1) !== '/') {
-            $parts = parse_url($request->getRequestTarget());
+        $requestTarget = $request->getRequestTarget();
+        if (strpos($requestTarget, '://') !== false && substr($requestTarget, 0, 1) !== '/') {
+            $parts = parse_url($requestTarget);
 
             // make sure value contains valid host component (IP or hostname), but no fragment
             if (!isset($parts['scheme'], $parts['host']) || $parts['scheme'] !== 'http' || isset($parts['fragment'])) {

src/Server.php

@@ -168,7 +168,7 @@ public function handleConnection(ConnectionInterface $conn)
         $parser = new RequestHeaderParser($uriLocal, $uriRemote);
 
         $listener = array($parser, 'feed');
-        $parser->on('headers', function (RequestInterface $request, $bodyBuffer) use ($conn, $listener, $parser, $that) {
+        $parser->on('headers', function (RequestInterface $request, $bodyBuffer) use ($conn, $listener, $that) {
             // parsing request completed => stop feeding parser
             $conn->removeListener('data', $listener);
 

tests/FunctionalServerTest.php

@@ -443,7 +443,7 @@ public function testClosedStreamFromRequestHandlerWillSendEmptyBody()
         $socket = new Socket(0, $loop);
         $server->listen($socket);
 
-        $result = $connector->connect($socket->getAddress())->then(function (ConnectionInterface $conn) use ($loop) {
+        $result = $connector->connect($socket->getAddress())->then(function (ConnectionInterface $conn) {
             $conn->write("GET / HTTP/1.0\r\n\r\n");
 
             return Stream\buffer($conn);

tests/Middleware/RequestBodyParserMiddlewareTest.php

@@ -127,10 +127,7 @@ function (ServerRequestInterface $request) {
             }
         );
 
-        $this->assertSame(
-            null,
-            $parsedRequest->getParsedBody()
-        );
+        $this->assertNull($parsedRequest->getParsedBody());
         $this->assertSame('{"hello":"world"}', (string)$parsedRequest->getBody());
     }
 

tests/ServerTest.php

@@ -2634,8 +2634,6 @@ function ($data) use (&$buffer) {
         $server->listen($this->socket);
         $this->socket->emit('connection', array($this->connection));
 
-        $data = "GET / HTTP/1.0\r\n\r\n";
-
         $data = $this->createGetRequest();
 
         $this->connection->emit('data', array($data));
@@ -2665,8 +2663,6 @@ function ($data) use (&$buffer) {
         $server->listen($this->socket);
         $this->socket->emit('connection', array($this->connection));
 
-        $data = "GET / HTTP/1.0\r\n\r\n";
-
         $data = $this->createGetRequest();
 
         $this->connection->emit('data', array($data));
@@ -2698,8 +2694,6 @@ function ($data) use (&$buffer) {
         $server->listen($this->socket);
         $this->socket->emit('connection', array($this->connection));
 
-        $data = "GET / HTTP/1.0\r\n\r\n";
-
         $data = $this->createGetRequest();
 
         $this->connection->emit('data', array($data));
@@ -2731,8 +2725,6 @@ function ($data) use (&$buffer) {
         $server->listen($this->socket);
         $this->socket->emit('connection', array($this->connection));
 
-        $data = "GET / HTTP/1.0\r\n\r\n";
-
         $data = $this->createGetRequest();
 
         $this->connection->emit('data', array($data));
@@ -2761,8 +2753,6 @@ function ($data) use (&$buffer) {
         $server->listen($this->socket);
         $this->socket->emit('connection', array($this->connection));
 
-        $data = "GET / HTTP/1.0\r\n\r\n";
-
         $data = $this->createGetRequest();
 
         $this->connection->emit('data', array($data));
@@ -2795,8 +2785,6 @@ function ($data) use (&$buffer) {
         $server->listen($this->socket);
         $this->socket->emit('connection', array($this->connection));
 
-        $data = "GET / HTTP/1.0\r\n\r\n";
-
         $data = $this->createGetRequest();
 
         $this->connection->emit('data', array($data));
@@ -2830,8 +2818,6 @@ function ($data) use (&$buffer) {
         $server->listen($this->socket);
         $this->socket->emit('connection', array($this->connection));
 
-        $data = "GET / HTTP/1.0\r\n\r\n";
-
         $data = $this->createGetRequest();
 
         $this->connection->emit('data', array($data));
@@ -2915,8 +2901,6 @@ function ($data) use (&$buffer) {
         $server->listen($this->socket);
         $this->socket->emit('connection', array($this->connection));
 
-        $data = "GET / HTTP/1.0\r\n\r\n";
-
         $data = $this->createGetRequest();
 
         $this->connection->emit('data', array($data));