Remove unused discovery, add CS fixing

Author: sagikazarmark

.php_cs

@@ -0,0 +1,13 @@
+<?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
+ */
+
+use SLLH\StyleCIBridge\ConfigBridge;
+
+return ConfigBridge::create();

.styleci.yml

@@ -0,0 +1,10 @@
+preset: symfony
+
+finder:
+    exclude:
+        - "spec"
+    path:
+        - "src"
+
+enabled:
+    - short_array_syntax

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 
 
+## 0.4.0 - 2016-03-02
+
+### Removed
+
+- Discovery dependency
+
+
 ## 0.3.1 - 2016-02-11
 
 ### Changed

composer.json

@@ -18,7 +18,6 @@
         "php": ">=5.4",
         "phpunit/phpunit": "^4.5",
         "php-http/httplug": "^1.0",
-        "php-http/discovery": "~0.7",
         "php-http/message": "^1.0",
         "guzzlehttp/psr7": "^1.0",
         "th3n3rd/cartesian-product": "^0.3"
@@ -33,9 +32,7 @@
     ],
     "extra": {
         "branch-alias": {
-            "dev-master": "0.4-dev"
+            "dev-master": "0.5-dev"
         }
-    },
-    "prefer-stable": true,
-    "minimum-stability": "beta"
+    }
 }

src/FeatureTestListener.php

@@ -18,24 +18,24 @@ public function startTest(\PHPUnit_Framework_Test $test)
             $feature = $feature[0];
         }
 
-        echo sprintf("%-40.s : ", $feature);
+        echo sprintf('%-40.s : ', $feature);
     }
 
     public function endTest(\PHPUnit_Framework_Test $test, $time)
     {
         if (!$this->lastTestFailed) {
-            echo $this->formatWithColor('fg-green', "Supported"). "\n";
+            echo $this->formatWithColor('fg-green', 'Supported')."\n";
         } else {
-            echo $this->formatWithColor('fg-red', "Not supported"). "\n";
+            echo $this->formatWithColor('fg-red', 'Not supported')."\n";
         }
 
         $this->lastTestFailed = false;
     }
 
     private function extractFeature(\PHPUnit_Framework_Test $test)
     {
-        $class      = get_class($test);
-        $method     = $test->getName();
+        $class = get_class($test);
+        $method = $test->getName();
         $reflection = new \ReflectionMethod($class, $method);
 
         return $this->parseDocBlock($reflection->getDocComment(), '@feature');
@@ -50,7 +50,7 @@ private function parseDocBlock($doc_block, $tag)
         }
 
         $regex = "/{$tag} (.*)(\\r\\n|\\r|\\n)/U";
-        preg_match_all( $regex, $doc_block, $matches );
+        preg_match_all($regex, $doc_block, $matches);
 
         if (empty($matches[1])) {
             return [];
@@ -59,7 +59,7 @@ private function parseDocBlock($doc_block, $tag)
         $matches = $matches[1];
 
         foreach ($matches as $ix => $match) {
-            $matches[ $ix ] = trim( $match );
+            $matches[ $ix ] = trim($match);
         }
 
         return $matches;

src/HttpAsyncClientTest.php

@@ -44,7 +44,7 @@ public function testSuccessiveCallMustUseResponseInterface()
         $this->assertInstanceOf('Http\Promise\Promise', $promise);
 
         $response = null;
-        $promise->then()->then()->then(function ($r) use(&$response) {
+        $promise->then()->then()->then(function ($r) use (&$response) {
             $response = $r;
 
             return $response;
@@ -71,8 +71,8 @@ public function testSuccessiveInvalidCallMustUseException()
         $this->assertInstanceOf('Http\Promise\Promise', $promise);
 
         $exception = null;
-        $response  = null;
-        $promise->then()->then()->then(function ($r) use(&$response) {
+        $response = null;
+        $promise->then()->then()->then(function ($r) use (&$response) {
             $response = $r;
 
             return $response;
@@ -96,7 +96,7 @@ public function testSuccessiveInvalidCallMustUseException()
     public function testAsyncSendRequest($method, $uri, array $headers, $body)
     {
         if ($body != null) {
-            $headers['Content-Length'] = (string)strlen($body);
+            $headers['Content-Length'] = (string) strlen($body);
         }
 
         $request = self::$messageFactory->createRequest(
@@ -110,7 +110,7 @@ public function testAsyncSendRequest($method, $uri, array $headers, $body)
         $this->assertInstanceOf('Http\Promise\Promise', $promise);
 
         $response = null;
-        $promise->then(function ($r) use(&$response) {
+        $promise->then(function ($r) use (&$response) {
             $response = $r;
 
             return $response;
@@ -138,11 +138,11 @@ public function testSendAsyncWithInvalidUri()
         );
 
         $exception = null;
-        $response  = null;
-        $promise   = $this->httpAsyncClient->sendAsyncRequest($request);
+        $response = null;
+        $promise = $this->httpAsyncClient->sendAsyncRequest($request);
         $this->assertInstanceOf('Http\Promise\Promise', $promise);
 
-        $promise->then(function ($r) use(&$response) {
+        $promise->then(function ($r) use (&$response) {
             $response = $r;
 
             return $response;
@@ -169,7 +169,7 @@ public function testSendAsyncRequestWithOutcome($uriAndOutcome, $protocolVersion
         }
 
         if ($body != null) {
-            $headers['Content-Length'] = (string)strlen($body);
+            $headers['Content-Length'] = (string) strlen($body);
         }
 
         $request = self::$messageFactory->createRequest(
@@ -184,8 +184,8 @@ public function testSendAsyncRequestWithOutcome($uriAndOutcome, $protocolVersion
         $outcome['protocolVersion'] = $protocolVersion;
 
         $response = null;
-        $promise  = $this->httpAsyncClient->sendAsyncRequest($request);
-        $promise->then(function ($r) use(&$response) {
+        $promise = $this->httpAsyncClient->sendAsyncRequest($request);
+        $promise->then(function ($r) use (&$response) {
             $response = $r;
 
             return $response;

src/HttpBaseTest.php

@@ -2,8 +2,8 @@
 
 namespace Http\Client\Tests;
 
-use Http\Discovery\MessageFactoryDiscovery;
 use Http\Message\MessageFactory;
+use Http\Message\MessageFactory\GuzzleMessageFactory;
 use Nerd\CartesianProduct\CartesianProduct;
 use Psr\Http\Message\ResponseInterface;
 
@@ -24,10 +24,10 @@ abstract class HttpBaseTest extends \PHPUnit_Framework_TestCase
      */
     protected $defaultOptions = [
         'protocolVersion' => '1.1',
-        'statusCode'      => 200,
-        'reasonPhrase'    => 'OK',
-        'headers'         => ['Content-Type' => 'text/html'],
-        'body'            => 'Ok',
+        'statusCode' => 200,
+        'reasonPhrase' => 'OK',
+        'headers' => ['Content-Type' => 'text/html'],
+        'body' => 'Ok',
     ];
 
     /**
@@ -36,7 +36,7 @@ abstract class HttpBaseTest extends \PHPUnit_Framework_TestCase
     protected $defaultHeaders = [
         'Connection' => 'close',
         'User-Agent' => 'PHP HTTP Adapter',
-        'Content-Length' => '0'
+        'Content-Length' => '0',
     ];
 
     /**
@@ -45,7 +45,7 @@ abstract class HttpBaseTest extends \PHPUnit_Framework_TestCase
     public static function setUpBeforeClass()
     {
         self::$logPath = PHPUnitUtility::getFile(true, 'php-http-adapter.log');
-        self::$messageFactory = MessageFactoryDiscovery::find();
+        self::$messageFactory = new GuzzleMessageFactory();
     }
 
     /**
@@ -65,9 +65,9 @@ public function requestProvider()
     {
         $sets = [
             'methods' => $this->getMethods(),
-            'uris'    => [$this->getUri()],
+            'uris' => [$this->getUri()],
             'headers' => $this->getHeaders(),
-            'body'    => $this->getBodies(),
+            'body' => $this->getBodies(),
         ];
 
         $cartesianProduct = new CartesianProduct($sets);
@@ -81,10 +81,10 @@ public function requestProvider()
     public function requestWithOutcomeProvider()
     {
         $sets = [
-            'urisAndOutcomes'  => $this->getUrisAndOutcomes(),
+            'urisAndOutcomes' => $this->getUrisAndOutcomes(),
             'protocolVersions' => $this->getProtocolVersions(),
-            'headers'          => $this->getHeaders(),
-            'body'             => $this->getBodies(),
+            'headers' => $this->getHeaders(),
+            'body' => $this->getBodies(),
         ];
 
         $cartesianProduct = new CartesianProduct($sets);
@@ -137,23 +137,23 @@ private function getUrisAndOutcomes()
             [
                 $this->getUri(['client_error' => true]),
                 [
-                    'statusCode'   => 400,
+                    'statusCode' => 400,
                     'reasonPhrase' => 'Bad Request',
                 ],
             ],
             [
                 $this->getUri(['server_error' => true]),
                 [
-                    'statusCode'   => 500,
+                    'statusCode' => 500,
                     'reasonPhrase' => 'Internal Server Error',
                 ],
             ],
             [
                 $this->getUri(['redirect' => true]),
                 [
-                    'statusCode'   => 302,
+                    'statusCode' => 302,
                     'reasonPhrase' => 'Found',
-                    'body'         => 'Redirect',
+                    'body' => 'Redirect',
                 ],
             ],
         ];

src/HttpClientTest.php

@@ -42,7 +42,7 @@ abstract protected function createHttpAdapter();
     public function testSendRequest($method, $uri, array $headers, $body)
     {
         if ($body != null) {
-            $headers['Content-Length'] = (string)strlen($body);
+            $headers['Content-Length'] = (string) strlen($body);
         }
 
         $request = self::$messageFactory->createRequest(
@@ -74,7 +74,7 @@ public function testSendRequestWithOutcome($uriAndOutcome, $protocolVersion, arr
         }
 
         if ($body != null) {
-            $headers['Content-Length'] = (string)strlen($body);
+            $headers['Content-Length'] = (string) strlen($body);
         }
 
         $request = self::$messageFactory->createRequest(

src/HttpFeatureTest.php

@@ -3,8 +3,8 @@
 namespace Http\Client\Tests;
 
 use Http\Client\HttpClient;
-use Http\Discovery\MessageFactoryDiscovery;
 use Http\Message\MessageFactory;
+use Http\Message\MessageFactory\GuzzleMessageFactory;
 
 abstract class HttpFeatureTest extends \PHPUnit_Framework_TestCase
 {
@@ -18,7 +18,7 @@ abstract class HttpFeatureTest extends \PHPUnit_Framework_TestCase
      */
     public static function setUpBeforeClass()
     {
-        self::$messageFactory = MessageFactoryDiscovery::find();
+        self::$messageFactory = new GuzzleMessageFactory();
     }
 
     /**

src/PHPUnitUtility.php

@@ -12,7 +12,7 @@ class PHPUnitUtility
     /**
      * Gets the uri.
      *
-     * @return string|boolean The uri or FALSE if there is none.
+     * @return string|bool The uri or FALSE if there is none.
      */
     public static function getUri()
     {
@@ -22,7 +22,7 @@ public static function getUri()
     /**
      * Gets the file.
      *
-     * @param boolean     $tmp  TRUE if the file should be in the "/tmp" directory else FALSE.
+     * @param bool        $tmp  TRUE if the file should be in the "/tmp" directory else FALSE.
      * @param string|null $name The name.
      *
      * @return string The file.