psr2 fixes, silence deprecation notices and remove SymfonyPHPUnitBridge

Author: Nyholm

composer.json

@@ -19,8 +19,7 @@
         "satooshi/php-coveralls": "0.6.*",
         "php-http/message": "^1.0",
         "php-http/guzzle6-adapter": "^1.0",
-        "jakub-onderka/php-parallel-lint": "0.8.*",
-        "symfony/phpunit-bridge": "^3.1"
+        "jakub-onderka/php-parallel-lint": "0.8.*"
     },
     "keywords": [
         "oauth",

src/Provider/AbstractProvider.php

@@ -99,7 +99,8 @@ abstract class AbstractProvider
     /**
      * The options given to the Guzzle6 client
      * @var array
-     * @deprecated These are to be removed in the next major release. These options are only used in getHttpClient to keep BC.
+     * @deprecated These are to be removed in the next major release.
+     *      These options are only used in getHttpClient to keep BC.
      */
     private $guzzle6Options = [];
 
@@ -221,16 +222,36 @@ public function getRequestFactory()
     public function setHttpClient($client)
     {
         if ($client instanceof GuzzleClientInterface) {
-            trigger_error(sprintf('Passing a "%s" to "%s::setHttpClient" is deprecated. Please use a "Http\Client\HttpClient" instead.', GuzzleClientInterface::class, static::class), E_USER_DEPRECATED);
+            @trigger_error(
+                sprintf(
+                    'Passing a "%s" to "%s::setHttpClient" is deprecated. Use a "Http\Client\HttpClient" instead.',
+                    GuzzleClientInterface::class,
+                    static::class
+                ),
+                E_USER_DEPRECATED
+            );
             if (!class_exists(HttplugGuzzle6::class)) {
-                throw new \RuntimeException(sprintf('You must install "php-http/guzzle6-adapter" to be able to pass a "%s" to "%s::setHttpClient".', GuzzleClientInterface::class, static::class));
+                throw new \RuntimeException(
+                    sprintf(
+                        'You must install "php-http/guzzle6-adapter" to be able to pass a "%s" to "%s::setHttpClient".',
+                        GuzzleClientInterface::class,
+                        static::class
+                    )
+                );
             }
             $client = new HttplugGuzzle6($client);
         }
 
         if (!$client instanceof HttpClient) {
             $type = is_object($client) ? get_class($client) : gettype($client);
-            throw new \RuntimeException(sprintf('First parameter to "%s::setHttpClient" was expected to be a "Http\Client\HttpClient", you provided a "%s"', static::class, $type));
+            throw new \RuntimeException(
+                sprintf(
+                    'First parameter to "%s::setHttpClient" was expected to be a "%s", you provided a "%s"',
+                    static::class,
+                    HttpClient::class,
+                    $type
+                )
+            );
         }
 
         $this->httpClient = $client;
@@ -255,14 +276,24 @@ public function getHttplugClient()
      */
     public function getHttpClient()
     {
-        trigger_error(sprintf('Using "%s::getHttpClient" is deprecated in favor for "%s::getHttplugClient".', static::class, static::class), E_USER_DEPRECATED);
+        @trigger_error(
+            sprintf(
+                'Using "%s::getHttpClient" is deprecated in favor for "%s::getHttplugClient".',
+                static::class,
+                static::class
+            ),
+            E_USER_DEPRECATED
+        );
 
         if ($this->guzzleClient !== null) {
             return $this->guzzleClient;
         }
 
         if (!class_exists(GuzzleClient::class)) {
-            throw new \RuntimeException('You must install "php-http/guzzle6-adapter" to be able to use "%s::getHttplugClient".', static::class);
+            throw new \RuntimeException(
+                'You must install "php-http/guzzle6-adapter" to be able to use "%s::getHttplugClient".',
+                static::class
+            );
         }
 
         return new GuzzleClient($this->guzzle6Options);
@@ -899,23 +930,36 @@ private function getHttpClientFromOptions(array $options, array $collaborators)
             if (empty($guzzle6Options)) {
                 return HttpClientDiscovery::find();
             } else {
-                trigger_error('Passing options to Guzzle6 client is deprecated. Use "httplugClient" instead', E_USER_DEPRECATED);
+                @trigger_error(
+                    'Passing options to Guzzle6 client is deprecated. Use "httplugClient" instead',
+                    E_USER_DEPRECATED
+                );
                 if (!class_exists(HttplugGuzzle6::class)) {
-                    throw new \RuntimeException('You must install "php-http/guzzle6-adapter" to be able to pass options to the Guzzle6 client.');
+                    throw new \RuntimeException(
+                        'You must install "php-http/guzzle6-adapter" to be able to pass options to the Guzzle6 client.'
+                    );
                 }
                 $this->guzzle6Options = $guzzle6Options;
+
                 return HttplugGuzzle6::createWithConfig($guzzle6Options);
             }
         }
 
-        trigger_error('The "httpClient" option is deprecated. Use "httplugClient" instead', E_USER_DEPRECATED);
+        @trigger_error('The "httpClient" option is deprecated. Use "httplugClient" instead', E_USER_DEPRECATED);
         $client = $collaborators['httpClient'];
         if (!$client instanceof GuzzleClientInterface) {
-            throw new \RuntimeException(sprintf('The value provided with option "HttpClient" must be instance of "%s".', GuzzleClientInterface::class));
+            throw new \RuntimeException(
+                sprintf(
+                    'The value provided with option "HttpClient" must be instance of "%s".',
+                    GuzzleClientInterface::class
+                )
+            );
         }
 
         if (!class_exists(HttplugGuzzle6::class)) {
-            throw new \RuntimeException('You must install "php-http/guzzle6-adapter" to be able to pass a Guzzle6 client with "httpClient" option.');
+            throw new \RuntimeException(
+                'You must install "php-http/guzzle6-adapter" to pass a Guzzle6 client with the "httpClient" option.'
+            );
         }
 
         $this->guzzleClient = $client;

src/Tool/RequestFactory.php

@@ -18,7 +18,6 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamInterface;
 
-
 /**
  * Used to produce PSR-7 Request instances.
  *