Skip to content

Commit 1aeb0ab

Browse files
NyholmNyholm
authored
Apply fixes from StyleCI (#134)
1 parent 22df444 commit 1aeb0ab

30 files changed

+235
-91
lines changed

‎BazingaGeocoderBundle.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the BazingaGeocoderBundle package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
88
* @license MIT License
99
*/
10+
1011
namespace Bazinga\Bundle\GeocoderBundle;
1112

12-
use Symfony\Component\DependencyInjection\ContainerBuilder;
13-
use Symfony\Component\HttpKernel\Bundle\Bundle;
1413
use Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler\AddProvidersPass;
1514
use Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler\ProfilerPass;
15+
use Symfony\Component\DependencyInjection\ContainerBuilder;
16+
use Symfony\Component\HttpKernel\Bundle\Bundle;
1617

1718
/**
1819
* @author William Durand <[email protected]>

‎Command/GeocodeCommand.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the BazingaGeocoderBundle package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
88
* @license MIT License
99
*/
10+
1011
namespace Bazinga\Bundle\GeocoderBundle\Command;
1112

1213
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
1314
use Symfony\Component\Console\Input\InputArgument;
14-
use Symfony\Component\Console\Input\InputOption;
1515
use Symfony\Component\Console\Input\InputInterface;
16+
use Symfony\Component\Console\Input\InputOption;
1617
use Symfony\Component\Console\Output\OutputInterface;
1718

1819
/**
@@ -30,7 +31,7 @@ protected function configure()
3031
->setDescription('Geocode an address or a ip address')
3132
->addArgument('address', InputArgument::REQUIRED, 'The address')
3233
->addOption('provider', null, InputOption::VALUE_OPTIONAL)
33-
->setHelp(<<<HELP
34+
->setHelp(<<<'HELP'
3435
The <info>geocoder:geocoder</info> command will fetch the latitude
3536
and longitude from the given address.
3637

‎DataCollector/GeocoderDataCollector.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the BazingaGeocoderBundle package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
@@ -10,9 +10,9 @@
1010

1111
namespace Bazinga\Bundle\GeocoderBundle\DataCollector;
1212

13-
use Symfony\Component\HttpKernel\DataCollector\DataCollector;
1413
use Symfony\Component\HttpFoundation\Request;
1514
use Symfony\Component\HttpFoundation\Response;
15+
use Symfony\Component\HttpKernel\DataCollector\DataCollector;
1616

1717
/**
1818
* @author Michal Dabrowski <[email protected]>
@@ -24,7 +24,6 @@ class GeocoderDataCollector extends DataCollector
2424
*/
2525
private $instances = [];
2626

27-
2827
public function __construct()
2928
{
3029
$this->data['queries'] = [];

‎DataCollector/ProfilingProvider.php

+19-12
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
<?php
22

3+
/*
4+
* This file is part of the BazingaGeocoderBundle package.
5+
* For the full copyright and license information, please view the LICENSE
6+
* file that was distributed with this source code.
7+
*
8+
* @license MIT License
9+
*/
10+
311
namespace Bazinga\Bundle\GeocoderBundle\DataCollector;
412

513
use Geocoder\Collection;
614
use Geocoder\Exception\LogicException;
7-
use Geocoder\Location;
815
use Geocoder\Provider\Provider;
916
use Geocoder\Query\GeocodeQuery;
1017
use Geocoder\Query\ReverseQuery;
@@ -25,7 +32,7 @@ class ProfilingProvider implements Provider
2532
private $queries = [];
2633

2734
/**
28-
* @param Provider $realProvider
35+
* @param Provider $realProvider
2936
*/
3037
public function __construct(Provider $realProvider)
3138
{
@@ -61,27 +68,27 @@ public function reverseQuery(ReverseQuery $query): Collection
6168
}
6269

6370
/**
64-
* @param GeocodeQuery|ReverseQuery $query
65-
* @param float $duration geocoding duration
66-
* @param Collection $result
71+
* @param GeocodeQuery|ReverseQuery $query
72+
* @param float $duration geocoding duration
73+
* @param Collection $result
6774
*/
6875
private function logQuery($query, float $duration, Collection $result = null)
6976
{
7077
if ($query instanceof GeocodeQuery) {
7178
$queryString = $query->getText();
7279
} elseif ($query instanceof ReverseQuery) {
73-
$queryString = sprintf('(%s, %s)', $query->getCoordinates()->getLongitude(), $query->getCoordinates()->getLongitude());
80+
$queryString = sprintf('(%s, %s)', $query->getCoordinates()->getLongitude(), $query->getCoordinates()->getLongitude());
7481
} else {
7582
throw new LogicException('First parameter to ProfilingProvider::logQuery must be a query');
7683
}
7784

78-
$this->queries[] = array(
79-
'query' => $query,
80-
'queryString' => $queryString,
81-
'duration' => $duration,
85+
$this->queries[] = [
86+
'query' => $query,
87+
'queryString' => $queryString,
88+
'duration' => $duration,
8289
'providerName' => $this->getName(),
83-
'result' => $result,
84-
);
90+
'result' => $result,
91+
];
8592
}
8693

8794
/**

‎DependencyInjection/BazingaGeocoderExtension.php

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the BazingaGeocoderBundle package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
88
* @license MIT License
99
*/
10+
1011
namespace Bazinga\Bundle\GeocoderBundle\DependencyInjection;
1112

1213
use Bazinga\Bundle\GeocoderBundle\ProviderFactory\ProviderFactoryInterface;
1314
use Geocoder\Provider\Cache\ProviderCache;
1415
use Geocoder\Provider\Provider;
15-
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
16-
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
17-
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
16+
use Symfony\Component\Config\Definition\Processor;
17+
use Symfony\Component\Config\FileLocator;
1818
use Symfony\Component\DependencyInjection\ContainerBuilder;
19-
use Symfony\Component\DependencyInjection\Definition;
19+
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
2020
use Symfony\Component\DependencyInjection\Reference;
21-
use Symfony\Component\Config\FileLocator;
22-
use Symfony\Component\Config\Definition\Processor;
21+
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
2322

2423
/**
2524
* William Durand <[email protected]>.
@@ -46,7 +45,7 @@ public function load(array $configs, ContainerBuilder $container)
4645

4746
$tag = current($definition->getTag('kernel.event_listener'));
4847
$tag['priority'] = $config['fake_ip']['priority'];
49-
$tags = array('kernel.event_listener' => array($tag));
48+
$tags = ['kernel.event_listener' => [$tag]];
5049
$definition->setTags($tags);
5150
} else {
5251
$container->removeDefinition('bazinga_geocoder.event_listener.fake_request');
@@ -85,7 +84,7 @@ private function loadProviders(ContainerBuilder $container, array $config)
8584
*
8685
* @param ContainerBuilder $
8786
* @param string $serviceId
88-
* @param array $providerConfig
87+
* @param array $providerConfig
8988
*/
9089
private function configureCache(ContainerBuilder $container, string $serviceId, array $providerConfig)
9190
{
@@ -109,7 +108,7 @@ private function configureCache(ContainerBuilder $container, string $serviceId,
109108
->setArguments([
110109
new Reference($serviceId.'.cache.inner'),
111110
new Reference($cacheServiceId),
112-
$providerConfig['cache_lifetime']
111+
$providerConfig['cache_lifetime'],
113112
]);
114113
}
115114

‎DependencyInjection/Compiler/AddProvidersPass.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the BazingaGeocoderBundle package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
88
* @license MIT License
99
*/
10+
1011
namespace Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler;
1112

1213
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -35,12 +36,12 @@ public function process(ContainerBuilder $container)
3536
return;
3637
}
3738

38-
$providers = array();
39+
$providers = [];
3940
foreach ($container->findTaggedServiceIds('bazinga_geocoder.provider') as $providerId => $attributes) {
4041
$providers[] = new Reference($providerId);
4142
}
4243

4344
$geocoderDefinition = $container->getDefinition('Geocoder\\ProviderAggregator');
44-
$geocoderDefinition->addMethodCall('registerProviders', array($providers));
45+
$geocoderDefinition->addMethodCall('registerProviders', [$providers]);
4546
}
4647
}

‎DependencyInjection/Compiler/ProfilerPass.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the BazingaGeocoderBundle package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
88
* @license MIT License
99
*/
10+
1011
namespace Bazinga\Bundle\GeocoderBundle\DependencyInjection\Compiler;
1112

1213
use Bazinga\Bundle\GeocoderBundle\DataCollector\GeocoderDataCollector;
@@ -16,7 +17,7 @@
1617
use Symfony\Component\DependencyInjection\Reference;
1718

1819
/**
19-
* Add Profiling on all providers with that 'bazinga_geocoder.provider'
20+
* Add Profiling on all providers with that 'bazinga_geocoder.provider'.
2021
*
2122
* @author Tobias Nyholm <[email protected]>
2223
*/

‎DependencyInjection/Configuration.php

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the BazingaGeocoderBundle package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
88
* @license MIT License
99
*/
10+
1011
namespace Bazinga\Bundle\GeocoderBundle\DependencyInjection;
1112

1213
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
@@ -65,20 +66,21 @@ public function getConfigTreeBuilder()
6566
->arrayNode('fake_ip')
6667
->beforeNormalization()
6768
->ifString()
68-
->then(function ($value) { return array('ip' => $value); })
69+
->then(function ($value) {
70+
return ['ip' => $value];
71+
})
6972
->end()
70-
->treatFalseLike(array('enabled' => false))
71-
->treatTrueLike(array('enabled' => true))
72-
->treatNullLike(array('enabled' => true))
73+
->treatFalseLike(['enabled' => false])
74+
->treatTrueLike(['enabled' => true])
75+
->treatNullLike(['enabled' => true])
7376
->children()
7477
->booleanNode('enabled')
7578
->defaultTrue()
7679
->end()
7780
->scalarNode('ip')->defaultNull()->end()
7881
->scalarNode('priority')->defaultValue(0)->end()
7982
->end()
80-
->end()
81-
;
83+
->end();
8284

8385
return $treeBuilder;
8486
}
@@ -108,5 +110,4 @@ private function getProvidersNode()
108110

109111
return $node;
110112
}
111-
112113
}

‎Doctrine/ORM/GeocoderListener.php

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,19 @@
11
<?php
22

3+
/*
4+
* This file is part of the BazingaGeocoderBundle package.
5+
* For the full copyright and license information, please view the LICENSE
6+
* file that was distributed with this source code.
7+
*
8+
* @license MIT License
9+
*/
10+
311
namespace Bazinga\Bundle\GeocoderBundle\Doctrine\ORM;
412

13+
use Bazinga\Bundle\GeocoderBundle\Mapping\Driver\DriverInterface;
514
use Doctrine\Common\EventSubscriber;
6-
use Doctrine\ORM\Events;
715
use Doctrine\ORM\Event\OnFlushEventArgs;
8-
use Bazinga\Bundle\GeocoderBundle\Mapping\Driver\DriverInterface;
9-
use Geocoder\Geocoder;
16+
use Doctrine\ORM\Events;
1017
use Geocoder\Provider\Provider;
1118
use Geocoder\Query\GeocodeQuery;
1219

@@ -36,9 +43,9 @@ public function __construct(Provider $geocoder, DriverInterface $driver)
3643
*/
3744
public function getSubscribedEvents()
3845
{
39-
return array(
46+
return [
4047
Events::onFlush,
41-
);
48+
];
4249
}
4350

4451
public function onFlush(OnFlushEventArgs $args)

‎EventListener/FakeRequestListener.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the BazingaGeocoderBundle package.
55
* For the full copyright and license information, please view the LICENSE
66
* file that was distributed with this source code.
77
*
88
* @license MIT License
99
*/
10+
1011
namespace Bazinga\Bundle\GeocoderBundle\EventListener;
1112

12-
use Symfony\Component\HttpKernel\HttpKernelInterface;
1313
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
14+
use Symfony\Component\HttpKernel\HttpKernelInterface;
1415

1516
/**
1617
* @author William Durand <[email protected]>

‎Mapping/Annotations/Address.php

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<?php
22

3+
/*
4+
* This file is part of the BazingaGeocoderBundle package.
5+
* For the full copyright and license information, please view the LICENSE
6+
* file that was distributed with this source code.
7+
*
8+
* @license MIT License
9+
*/
10+
311
namespace Bazinga\Bundle\GeocoderBundle\Mapping\Annotations;
412

513
/**

‎Mapping/Annotations/Geocodeable.php

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<?php
22

3+
/*
4+
* This file is part of the BazingaGeocoderBundle package.
5+
* For the full copyright and license information, please view the LICENSE
6+
* file that was distributed with this source code.
7+
*
8+
* @license MIT License
9+
*/
10+
311
namespace Bazinga\Bundle\GeocoderBundle\Mapping\Annotations;
412

513
/**

0 commit comments

Comments
 (0)