Skip to content

Commit f348072

Browse files
author
Aaron Scherer
committed
Fixing spaces
1 parent 14288d4 commit f348072

9 files changed

+180
-213
lines changed

‎src/Aequasi/Bundle/CacheBundle/DependencyInjection/AequasiCacheExtension.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@ class AequasiCacheExtension extends Extension
2525
* @param array $configs Array of configs
2626
* @param ContainerBuilder $container Container Object
2727
*/
28-
public function load( array $configs, ContainerBuilder $container )
28+
public function load(array $configs, ContainerBuilder $container)
2929
{
30-
$configuration = new Configuration( $container->getParameter( 'kernel.debug' ) );
31-
$config = $this->processConfiguration( $configuration, $configs );
30+
$configuration = new Configuration($container->getParameter('kernel.debug'));
31+
$config = $this->processConfiguration($configuration, $configs);
3232

33-
$loader = new Loader\YamlFileLoader( $container, new FileLocator( __DIR__ . '/../Resources/config' ) );
34-
$loader->load( 'services.yml' );
33+
$loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
34+
$loader->load('services.yml');
3535

36-
if ($container->getParameter( 'kernel.debug' )) {
37-
$loader->load( 'collector.yml' );
36+
if ($container->getParameter('kernel.debug')) {
37+
$loader->load('collector.yml');
3838
}
3939

40-
$container->setParameter( $this->getAlias() . '.instance', $config[ 'instances' ] );
41-
new Builder\ServiceBuilder( $container );
40+
$container->setParameter($this->getAlias() . '.instance', $config['instances']);
41+
new Builder\ServiceBuilder($container);
4242

43-
if (isset( $config[ 'router' ] )) {
44-
$container->setParameter( $this->getAlias() . '.router', $config[ 'router' ] );
45-
new Builder\RouterBuilder( $container );
43+
if (isset($config['router'])) {
44+
$container->setParameter($this->getAlias() . '.router', $config['router']);
45+
new Builder\RouterBuilder($container);
4646
}
4747

48-
if (isset( $config[ 'session' ] )) {
49-
$container->setParameter( $this->getAlias() . '.session', $config[ 'session' ] );
48+
if (isset($config['session'])) {
49+
$container->setParameter($this->getAlias() . '.session', $config['session']);
5050
}
5151

52-
if (isset( $config[ 'doctrine' ] )) {
53-
$container->setParameter( $this->getAlias() . '.doctrine', $config[ 'doctrine' ] );
52+
if (isset($config['doctrine'])) {
53+
$container->setParameter($this->getAlias() . '.doctrine', $config['doctrine']);
5454
}
5555
}
5656
}

‎src/Aequasi/Bundle/CacheBundle/DependencyInjection/Builder/BaseBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ abstract class BaseBuilder
2626
/**
2727
* {@inheritDoc}
2828
*/
29-
public function __construct( ContainerBuilder $container )
29+
public function __construct(ContainerBuilder $container)
3030
{
3131
$this->container = $container;
3232

‎src/Aequasi/Bundle/CacheBundle/DependencyInjection/Builder/RouterBuilder.php

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,29 @@ class RouterBuilder extends BaseBuilder
2525
*/
2626
protected function prepare()
2727
{
28-
$router = $this->container->getParameter( $this->getAlias() . '.router' );
28+
$router = $this->container->getParameter($this->getAlias() . '.router');
2929

30-
if ($router[ 'enabled' ]) {
31-
$this->buildRouter( $router );
30+
if ($router['enabled']) {
31+
$this->buildRouter($router);
3232
}
3333
}
3434

35-
private function buildRouter( array $config )
35+
private function buildRouter(array $config)
3636
{
37-
$instance = $config[ 'instance' ];
38-
$instances = $this->container->getParameter( $this->getAlias() . '.instance' );
37+
$instance = $config['instance'];
38+
$instances = $this->container->getParameter($this->getAlias() . '.instance');
3939

4040
if (null === $instance) {
41-
throw new InvalidConfigurationException( 'Failed to hook into the router. No instance was passed.' );
41+
throw new InvalidConfigurationException('Failed to hook into the router. No instance was passed.');
4242
}
43-
if (!isset( $instances[ $instance ] )) {
44-
throw new InvalidConfigurationException( sprintf(
45-
'Failed to hook into the router. The instance "%s" doesn\'t exist!',
46-
$instance
47-
) );
43+
if (!isset($instances[$instance])) {
44+
throw new InvalidConfigurationException(sprintf('Failed to hook into the router. The instance "%s" doesn\'t exist!', $instance));
4845
}
4946

50-
if (!in_array( strtolower( $instances[ $instance ][ 'type' ] ), array( 'memcache', 'redis', 'memcached' ) )) {
51-
throw new InvalidConfigurationException( sprintf(
52-
"%s is not a valid cache type for session support. Please use Memcache, Memcached, or Redis. ",
53-
$instances[ $instance ][ 'type' ]
54-
) );
47+
if (!in_array(strtolower($instances[$instance]['type']), array('memcache', 'redis', 'memcached'))) {
48+
throw new InvalidConfigurationException(sprintf("%s is not a valid cache type for session support. Please use Memcache, Memcached, or Redis. ", $instances[$instance]['type']));
5549
}
5650

57-
$this->container->setParameter( 'router.class', 'Aequasi\Bundle\CacheBundle\Routing\Router' );
51+
$this->container->setParameter('router.class', 'Aequasi\Bundle\CacheBundle\Routing\Router');
5852
}
5953
}

‎src/Aequasi/Bundle/CacheBundle/DependencyInjection/Builder/ServiceBuilder.php

Lines changed: 64 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -26,26 +26,23 @@ class ServiceBuilder extends BaseBuilder
2626
*/
2727
protected function prepare()
2828
{
29-
$instances = $this->container->getParameter( $this->getAlias() . '.instance' );
29+
$instances = $this->container->getParameter($this->getAlias() . '.instance');
3030

3131
foreach ($instances as $name => $instance) {
32-
$this->buildInstance( $name, $instance );
32+
$this->buildInstance($name, $instance);
3333
}
3434
}
3535

36-
private function buildInstance( $name, array $instance )
36+
private function buildInstance($name, array $instance)
3737
{
38-
$typeId = $this->getAlias() . '.abstract.' . $instance[ 'type' ];
39-
if (!$this->container->hasDefinition( $typeId )) {
40-
throw new InvalidConfigurationException( sprintf(
41-
"`%s` is not a valid cache type. If you are using a custom type, make sure to add your service. ",
42-
$instance[ 'type' ]
43-
) );
38+
$typeId = $this->getAlias() . '.abstract.' . $instance['type'];
39+
if (!$this->container->hasDefinition($typeId)) {
40+
throw new InvalidConfigurationException(sprintf("`%s` is not a valid cache type. If you are using a custom type, make sure to add your service. ", $instance['type']));
4441
}
4542

46-
$service = $this->buildService( $typeId, $name, $instance );
43+
$service = $this->buildService($typeId, $name, $instance);
4744

48-
$this->prepareCacheClass( $service, $name, $instance );
45+
$this->prepareCacheClass($service, $name, $instance);
4946
}
5047

5148
/**
@@ -55,104 +52,96 @@ private function buildInstance( $name, array $instance )
5552
*
5653
* @return Definition
5754
*/
58-
private function buildService( $typeId, $name, array $instance )
55+
private function buildService($typeId, $name, array $instance)
5956
{
60-
$namespace = is_null( $instance[ 'namespace' ] ) ? $name : $instance[ 'namespace' ];
57+
$namespace = is_null($instance['namespace']) ? $name : $instance['namespace'];
6158

6259
$coreName = $this->getAlias() . '.instance.' . $name . '.core';
63-
$service = $this->container->setDefinition(
64-
$coreName,
65-
new Definition( $this->container->getParameter( $typeId . '.class' ) )
66-
)
67-
->addMethodCall( 'setNamespace', array( $namespace ) )
68-
->setPublic( false );
69-
70-
$this->container->setDefinition(
71-
$this->getAlias() . '.instance.' . $name,
72-
new Definition( $this->container->getParameter( 'aequasi_cache.service.class' ) )
73-
)
74-
->addMethodCall( 'setCache', array( new Reference( $coreName ) ) )
75-
->addMethodCall( 'setLogging', array( $this->container->getParameter( 'kernel.debug' ) ) );
76-
77-
$alias = new Alias( $this->getAlias() . '.instance.' . $name );
78-
$this->container->setAlias( $this->getAlias() . '.' . $name, $alias );
60+
$service = $this->container->setDefinition($coreName, new Definition($this->container->getParameter($typeId . '.class')))
61+
->addMethodCall('setNamespace', array($namespace))
62+
->setPublic(false);
63+
64+
$this->container->setDefinition($this->getAlias() . '.instance.' . $name, new Definition($this->container->getParameter('aequasi_cache.service.class')))
65+
->addMethodCall('setCache', array(new Reference($coreName)))
66+
->addMethodCall('setLogging', array($this->container->getParameter('kernel.debug')));
67+
68+
$alias = new Alias($this->getAlias() . '.instance.' . $name);
69+
$this->container->setAlias($this->getAlias() . '.' . $name, $alias);
7970

8071
return $service;
8172
}
8273

83-
private function prepareCacheClass( Definition $service, $name, array $instance )
74+
private function prepareCacheClass(Definition $service, $name, array $instance)
8475
{
85-
$type = $instance[ 'type' ];
86-
$id = sprintf( "%s.instance.%s.%s_instance", $this->getAlias(), $name, $type );
76+
$type = $instance['type'];
77+
$id = sprintf("%s.instance.%s.%s_instance", $this->getAlias(), $name, $type);
8778
$cache = null;
8879

8980
switch ($type) {
9081
case 'memcache':
91-
if (empty( $instance[ 'id' ] )) {
92-
$cache = new Definition( 'Memcache' );
93-
$cache->setPublic( false );
94-
foreach ($instance[ 'hosts' ] as $config) {
95-
$host = empty( $config[ 'host' ] ) ? 'localhost' : $config[ 'host' ];
96-
$port = empty( $config[ 'port' ] ) ? 11211 : $config[ 'port' ];
97-
$timeout = is_null( $config[ 'timeout' ] ) ? 0 : $config[ 'timeout' ];
98-
$cache->addMethodCall( 'addServer', array( $host, $port, $timeout ) );
82+
if (empty($instance['id'])) {
83+
$cache = new Definition('Memcache');
84+
$cache->setPublic(false);
85+
foreach ($instance['hosts'] as $config) {
86+
$host = empty($config['host']) ? 'localhost' : $config['host'];
87+
$port = empty($config['port']) ? 11211 : $config['port'];
88+
$timeout = is_null($config['timeout']) ? 0 : $config['timeout'];
89+
$cache->addMethodCall('addServer', array($host, $port, $timeout));
9990
}
100-
unset( $config );
91+
unset($config);
10192

102-
$this->container->setDefinition( $id, $cache );
93+
$this->container->setDefinition($id, $cache);
10394
} else {
104-
$id = $instance[ 'id' ];
95+
$id = $instance['id'];
10596
}
106-
$service->addMethodCall( sprintf( 'set%s', ucwords( $type ) ), array( new Reference( $id ) ) );
97+
$service->addMethodCall(sprintf('set%s', ucwords($type)), array(new Reference($id)));
10798
break;
10899
case 'memcached':
109-
if (empty( $instance[ 'id' ] )) {
110-
$cache = new Definition( 'Memcached' );
111-
if ($instance[ 'persistent' ]) {
112-
$cache->setArguments( array( serialize( $instance[ 'hosts' ] ) ) );
100+
if (empty($instance['id'])) {
101+
$cache = new Definition('Memcached');
102+
if ($instance['persistent']) {
103+
$cache->setArguments(array(serialize($instance['hosts'])));
113104
}
114105

115-
$cache->setPublic( false );
116-
foreach ($instance[ 'hosts' ] as $config) {
117-
$host = is_null( $config[ 'host' ] ) ? 'localhost' : $config[ 'host' ];
118-
$port = is_null( $config[ 'port' ] ) ? 11211 : $config[ 'port' ];
119-
$weight = is_null( $config[ 'weight' ] ) ? 0 : $config[ 'weight' ];
120-
$cache->addMethodCall( 'addServer', array( $host, $port, $weight ) );
106+
$cache->setPublic(false);
107+
foreach ($instance['hosts'] as $config) {
108+
$host = is_null($config['host']) ? 'localhost' : $config['host'];
109+
$port = is_null($config['port']) ? 11211 : $config['port'];
110+
$weight = is_null($config['weight']) ? 0 : $config['weight'];
111+
$cache->addMethodCall('addServer', array($host, $port, $weight));
121112
}
122-
unset( $config );
113+
unset($config);
123114

124-
$this->container->setDefinition( $id, $cache );
115+
$this->container->setDefinition($id, $cache);
125116
} else {
126-
$id = $instance[ 'id' ];
117+
$id = $instance['id'];
127118
}
128-
$service->addMethodCall( sprintf( 'set%s', ucwords( $type ) ), array( new Reference( $id ) ) );
119+
$service->addMethodCall(sprintf('set%s', ucwords($type)), array(new Reference($id)));
129120
break;
130121
case 'redis':
131-
if (empty( $instance[ 'id' ] )) {
132-
$cache = new Definition( 'Redis' );
133-
$cache->setPublic( false );
134-
foreach ($instance[ 'hosts' ] as $config) {
135-
$host = empty( $config[ 'host' ] ) ? 'localhost' : $config[ 'host' ];
136-
$port = empty( $config[ 'port' ] ) ? 6379 : $config[ 'port' ];
137-
$timeout = is_null( $config[ 'timeout' ] ) ? 2 : $config[ 'timeout' ];
138-
$cache->addMethodCall( 'connect', array( $host, $port, $timeout ) );
122+
if (empty($instance['id'])) {
123+
$cache = new Definition('Redis');
124+
$cache->setPublic(false);
125+
foreach ($instance['hosts'] as $config) {
126+
$host = empty($config['host']) ? 'localhost' : $config['host'];
127+
$port = empty($config['port']) ? 6379 : $config['port'];
128+
$timeout = is_null($config['timeout']) ? 2 : $config['timeout'];
129+
$cache->addMethodCall('connect', array($host, $port, $timeout));
139130
}
140-
unset( $config );
131+
unset($config);
141132

142-
$this->container->setDefinition( $id, $cache );
133+
$this->container->setDefinition($id, $cache);
143134
} else {
144-
$id = $instance[ 'id' ];
135+
$id = $instance['id'];
145136
}
146-
$service->addMethodCall( sprintf( 'set%s', ucwords( $type ) ), array( new Reference( $id ) ) );
137+
$service->addMethodCall(sprintf('set%s', ucwords($type)), array(new Reference($id)));
147138
break;
148139
case 'file_system':
149140
case 'php_file':
150-
$directory = is_null(
151-
$instance[ 'directory' ]
152-
) ? '%kernel.cache_dir%/doctrine/cache' : $instance[ 'directory' ];
153-
$extension = is_null( $instance[ 'extension' ] ) ? null : $instance[ 'extension' ];
141+
$directory = is_null($instance['directory']) ? '%kernel.cache_dir%/doctrine/cache' : $instance['directory'];
142+
$extension = is_null($instance['extension']) ? null : $instance['extension'];
154143

155-
$service->setArguments( array( $directory, $extension ) );
144+
$service->setArguments(array($directory, $extension));
156145
break;
157146
}
158147
}

‎src/Aequasi/Bundle/CacheBundle/DependencyInjection/Compiler/BaseCompilerPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ abstract class BaseCompilerPass implements CompilerPassInterface
2626
/**
2727
* {@inheritDoc}
2828
*/
29-
public function process( ContainerBuilder $container )
29+
public function process(ContainerBuilder $container)
3030
{
3131
$this->container = $container;
3232

‎src/Aequasi/Bundle/CacheBundle/DependencyInjection/Compiler/DataCollectorCompilerPass.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ class DataCollectorCompilerPass extends BaseCompilerPass
2323
*/
2424
protected function prepare()
2525
{
26-
$instances = $this->container->getParameter( $this->getAlias() . '.instance' );
26+
$instances = $this->container->getParameter($this->getAlias() . '.instance');
2727

28-
$definition = $this->container->getDefinition( 'data_collector.cache' );
28+
$definition = $this->container->getDefinition('data_collector.cache');
2929

30-
foreach (array_keys( $instances ) as $name) {
31-
$instance = new Reference( sprintf( "%s.instance.%s", $this->getAlias(), $name ) );
32-
$definition->addMethodCall( 'addInstance', array( $name, $instance ) );
30+
foreach (array_keys($instances) as $name) {
31+
$instance = new Reference(sprintf("%s.instance.%s", $this->getAlias(), $name));
32+
$definition->addMethodCall('addInstance', array($name, $instance));
3333
}
3434

35-
$this->container->setDefinition( 'data_collector.cache', $definition );
35+
$this->container->setDefinition('data_collector.cache', $definition);
3636
}
3737
}

0 commit comments

Comments
 (0)