code style

Author: Nyholm

ClientFactory/ClientFactoryInterface.php

@@ -8,11 +8,11 @@
 interface ClientFactoryInterface
 {
     /**
-     * Input an array of configuration to be able to create a HttpClient
+     * Input an array of configuration to be able to create a HttpClient.
      *
      * @param array $config
      *
      * @return \Http\Client\HttpClient
      */
-    public function createClient(array $config = array());
+    public function createClient(array $config = []);
 }

ClientFactory/PluginClientFactory.php

@@ -12,14 +12,14 @@
 class PluginClientFactory
 {
     /**
-     * @param array $plugins
+     * @param array                  $plugins
      * @param ClientFactoryInterface $factory
-     * @param array $config
+     * @param array                  $config
      *
      * @return PluginClient
      */
-    static public function createPluginClient(array $plugins, ClientFactoryInterface $factory, array $config)
+    public static function createPluginClient(array $plugins, ClientFactoryInterface $factory, array $config)
     {
         return new PluginClient($factory->createClient($config), $plugins);
     }
-}
+}

Collector/MessageJournal.php

@@ -4,8 +4,8 @@
 
 use Http\Client\Exception;
 use Http\Client\Plugin\Journal;
-use Http\Message\Formatter\SimpleFormatter;
 use Http\Message\Formatter;
+use Http\Message\Formatter\SimpleFormatter;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -28,7 +28,7 @@ class MessageJournal extends DataCollector implements Journal
     public function __construct(Formatter $formatter = null)
     {
         $this->formatter = $formatter ?: new SimpleFormatter();
-        $this->data=['success'=>[], 'failure'=>[]];
+        $this->data = ['success' => [], 'failure' => []];
     }
 
     /**
@@ -37,7 +37,7 @@ public function __construct(Formatter $formatter = null)
     public function addSuccess(RequestInterface $request, ResponseInterface $response)
     {
         $this->data['success'][] = [
-            'request' => $this->formatter->formatRequest($request),
+            'request'  => $this->formatter->formatRequest($request),
             'response' => $this->formatter->formatResponse($response),
         ];
     }
@@ -56,7 +56,7 @@ public function addFailure(RequestInterface $request, Exception $exception)
         }
 
         $this->data['failure'][] = [
-            'request' => $this->formatter->formatRequest($request),
+            'request'  => $this->formatter->formatRequest($request),
             'response' => $formattedResponse,
         ];
     }
@@ -88,7 +88,7 @@ public function getFailedRequests()
      */
     public function getTotalRequests()
     {
-        return count($this->data['success'])+count($this->data['failure']);
+        return count($this->data['success']) + count($this->data['failure']);
     }
 
     /**

DependencyInjection/Configuration.php

@@ -34,8 +34,7 @@ public function getConfigTreeBuilder()
                     return !empty($v['classes']['client'])
                         || !empty($v['classes']['message_factory'])
                         || !empty($v['classes']['uri_factory'])
-                        || !empty($v['classes']['stream_factory'])
-                    ;
+                        || !empty($v['classes']['stream_factory']);
                 })
                 ->then(function ($v) {
                     foreach ($v['classes'] as $key => $class) {
@@ -79,8 +78,7 @@ public function getConfigTreeBuilder()
                         ->scalarNode('formatter')->defaultValue('httplug.collector.message_journal')->end()
                     ->end()
                 ->end()
-            ->end()
-        ;
+            ->end();
 
         return $treeBuilder;
     }

DependencyInjection/HttplugExtension.php

@@ -3,8 +3,8 @@
 namespace Http\HttplugBundle\DependencyInjection;
 
 use Http\HttplugBundle\ClientFactory\DummyClient;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -45,15 +45,13 @@ public function load(array $configs, ContainerBuilder $container)
             $container->setAlias(sprintf('httplug.%s', $type), $id);
         }
         $this->configureClients($container, $config);
-
-
     }
 
     /**
-     * Configure client services
+     * Configure client services.
      *
      * @param ContainerBuilder $container
-     * @param array $config
+     * @param array            $config
      */
     protected function configureClients(ContainerBuilder $container, array $config)
     {
@@ -74,13 +72,12 @@ protected function configureClients(ContainerBuilder $container, array $config)
                     ->addArgument($arguments['config']);
             } else {
                 $def->setFactory('Http\HttplugBundle\ClientFactory\PluginClientFactory::createPluginClient')
-                    ->addArgument(array_map(function($id) {
+                    ->addArgument(array_map(function ($id) {
                         return new Reference($id);
                     }, $arguments['plugins']))
                     ->addArgument(new Reference($arguments['factory']))
                     ->addArgument($arguments['config']);
             }
-
         }
 
         // Alias the first client to httplug.client.default

Exception/InvalidConfiguration.php

@@ -4,4 +4,4 @@
 
 class InvalidConfiguration extends \Exception
 {
-}
+}

HttplugBundle.php

@@ -2,7 +2,6 @@
 
 namespace Http\HttplugBundle;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
 /**

Tests/Resources/Fixtures/config/empty.php

@@ -1,3 +1,3 @@
 <?php
 
-$container->loadFromExtension('httplug', array());
+$container->loadFromExtension('httplug', []);

Tests/Resources/Fixtures/config/full.php

@@ -1,16 +1,16 @@
 <?php
 
-$container->loadFromExtension('httplug', array(
-    'main_alias' => array(
-        'client' => 'my_client',
+$container->loadFromExtension('httplug', [
+    'main_alias' => [
+        'client'          => 'my_client',
         'message_factory' => 'my_message_factory',
-        'uri_factory' => 'my_uri_factory',
-        'stream_factory' => 'my_stream_factory',
-    ),
-    'classes' => array(
-        'client' => 'Http\Adapter\Guzzle6\Client',
+        'uri_factory'     => 'my_uri_factory',
+        'stream_factory'  => 'my_stream_factory',
+    ],
+    'classes' => [
+        'client'          => 'Http\Adapter\Guzzle6\Client',
         'message_factory' => 'Http\Message\MessageFactory\GuzzleMessageFactory',
-        'uri_factory' => 'Http\Message\UriFactory\GuzzleUriFactory',
-        'stream_factory' => 'Http\Message\StreamFactory\GuzzleStreamFactory',
-    ),
-));
+        'uri_factory'     => 'Http\Message\UriFactory\GuzzleUriFactory',
+        'stream_factory'  => 'Http\Message\StreamFactory\GuzzleStreamFactory',
+    ],
+]);

Tests/Resources/app/AppKernel.php

@@ -10,10 +10,10 @@ class AppKernel extends Kernel
      */
     public function registerBundles()
     {
-        return array(
+        return [
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new \Http\HttplugBundle\HttplugBundle(),
-        );
+        ];
     }
 
     /**