update for new cs rules (#384)

dbu · web-flow · commit 47bd422ac9fe · 2020-03-30T08:58:09.000+02:00
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -1,7 +1,7 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-    ->exclude('Resources')
+    ->exclude('src/Resources')
     ->exclude('vendor')
     ->in(__DIR__)
 ;
@@ -12,6 +12,7 @@ return PhpCsFixer\Config::create()
         '@Symfony' => true,
         'array_syntax' => ['syntax' => 'short'],
         'declare_strict_types' => true,
+        'single_line_throw' => false,
         'visibility_required' => [
             'elements' => [
                 'const',
diff --git a/src/ClientFactory/BuzzFactory.php b/src/ClientFactory/BuzzFactory.php
@@ -19,9 +19,6 @@ class BuzzFactory implements ClientFactory
      */
     private $messageFactory;
 
-    /**
-     * @param MessageFactory $messageFactory
-     */
     public function __construct(MessageFactory $messageFactory)
     {
         $this->messageFactory = $messageFactory;
@@ -49,8 +46,6 @@ public function createClient(array $config = [])
 
     /**
      * Get options to configure the Buzz client.
-     *
-     * @param array $config
      */
     private function getOptions(array $config = [])
     {
diff --git a/src/ClientFactory/ClientFactory.php b/src/ClientFactory/ClientFactory.php
@@ -14,8 +14,6 @@ interface ClientFactory
     /**
      * Input an array of configuration to be able to create a HttpClient.
      *
-     * @param array $config
-     *
      * @return HttpClient
      */
     public function createClient(array $config = []);
diff --git a/src/ClientFactory/CurlFactory.php b/src/ClientFactory/CurlFactory.php
@@ -23,10 +23,6 @@ class CurlFactory implements ClientFactory
      */
     private $streamFactory;
 
-    /**
-     * @param ResponseFactoryInterface $responseFactory
-     * @param StreamFactoryInterface   $streamFactory
-     */
     public function __construct(ResponseFactoryInterface $responseFactory, StreamFactoryInterface $streamFactory)
     {
         $this->responseFactory = $responseFactory;
diff --git a/src/ClientFactory/Guzzle5Factory.php b/src/ClientFactory/Guzzle5Factory.php
@@ -18,9 +18,6 @@ class Guzzle5Factory implements ClientFactory
      */
     private $messageFactory;
 
-    /**
-     * @param MessageFactory $messageFactory
-     */
     public function __construct(MessageFactory $messageFactory)
     {
         $this->messageFactory = $messageFactory;
diff --git a/src/ClientFactory/ReactFactory.php b/src/ClientFactory/ReactFactory.php
@@ -17,9 +17,6 @@ class ReactFactory implements ClientFactory
      */
     private $messageFactory;
 
-    /**
-     * @param MessageFactory $messageFactory
-     */
     public function __construct(MessageFactory $messageFactory)
     {
         $this->messageFactory = $messageFactory;
diff --git a/src/ClientFactory/SocketFactory.php b/src/ClientFactory/SocketFactory.php
@@ -17,9 +17,6 @@ class SocketFactory implements ClientFactory
      */
     private $messageFactory;
 
-    /**
-     * @param MessageFactory $messageFactory
-     */
     public function __construct(MessageFactory $messageFactory)
     {
         $this->messageFactory = $messageFactory;
diff --git a/src/ClientFactory/SymfonyFactory.php b/src/ClientFactory/SymfonyFactory.php
@@ -24,10 +24,6 @@ class SymfonyFactory implements ClientFactory
      */
     private $streamFactory;
 
-    /**
-     * @param ResponseFactoryInterface $responseFactory
-     * @param StreamFactoryInterface   $streamFactory
-     */
     public function __construct(ResponseFactoryInterface $responseFactory, StreamFactoryInterface $streamFactory)
     {
         $this->responseFactory = $responseFactory;
diff --git a/src/Collector/Collector.php b/src/Collector/Collector.php
@@ -50,8 +50,6 @@ public function getName()
 
     /**
      * Mark the stack as active. If a stack was already active, use it as parent for our stack.
-     *
-     * @param Stack $stack
      */
     public function activateStack(Stack $stack)
     {
@@ -64,8 +62,6 @@ public function activateStack(Stack $stack)
 
     /**
      * Mark the stack as inactive.
-     *
-     * @param Stack $stack
      */
     public function deactivateStack(Stack $stack)
     {
@@ -80,17 +76,12 @@ public function getActiveStack()
         return $this->activeStack;
     }
 
-    /**
-     * @param Stack $stack
-     */
     public function addStack(Stack $stack)
     {
         $this->data['stacks'][] = $stack;
     }
 
     /**
-     * @param Stack $parent
-     *
      * @return Stack[]
      */
     public function getChildrenStacks(Stack $parent)
@@ -171,8 +162,6 @@ public function countClientMessages($client)
     /**
      * Recursively count message in stack.
      *
-     * @param Stack $stack
-     *
      * @return int
      */
     private function countStackMessages(Stack $stack)
diff --git a/src/Collector/Formatter.php b/src/Collector/Formatter.php
@@ -33,10 +33,6 @@ class Formatter implements MessageFormatter
      */
     private $curlFormatter;
 
-    /**
-     * @param MessageFormatter     $formatter
-     * @param CurlCommandFormatter $curlFormatter
-     */
     public function __construct(MessageFormatter $formatter, CurlCommandFormatter $curlFormatter)
     {
         $this->formatter = $formatter;
@@ -46,8 +42,6 @@ public function __construct(MessageFormatter $formatter, CurlCommandFormatter $c
     /**
      * Formats an exception.
      *
-     * @param \Throwable $exception
-     *
      * @return string
      */
     public function formatException(\Throwable $exception)
@@ -82,8 +76,6 @@ public function formatResponse(ResponseInterface $response)
     /**
      * Format a RequestInterface as a cURL command.
      *
-     * @param RequestInterface $request
-     *
      * @return string
      */
     public function formatAsCurlCommand(RequestInterface $request)
diff --git a/src/Collector/PluginClientFactory.php b/src/Collector/PluginClientFactory.php
@@ -36,11 +36,6 @@ final class PluginClientFactory
      */
     private $stopwatch;
 
-    /**
-     * @param Collector $collector
-     * @param Formatter $formatter
-     * @param Stopwatch $stopwatch
-     */
     public function __construct(Collector $collector, Formatter $formatter, Stopwatch $stopwatch)
     {
         $this->collector = $collector;
diff --git a/src/Collector/PluginClientFactoryListener.php b/src/Collector/PluginClientFactoryListener.php
@@ -32,9 +32,6 @@ final class PluginClientFactoryListener implements EventSubscriberInterface
      */
     private $factory;
 
-    /**
-     * @param PluginClientFactory $factory
-     */
     public function __construct(PluginClientFactory $factory)
     {
         $this->factory = $factory;
diff --git a/src/Collector/ProfileClient.php b/src/Collector/ProfileClient.php
@@ -53,11 +53,8 @@ class ProfileClient implements HttpClient, HttpAsyncClient
     private $eventNames = [];
 
     /**
-     * @param HttpClient|HttpAsyncClient $client    The client to profile. Client must implement HttpClient or
-     *                                              HttpAsyncClient interface.
-     * @param Collector                  $collector
-     * @param Formatter                  $formatter
-     * @param Stopwatch                  $stopwatch
+     * @param HttpClient|HttpAsyncClient $client The client to profile. Client must implement HttpClient or
+     *                                           HttpAsyncClient interface.
      */
     public function __construct($client, Collector $collector, Formatter $formatter, Stopwatch $stopwatch)
     {
@@ -151,10 +148,6 @@ protected function doSendRequest(RequestInterface $request)
         }
     }
 
-    /**
-     * @param RequestInterface $request
-     * @param Stack            $stack
-     */
     private function collectRequestInformations(RequestInterface $request, Stack $stack)
     {
         $stack->setRequestTarget($request->getRequestTarget());
@@ -165,23 +158,13 @@ private function collectRequestInformations(RequestInterface $request, Stack $st
         $stack->setCurlCommand($this->formatter->formatAsCurlCommand($request));
     }
 
-    /**
-     * @param ResponseInterface $response
-     * @param StopwatchEvent    $event
-     * @param Stack             $stack
-     */
     private function collectResponseInformations(ResponseInterface $response, StopwatchEvent $event, Stack $stack)
     {
         $stack->setDuration($event->getDuration());
         $stack->setResponseCode($response->getStatusCode());
         $stack->setClientResponse($this->formatter->formatResponse($response));
     }
 
-    /**
-     * @param \Throwable     $exception
-     * @param StopwatchEvent $event
-     * @param Stack          $stack
-     */
     private function collectExceptionInformations(\Throwable $exception, StopwatchEvent $event, Stack $stack)
     {
         if ($exception instanceof HttpException) {
@@ -195,8 +178,6 @@ private function collectExceptionInformations(\Throwable $exception, StopwatchEv
     /**
      * Generates the event name.
      *
-     * @param RequestInterface $request
-     *
      * @return string
      */
     private function getStopwatchEventName(RequestInterface $request)
diff --git a/src/Collector/ProfileClientFactory.php b/src/Collector/ProfileClientFactory.php
@@ -42,9 +42,6 @@ class ProfileClientFactory implements ClientFactory
 
     /**
      * @param ClientFactory|callable $factory
-     * @param Collector              $collector
-     * @param Formatter              $formatter
-     * @param Stopwatch              $stopwatch
      */
     public function __construct($factory, Collector $collector, Formatter $formatter, Stopwatch $stopwatch)
     {
diff --git a/src/Collector/ProfilePlugin.php b/src/Collector/ProfilePlugin.php
@@ -36,11 +36,6 @@ class ProfilePlugin implements Plugin
      */
     private $formatter;
 
-    /**
-     * @param Plugin    $plugin
-     * @param Collector $collector
-     * @param Formatter $formatter
-     */
     public function __construct(Plugin $plugin, Collector $collector, Formatter $formatter)
     {
         $this->plugin = $plugin;
@@ -89,10 +84,7 @@ protected function doHandleRequest(RequestInterface $request, callable $next, ca
     }
 
     /**
-     * @param RequestInterface $request
-     * @param Profile          $profile
-     * @param Exception        $exception
-     * @param Stack            $stack
+     * @param Stack $stack
      */
     private function onException(
         RequestInterface $request,
@@ -105,20 +97,13 @@ private function onException(
         $this->collectRequestInformation($request, $stack);
     }
 
-    /**
-     * @param RequestInterface $request
-     * @param Profile          $profile
-     */
     private function onOutgoingRequest(RequestInterface $request, Profile $profile)
     {
         $profile->setRequest($this->formatter->formatRequest($request));
     }
 
     /**
-     * @param ResponseInterface $response
-     * @param Profile           $profile
-     * @param RequestInterface  $request
-     * @param Stack             $stack
+     * @param Stack $stack
      */
     private function onOutgoingResponse(ResponseInterface $response, Profile $profile, RequestInterface $request, Stack $stack = null)
     {
@@ -129,9 +114,6 @@ private function onOutgoingResponse(ResponseInterface $response, Profile $profil
     /**
      * Collect request information when not already done by the HTTP client. This happens when using the CachePlugin
      * and the cache is hit without re-validation.
-     *
-     * @param RequestInterface $request
-     * @param Stack|null       $stack
      */
     private function collectRequestInformation(RequestInterface $request, Stack $stack = null)
     {
diff --git a/src/Collector/Stack.php b/src/Collector/Stack.php
@@ -127,9 +127,6 @@ public function setParent(self $parent)
         $this->parent = $parent;
     }
 
-    /**
-     * @param Profile $profile
-     */
     public function addProfile(Profile $profile)
     {
         $this->profiles[] = $profile;
diff --git a/src/Collector/StackPlugin.php b/src/Collector/StackPlugin.php
@@ -37,9 +37,7 @@ class StackPlugin implements Plugin
     private $formatter;
 
     /**
-     * @param Collector $collector
-     * @param Formatter $formatter
-     * @param string    $client
+     * @param string $client
      */
     public function __construct(Collector $collector, Formatter $formatter, $client)
     {
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -254,9 +254,6 @@ private function configureClients(ArrayNodeDefinition $root)
         ->end();
     }
 
-    /**
-     * @param ArrayNodeDefinition $root
-     */
     private function configureSharedPlugins(ArrayNodeDefinition $root)
     {
         $pluginsNode = $root
diff --git a/src/DependencyInjection/HttplugExtension.php b/src/DependencyInjection/HttplugExtension.php
diff --git a/src/Discovery/ConfiguredClientsStrategy.php b/src/Discovery/ConfiguredClientsStrategy.php
diff --git a/tests/Resources/Fixtures/config/empty.php b/tests/Resources/Fixtures/config/empty.php
diff --git a/tests/Resources/Fixtures/config/full.php b/tests/Resources/Fixtures/config/full.php
diff --git a/tests/Resources/MyPsr18TestClient.php b/tests/Resources/MyPsr18TestClient.php
diff --git a/tests/Resources/app/AppKernel.php b/tests/Resources/app/AppKernel.php

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@ interface ClientFactory`
`14`	`14`	`/**`
`15`	`15`	`* Input an array of configuration to be able to create a HttpClient.`
`16`	`16`	`*`
`17`		`- * @param array $config`
`18`		`- *`
`19`	`17`	`* @return HttpClient`
`20`	`18`	`*/`
`21`	`19`	`public function createClient(array $config = []);`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,6 @@ class Guzzle5Factory implements ClientFactory`
`18`	`18`	`*/`
`19`	`19`	`private $messageFactory;`
`20`	`20`
`21`		`- /**`
`22`		`- * @param MessageFactory $messageFactory`
`23`		`- */`
`24`	`21`	`public function __construct(MessageFactory $messageFactory)`
`25`	`22`	`{`
`26`	`23`	`$this->messageFactory = $messageFactory;`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,6 @@ class ReactFactory implements ClientFactory`
`17`	`17`	`*/`
`18`	`18`	`private $messageFactory;`
`19`	`19`
`20`		`- /**`
`21`		`- * @param MessageFactory $messageFactory`
`22`		`- */`
`23`	`20`	`public function __construct(MessageFactory $messageFactory)`
`24`	`21`	`{`
`25`	`22`	`$this->messageFactory = $messageFactory;`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,6 @@ class SocketFactory implements ClientFactory`
`17`	`17`	`*/`
`18`	`18`	`private $messageFactory;`
`19`	`19`
`20`		`- /**`
`21`		`- * @param MessageFactory $messageFactory`
`22`		`- */`
`23`	`20`	`public function __construct(MessageFactory $messageFactory)`
`24`	`21`	`{`
`25`	`22`	`$this->messageFactory = $messageFactory;`