Fix cs

Author: joelwurtz

.gitignore

@@ -4,3 +4,7 @@ vendor/
 composer.lock
 phpspec.yml
 phpunit.xml
+/.php_cs.cache
+/tests/server/ssl/*.pem
+/tests/server/ssl/*.key
+/tests/server/ssl/*.req

.php_cs

@@ -1,13 +1,22 @@
 <?php
 
-/*
- * In order to make it work, fabpot/php-cs-fixer and sllh/php-cs-fixer-styleci-bridge must be installed globally
- * with composer.
- *
- * @link https://github.com/Soullivaneuh/php-cs-fixer-styleci-bridge
- * @link https://github.com/FriendsOfPHP/PHP-CS-Fixer
- */
+$config = PhpCsFixer\Config::create();
+$config->setRules([
+    '@PSR2' => true,
+    '@Symfony' => true,
+    'array_syntax' => [
+        'syntax' => 'short',
+    ],
+    'no_empty_phpdoc' => true,
+    'no_superfluous_phpdoc_tags' => true,
+]);
 
-use SLLH\StyleCIBridge\ConfigBridge;
+$finder = PhpCsFixer\Finder::create();
+$finder->in([
+    'src',
+    'tests'
+]);
 
-return ConfigBridge::create();
+$config->setFinder($finder);
+
+return $config;

.travis.yml

@@ -11,6 +11,8 @@ php:
     - 5.6
     - 7.0
     - 7.1
+    - 7.2
+    - 7.3
 
 env:
     global:

composer.json

@@ -16,6 +16,7 @@
         "php-http/discovery": "^1.0"
     },
     "require-dev": {
+        "friendsofphp/php-cs-fixer": "^2.2",
         "guzzlehttp/psr7": "^1.2",
         "php-http/client-integration-tests": "^0.6",
         "php-http/message": "^1.0",
@@ -35,6 +36,8 @@
         }
     },
     "scripts": {
+        "cs-check": "vendor/bin/php-cs-fixer fix --dry-run",
+        "cs-fix": "vendor/bin/php-cs-fixer fix",
         "test": "vendor/bin/phpunit",
         "test-ci": "vendor/bin/phpunit --coverage-clover build/coverage.xml"
     },

src/Client.php

@@ -161,7 +161,6 @@ protected function configure(array $config = [])
     /**
      * Return remote socket from the request.
      *
-     * @param RequestInterface $request
      *
      * @throws InvalidRequestException When no remote can be determined from the request
      *

src/RequestWriter.php

@@ -17,9 +17,8 @@ trait RequestWriter
     /**
      * Write a request to a socket.
      *
-     * @param resource         $socket
-     * @param RequestInterface $request
-     * @param int              $bufferSize
+     * @param resource $socket
+     * @param int      $bufferSize
      *
      * @throws BrokenPipeException
      */
@@ -37,9 +36,8 @@ protected function writeRequest($socket, RequestInterface $request, $bufferSize
     /**
      * Write Body of the request.
      *
-     * @param resource         $socket
-     * @param RequestInterface $request
-     * @param int              $bufferSize
+     * @param resource $socket
+     * @param int      $bufferSize
      *
      * @throws BrokenPipeException
      */
@@ -63,7 +61,6 @@ protected function writeBody($socket, RequestInterface $request, $bufferSize = 8
     /**
      * Produce the header of request as a string based on a PSR Request.
      *
-     * @param RequestInterface $request
      *
      * @return string
      */

src/ResponseReader.php

@@ -25,8 +25,7 @@ trait ResponseReader
     /**
      * Read a response from a socket.
      *
-     * @param RequestInterface $request
-     * @param resource         $socket
+     * @param resource $socket
      *
      * @throws TimeoutException    When the socket timed out
      * @throws BrokenPipeException When the response cannot be read
@@ -89,7 +88,6 @@ protected function readResponse(RequestInterface $request, $socket)
      * Create the stream.
      *
      * @param $socket
-     * @param ResponseInterface $response
      *
      * @return Stream
      */

tests/BaseTestCase.php

@@ -10,14 +10,14 @@ class BaseTestCase extends TestCase
 
     public function startServer($name)
     {
-        $filename = __DIR__ . '/server/' . $name . '.php';
-        $pipes    = [];
+        $filename = __DIR__.'/server/'.$name.'.php';
+        $pipes = [];
 
         if (!Semaphore::acquire()) {
             $this->fail('Could not connect to server');
         }
 
-        $this->servers[$name] = proc_open('php '. $filename, [], $pipes);
+        $this->servers[$name] = proc_open('php '.$filename, [], $pipes);
         sleep(1);
     }
 

tests/Semaphore.php

@@ -23,7 +23,7 @@ public static function acquire()
                 return false;
             }
         }
-        self::$openConnections++;
+        ++self::$openConnections;
 
         return true;
     }
@@ -35,6 +35,6 @@ public static function release()
     {
         // Do no be too quick
         usleep(500000);
-        self::$openConnections--;
+        --self::$openConnections;
     }
 }

tests/SocketClientFeatureTest.php

@@ -3,7 +3,6 @@
 namespace Http\Client\Socket\Tests;
 
 use Http\Client\Tests\HttpFeatureTest;
-use Http\Message\MessageFactory\GuzzleMessageFactory;
 use Http\Client\Socket\Client as SocketHttpClient;
 
 class SocketClientFeatureTest extends HttpFeatureTest