Skip to content

Commit 6cb50aa

Browse files
NyholmNyholm
committed
code style
1 parent 151a727 commit 6cb50aa

File tree

12 files changed

+82
-88
lines changed

12 files changed

+82
-88
lines changed

‎ClientFactory/ClientFactoryInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
interface ClientFactoryInterface
99
{
1010
/**
11-
* Input an array of configuration to be able to create a HttpClient
11+
* Input an array of configuration to be able to create a HttpClient.
1212
*
1313
* @param array $config
1414
*
1515
* @return \Http\Client\HttpClient
1616
*/
17-
public function createClient(array $config = array());
17+
public function createClient(array $config = []);
1818
}

‎ClientFactory/PluginClientFactory.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
class PluginClientFactory
1313
{
1414
/**
15-
* @param array $plugins
15+
* @param array $plugins
1616
* @param ClientFactoryInterface $factory
17-
* @param array $config
17+
* @param array $config
1818
*
1919
* @return PluginClient
2020
*/
21-
static public function createPluginClient(array $plugins, ClientFactoryInterface $factory, array $config)
21+
public static function createPluginClient(array $plugins, ClientFactoryInterface $factory, array $config)
2222
{
2323
return new PluginClient($factory->createClient($config), $plugins);
2424
}
25-
}
25+
}

‎Collector/MessageJournal.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
use Http\Client\Exception;
66
use Http\Client\Plugin\Journal;
7-
use Http\Message\Formatter\SimpleFormatter;
87
use Http\Message\Formatter;
8+
use Http\Message\Formatter\SimpleFormatter;
99
use Psr\Http\Message\RequestInterface;
1010
use Psr\Http\Message\ResponseInterface;
1111
use Symfony\Component\HttpFoundation\Request;
@@ -28,7 +28,7 @@ class MessageJournal extends DataCollector implements Journal
2828
public function __construct(Formatter $formatter = null)
2929
{
3030
$this->formatter = $formatter ?: new SimpleFormatter();
31-
$this->data=['success'=>[], 'failure'=>[]];
31+
$this->data = ['success' => [], 'failure' => []];
3232
}
3333

3434
/**
@@ -37,7 +37,7 @@ public function __construct(Formatter $formatter = null)
3737
public function addSuccess(RequestInterface $request, ResponseInterface $response)
3838
{
3939
$this->data['success'][] = [
40-
'request' => $this->formatter->formatRequest($request),
40+
'request' => $this->formatter->formatRequest($request),
4141
'response' => $this->formatter->formatResponse($response),
4242
];
4343
}
@@ -56,7 +56,7 @@ public function addFailure(RequestInterface $request, Exception $exception)
5656
}
5757

5858
$this->data['failure'][] = [
59-
'request' => $this->formatter->formatRequest($request),
59+
'request' => $this->formatter->formatRequest($request),
6060
'response' => $formattedResponse,
6161
];
6262
}
@@ -88,7 +88,7 @@ public function getFailedRequests()
8888
*/
8989
public function getTotalRequests()
9090
{
91-
return count($this->data['success'])+count($this->data['failure']);
91+
return count($this->data['success']) + count($this->data['failure']);
9292
}
9393

9494
/**

‎DependencyInjection/Configuration.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ public function getConfigTreeBuilder()
3434
return !empty($v['classes']['client'])
3535
|| !empty($v['classes']['message_factory'])
3636
|| !empty($v['classes']['uri_factory'])
37-
|| !empty($v['classes']['stream_factory'])
38-
;
37+
|| !empty($v['classes']['stream_factory']);
3938
})
4039
->then(function ($v) {
4140
foreach ($v['classes'] as $key => $class) {
@@ -79,8 +78,7 @@ public function getConfigTreeBuilder()
7978
->scalarNode('formatter')->defaultValue('httplug.collector.message_journal')->end()
8079
->end()
8180
->end()
82-
->end()
83-
;
81+
->end();
8482

8583
return $treeBuilder;
8684
}

‎DependencyInjection/HttplugExtension.php

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
namespace Http\HttplugBundle\DependencyInjection;
44

55
use Http\HttplugBundle\ClientFactory\DummyClient;
6-
use Symfony\Component\DependencyInjection\ContainerBuilder;
76
use Symfony\Component\Config\FileLocator;
7+
use Symfony\Component\DependencyInjection\ContainerBuilder;
88
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
99
use Symfony\Component\DependencyInjection\Reference;
1010
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
@@ -45,15 +45,13 @@ public function load(array $configs, ContainerBuilder $container)
4545
$container->setAlias(sprintf('httplug.%s', $type), $id);
4646
}
4747
$this->configureClients($container, $config);
48-
49-
5048
}
5149

5250
/**
53-
* Configure client services
51+
* Configure client services.
5452
*
5553
* @param ContainerBuilder $container
56-
* @param array $config
54+
* @param array $config
5755
*/
5856
protected function configureClients(ContainerBuilder $container, array $config)
5957
{
@@ -74,13 +72,12 @@ protected function configureClients(ContainerBuilder $container, array $config)
7472
->addArgument($arguments['config']);
7573
} else {
7674
$def->setFactory('Http\HttplugBundle\ClientFactory\PluginClientFactory::createPluginClient')
77-
->addArgument(array_map(function($id) {
75+
->addArgument(array_map(function ($id) {
7876
return new Reference($id);
7977
}, $arguments['plugins']))
8078
->addArgument(new Reference($arguments['factory']))
8179
->addArgument($arguments['config']);
8280
}
83-
8481
}
8582

8683
// Alias the first client to httplug.client.default

‎Exception/InvalidConfiguration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
class InvalidConfiguration extends \Exception
66
{
7-
}
7+
}

‎HttplugBundle.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Http\HttplugBundle;
44

5-
use Symfony\Component\DependencyInjection\ContainerBuilder;
65
use Symfony\Component\HttpKernel\Bundle\Bundle;
76

87
/**

‎Tests/Resources/Fixtures/config/empty.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?php
22

3-
$container->loadFromExtension('httplug', array());
3+
$container->loadFromExtension('httplug', []);

‎Tests/Resources/Fixtures/config/full.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?php
22

3-
$container->loadFromExtension('httplug', array(
4-
'main_alias' => array(
5-
'client' => 'my_client',
3+
$container->loadFromExtension('httplug', [
4+
'main_alias' => [
5+
'client' => 'my_client',
66
'message_factory' => 'my_message_factory',
7-
'uri_factory' => 'my_uri_factory',
8-
'stream_factory' => 'my_stream_factory',
9-
),
10-
'classes' => array(
11-
'client' => 'Http\Adapter\Guzzle6\Client',
7+
'uri_factory' => 'my_uri_factory',
8+
'stream_factory' => 'my_stream_factory',
9+
],
10+
'classes' => [
11+
'client' => 'Http\Adapter\Guzzle6\Client',
1212
'message_factory' => 'Http\Message\MessageFactory\GuzzleMessageFactory',
13-
'uri_factory' => 'Http\Message\UriFactory\GuzzleUriFactory',
14-
'stream_factory' => 'Http\Message\StreamFactory\GuzzleStreamFactory',
15-
),
16-
));
13+
'uri_factory' => 'Http\Message\UriFactory\GuzzleUriFactory',
14+
'stream_factory' => 'Http\Message\StreamFactory\GuzzleStreamFactory',
15+
],
16+
]);

‎Tests/Resources/app/AppKernel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ class AppKernel extends Kernel
1010
*/
1111
public function registerBundles()
1212
{
13-
return array(
13+
return [
1414
new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
1515
new \Http\HttplugBundle\HttplugBundle(),
16-
);
16+
];
1717
}
1818

1919
/**

‎Tests/Unit/DependencyInjection/ConfigurationTest.php

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,65 +23,65 @@ protected function getConfiguration()
2323

2424
public function testEmptyConfiguration()
2525
{
26-
$expectedConfiguration = array(
27-
'main_alias' => array(
28-
'client' => 'httplug.client.default',
26+
$expectedConfiguration = [
27+
'main_alias' => [
28+
'client' => 'httplug.client.default',
2929
'message_factory' => 'httplug.message_factory.default',
30-
'uri_factory' => 'httplug.uri_factory.default',
31-
'stream_factory' => 'httplug.stream_factory.default',
32-
),
33-
'classes' => array(
34-
'client' => null,
30+
'uri_factory' => 'httplug.uri_factory.default',
31+
'stream_factory' => 'httplug.stream_factory.default',
32+
],
33+
'classes' => [
34+
'client' => null,
3535
'message_factory' => null,
36-
'uri_factory' => null,
37-
'stream_factory' => null,
38-
),
39-
'clients'=>array(),
40-
'toolbar'=>true,
41-
);
36+
'uri_factory' => null,
37+
'stream_factory' => null,
38+
],
39+
'clients' => [],
40+
'toolbar' => true,
41+
];
4242

4343
$formats = array_map(function ($path) {
4444
return __DIR__.'/../../Resources/Fixtures/'.$path;
45-
}, array(
45+
}, [
4646
'config/empty.yml',
4747
'config/empty.xml',
4848
'config/empty.php',
49-
));
49+
]);
5050

5151
foreach ($formats as $format) {
52-
$this->assertProcessedConfigurationEquals($expectedConfiguration, array($format));
52+
$this->assertProcessedConfigurationEquals($expectedConfiguration, [$format]);
5353
}
5454
}
5555

5656
public function testSupportsAllConfigFormats()
5757
{
58-
$expectedConfiguration = array(
59-
'main_alias' => array(
60-
'client' => 'my_client',
58+
$expectedConfiguration = [
59+
'main_alias' => [
60+
'client' => 'my_client',
6161
'message_factory' => 'my_message_factory',
62-
'uri_factory' => 'my_uri_factory',
63-
'stream_factory' => 'my_stream_factory',
64-
),
65-
'classes' => array(
66-
'client' => 'Http\Adapter\Guzzle6\Client',
62+
'uri_factory' => 'my_uri_factory',
63+
'stream_factory' => 'my_stream_factory',
64+
],
65+
'classes' => [
66+
'client' => 'Http\Adapter\Guzzle6\Client',
6767
'message_factory' => 'Http\Message\MessageFactory\GuzzleMessageFactory',
68-
'uri_factory' => 'Http\Message\UriFactory\GuzzleUriFactory',
69-
'stream_factory' => 'Http\Message\StreamFactory\GuzzleStreamFactory',
70-
),
71-
'clients'=>array(),
72-
'toolbar'=>true,
73-
);
68+
'uri_factory' => 'Http\Message\UriFactory\GuzzleUriFactory',
69+
'stream_factory' => 'Http\Message\StreamFactory\GuzzleStreamFactory',
70+
],
71+
'clients' => [],
72+
'toolbar' => true,
73+
];
7474

7575
$formats = array_map(function ($path) {
7676
return __DIR__.'/../../Resources/Fixtures/'.$path;
77-
}, array(
77+
}, [
7878
'config/full.yml',
7979
'config/full.xml',
8080
'config/full.php',
81-
));
81+
]);
8282

8383
foreach ($formats as $format) {
84-
$this->assertProcessedConfigurationEquals($expectedConfiguration, array($format));
84+
$this->assertProcessedConfigurationEquals($expectedConfiguration, [$format]);
8585
}
8686
}
8787

@@ -92,6 +92,6 @@ public function testSupportsAllConfigFormats()
9292
public function testMissingClass()
9393
{
9494
$file = __DIR__.'/../../Resources/Fixtures/config/invalid.yml';
95-
$this->assertProcessedConfigurationEquals(array(), array($file));
95+
$this->assertProcessedConfigurationEquals([], [$file]);
9696
}
9797
}

‎Tests/Unit/DependencyInjection/HttplugExtensionTest.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ class HttplugExtensionTest extends AbstractExtensionTestCase
1212
{
1313
protected function getContainerExtensions()
1414
{
15-
return array(
15+
return [
1616
new HttplugExtension(),
17-
);
17+
];
1818
}
1919

2020
public function testConfigLoadDefault()
@@ -33,11 +33,11 @@ public function testConfigLoadDefault()
3333

3434
public function testConfigLoadClass()
3535
{
36-
$this->load(array(
37-
'classes' => array(
38-
'client' => 'Http\Adapter\Guzzle6\Client'
39-
),
40-
));
36+
$this->load([
37+
'classes' => [
38+
'client' => 'Http\Adapter\Guzzle6\Client',
39+
],
40+
]);
4141

4242
foreach (['client', 'message_factory', 'uri_factory', 'stream_factory'] as $type) {
4343
$this->assertContainerBuilderHasAlias("httplug.$type", "httplug.$type.default");
@@ -51,14 +51,14 @@ public function testConfigLoadClass()
5151

5252
public function testConfigLoadService()
5353
{
54-
$this->load(array(
55-
'main_alias' => array(
56-
'client' => 'my_client_service',
54+
$this->load([
55+
'main_alias' => [
56+
'client' => 'my_client_service',
5757
'message_factory' => 'my_message_factory_service',
58-
'uri_factory' => 'my_uri_factory_service',
59-
'stream_factory' => 'my_stream_factory_service',
60-
),
61-
));
58+
'uri_factory' => 'my_uri_factory_service',
59+
'stream_factory' => 'my_stream_factory_service',
60+
],
61+
]);
6262

6363
foreach (['client', 'message_factory', 'uri_factory', 'stream_factory'] as $type) {
6464
$this->assertContainerBuilderHasAlias("httplug.$type", "my_{$type}_service");

0 commit comments

Comments
 (0)