CS fixes

Author: sagikazarmark

.styleci.yml

@@ -2,11 +2,7 @@ preset: symfony
 
 finder:
     exclude:
-        - "spec"
-        - "Tests"
         - "Resources"
-    path:
-        - "./"
 
 enabled:
     - short_array_syntax

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);
     }
-}
+}

DependencyInjection/HttplugExtension.php

@@ -38,15 +38,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)
     {
@@ -63,13 +61,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/Unit/DependencyInjection/ConfigurationTest.php

@@ -23,63 +23,63 @@ protected function getConfiguration()
 
     public function testEmptyConfiguration()
     {
-        $expectedConfiguration = array(
-            'main_alias' => array(
+        $expectedConfiguration = [
+            'main_alias' => [
                 'client' => 'httplug.client.default',
                 'message_factory' => 'httplug.message_factory.default',
                 'uri_factory' => 'httplug.uri_factory.default',
                 'stream_factory' => 'httplug.stream_factory.default',
-            ),
-            'classes' => array(
+            ],
+            'classes' => [
                 'client' => null,
                 'message_factory' => null,
                 'uri_factory' => null,
                 'stream_factory' => null,
-            ),
-            'clients'=>array(),
-        );
+            ],
+            'clients' => [],
+        ];
 
         $formats = array_map(function ($path) {
             return __DIR__.'/../../Resources/Fixtures/'.$path;
-        }, array(
+        }, [
             'config/empty.yml',
             'config/empty.xml',
             'config/empty.php',
-        ));
+        ]);
 
         foreach ($formats as $format) {
-            $this->assertProcessedConfigurationEquals($expectedConfiguration, array($format));
+            $this->assertProcessedConfigurationEquals($expectedConfiguration, [$format]);
         }
     }
 
     public function testSupportsAllConfigFormats()
     {
-        $expectedConfiguration = array(
-            'main_alias' => array(
+        $expectedConfiguration = [
+            'main_alias' => [
                 'client' => 'my_client',
                 'message_factory' => 'my_message_factory',
                 'uri_factory' => 'my_uri_factory',
                 'stream_factory' => 'my_stream_factory',
-            ),
-            'classes' => array(
+            ],
+            'classes' => [
                 'client' => 'Http\Adapter\Guzzle6\Client',
                 'message_factory' => 'Http\Message\MessageFactory\GuzzleMessageFactory',
                 'uri_factory' => 'Http\Message\UriFactory\GuzzleUriFactory',
                 'stream_factory' => 'Http\Message\StreamFactory\GuzzleStreamFactory',
-            ),
-            'clients'=>array(),
-        );
+            ],
+            'clients' => [],
+        ];
 
         $formats = array_map(function ($path) {
             return __DIR__.'/../../Resources/Fixtures/'.$path;
-        }, array(
+        }, [
             'config/full.yml',
             'config/full.xml',
             'config/full.php',
-        ));
+        ]);
 
         foreach ($formats as $format) {
-            $this->assertProcessedConfigurationEquals($expectedConfiguration, array($format));
+            $this->assertProcessedConfigurationEquals($expectedConfiguration, [$format]);
         }
     }
 
@@ -90,6 +90,6 @@ public function testSupportsAllConfigFormats()
     public function testMissingClass()
     {
         $file = __DIR__.'/../../Resources/Fixtures/config/invalid.yml';
-        $this->assertProcessedConfigurationEquals(array(), array($file));
+        $this->assertProcessedConfigurationEquals([], [$file]);
     }
 }

Tests/Unit/DependencyInjection/HttplugExtensionTest.php

@@ -12,9 +12,9 @@ class HttplugExtensionTest extends AbstractExtensionTestCase
 {
     protected function getContainerExtensions()
     {
-        return array(
+        return [
             new HttplugExtension(),
-        );
+        ];
     }
 
     public function testConfigLoadDefault()
@@ -33,11 +33,11 @@ public function testConfigLoadDefault()
 
     public function testConfigLoadClass()
     {
-        $this->load(array(
-            'classes' => array(
-                'client' => 'Http\Adapter\Guzzle6\Client'
-            ),
-        ));
+        $this->load([
+            'classes' => [
+                'client' => 'Http\Adapter\Guzzle6\Client',
+            ],
+        ]);
 
         foreach (['client', 'message_factory', 'uri_factory', 'stream_factory'] as $type) {
             $this->assertContainerBuilderHasAlias("httplug.$type", "httplug.$type.default");
@@ -51,14 +51,14 @@ public function testConfigLoadClass()
 
     public function testConfigLoadService()
     {
-        $this->load(array(
-            'main_alias' => array(
+        $this->load([
+            'main_alias' => [
                 'client' => 'my_client_service',
                 'message_factory' => 'my_message_factory_service',
                 'uri_factory' => 'my_uri_factory_service',
                 'stream_factory' => 'my_stream_factory_service',
-            ),
-        ));
+            ],
+        ]);
 
         foreach (['client', 'message_factory', 'uri_factory', 'stream_factory'] as $type) {
             $this->assertContainerBuilderHasAlias("httplug.$type", "my_{$type}_service");