CS

geocoder-php · Sep 14, 2014 · f72ba69 · f72ba69
1 parent e09133f
commit f72ba69
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/src/Geocoder/HttpAdapter/CurlHttpAdapter.php b/src/Geocoder/HttpAdapter/CurlHttpAdapter.php
@@ -50,7 +50,7 @@ public function getContent($url)
  if ($this->connectTimeout) {
  curl_setopt($c, CURLOPT_CONNECTTIMEOUT, $this->connectTimeout);
  }
- 
+
  if ($this->userAgent) {
  curl_setopt($c, CURLOPT_USERAGENT, $this->userAgent);
  }

diff --git a/src/Geocoder/Provider/GeoIP2Provider.php b/src/Geocoder/Provider/GeoIP2Provider.php
@@ -57,9 +57,9 @@ public function getGeocodedData($address)
  $regionCode = null;
  if (isset($result->subdivisions) && is_array($result->subdivisions) && !empty($result->subdivisions)) {
  $lastSubdivision = array_pop($result->subdivisions);
- 
+
  $region = (isset($lastSubdivision->names->{$this->locale}) ? $lastSubdivision->names->{$this->locale} : null);
- $regionCode = (isset($lastSubdivision->iso_code) ? $lastSubdivision->iso_code : null); 
+ $regionCode = (isset($lastSubdivision->iso_code) ? $lastSubdivision->iso_code : null);
  }
 
  return array($this->fixEncoding(array_merge($this->getDefaults(), array(

diff --git a/src/Geocoder/Provider/OpenCageProvider.php b/src/Geocoder/Provider/OpenCageProvider.php
@@ -36,10 +36,10 @@ class OpenCageProvider extends AbstractProvider implements ProviderInterface
  private $apiKey = null;
 
  /**
- * @param HttpAdapterInterface $adapter  An HTTP adapter.
- * @param string $apiKey  An API key.
- * @param bool $useSsl  Whether to use an SSL connection (optional).
- * @param string|null $locale  A locale (optional).
+ * @param HttpAdapterInterface $adapter An HTTP adapter.
+ * @param string $apiKey An API key.
+ * @param bool $useSsl Whether to use an SSL connection (optional).
+ * @param string|null $locale A locale (optional).
  */
  public function __construct(HttpAdapterInterface $adapter, $apiKey, $useSsl = false, $locale = null)
  {

diff --git a/src/Geocoder/Result/AbstractResult.php b/src/Geocoder/Result/AbstractResult.php
@@ -72,7 +72,7 @@ protected function formatString($str)
  // matches an upper case letter character immediately preceded by a numeral
  mb_ereg_search_init($str, '[0-9]\p{Lu}');
 
- while($match = mb_ereg_search_pos()) {
+ while ($match = mb_ereg_search_pos()) {
  $charPos = $match[0] + 1;
  // Only swap it back to lowercase if it was lowercase to begin with
  if (mb_ereg_match('\p{Ll}', $originalStr[$charPos])) {

diff --git a/tests/Geocoder/Tests/Provider/OpenCageProviderTest.php b/tests/Geocoder/Tests/Provider/OpenCageProviderTest.php
@@ -26,7 +26,6 @@ public function testGetGeocodedData()
  $provider->getGeocodedData('foobar');
  }
 
-
  /**
  * @expectedException Geocoder\Exception\NoResultException
  * @expectedExceptionMessage Could not find results for given query: https://api.opencagedata.com/geocode/v1/json?key=api_key&query=foobar&limit=5
@@ -37,7 +36,6 @@ public function testSslSchema()
  $provider->getGeocodedData('foobar');
  }
 
-
  /**
  * @expectedException \Geocoder\Exception\NoResultException
  * @expectedExceptionMessage Could not execute query: http://api.opencagedata.com/geocode/v1/json?key=api_key&query=10+avenue+Gambetta%2C+Paris%2C+France&limit=5
@@ -194,7 +192,6 @@ public function testGetGeocodedDataWithCityDistrict()
  $this->assertNull($result['regionCode']);
  }
 
-
  public function testGetGeocodedDataWithLocale()
  {
  if (!isset($_SERVER['OPENCAGE_API_KEY'])) {