Fix CS

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 William Durand <[email protected]>
+Copyright (c) 2011-2012 William Durand <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

autoload.php.dist

@@ -1,3 +1,3 @@
 <?php
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/vendor/autoload.php';

composer.json

@@ -39,4 +39,4 @@
             "dev-master": "1.0-dev"
         }
     }
-}
+}

src/Geocoder/Dumper/DumperInterface.php

@@ -21,8 +21,8 @@ interface DumperInterface
      * Dump a `ResultInterface` object as a string representation of
      * the implemented format.
      *
-     * @param \Geocoder\Result\ResultInterface $result A result object
+     * @param  \Geocoder\Result\ResultInterface $result A result object
      * @return string
      */
-    function dump(ResultInterface $result);
+    public function dump(ResultInterface $result);
 }

src/Geocoder/Dumper/GeoJsonDumper.php

@@ -19,7 +19,7 @@
 class GeoJsonDumper implements DumperInterface
 {
     /**
-     * @param \Geocoder\Result\ResultInterface $result
+     * @param  \Geocoder\Result\ResultInterface $result
      * @return string
      */
     public function dump(ResultInterface $result)

src/Geocoder/Dumper/GpxDumper.php

@@ -19,7 +19,7 @@
 class GpxDumper implements DumperInterface
 {
     /**
-     * @param \Geocoder\Result\ResultInterface $result
+     * @param  \Geocoder\Result\ResultInterface $result
      * @return string
      */
     public function dump(ResultInterface $result)
@@ -61,7 +61,7 @@ public function dump(ResultInterface $result)
     }
 
     /**
-     * @param \Geocoder\Result\ResultInterface $result
+     * @param  \Geocoder\Result\ResultInterface $result
      * @return string
      */
     protected function formatName(ResultInterface $result)

src/Geocoder/Dumper/KmlDumper.php

@@ -19,7 +19,7 @@
 class KmlDumper extends GpxDumper
 {
     /**
-     * @param \Geocoder\Result\ResultInterface $result
+     * @param  \Geocoder\Result\ResultInterface $result
      * @return string
      */
     public function dump(ResultInterface $result)

src/Geocoder/Dumper/WkbDumper.php

@@ -19,7 +19,7 @@
 class WkbDumper implements DumperInterface
 {
     /**
-     * @param \Geocoder\Result\ResultInterface $result
+     * @param  \Geocoder\Result\ResultInterface $result
      * @return string
      */
     public function dump(ResultInterface $result)

src/Geocoder/Dumper/WktDumper.php

@@ -19,7 +19,7 @@
 class WktDumper implements DumperInterface
 {
     /**
-     * @param \Geocoder\Result\ResultInterface $result
+     * @param  \Geocoder\Result\ResultInterface $result
      * @return string
      */
     public function dump(ResultInterface $result)

src/Geocoder/Formatter/FormatterInterface.php

@@ -40,8 +40,8 @@ interface FormatterInterface
     /**
      * Format a ResultInterface object using a given format string.
      *
-     * @param string $format
+     * @param  string $format
      * @return string
      */
-    function format($format);
+    public function format($format);
 }

src/Geocoder/Geocoder.php

@@ -76,7 +76,7 @@ public function reverse($latitude, $longitude)
     /**
      * Registers a provider.
      *
-     * @param \Geocoder\Provider\ProviderInterface $provider
+     * @param  \Geocoder\Provider\ProviderInterface $provider
      * @return \Geocoder\GeocoderInterface
      */
     public function registerProvider(ProviderInterface $provider)
@@ -91,7 +91,7 @@ public function registerProvider(ProviderInterface $provider)
     /**
      * Registers a set of providers.
      *
-     * @param array $providers
+     * @param  array                       $providers
      * @return \Geocoder\GeocoderInterface
      */
     public function registerProviders(array $providers = array())
@@ -106,7 +106,7 @@ public function registerProviders(array $providers = array())
     /**
      * Sets the provider to use.
      *
-     * @param string $name A provider's name
+     * @param  string                      $name A provider's name
      * @return \Geocoder\GeocoderInterface
      */
     public function using($name)
@@ -147,7 +147,7 @@ protected function getProvider()
     }
 
     /**
-     * @param array $data An array of data.
+     * @param  array                     $data An array of data.
      * @return \Geocoder\Result\Geocoded
      */
     protected function returnResult(array $data = array())

src/Geocoder/GeocoderInterface.php

@@ -18,17 +18,17 @@ interface GeocoderInterface
     /**
      * Geocode a given value.
      *
-     * @param string $value A value to geocode.
-     * @return \Geocoder\Result\Geocoded    A Geocoded result object.
+     * @param  string                    $value A value to geocode.
+     * @return \Geocoder\Result\Geocoded A Geocoded result object.
      */
-    function geocode($value);
+    public function geocode($value);
 
     /**
      * Reverse geocode given latitude and longitude values.
      *
-     * @param double $latitude  Latitude.
-     * @param double $longitude Longitude.
-     * @return \Geocoder\Result\Geocoded    A Geocoded result object.
+     * @param  double                    $latitude  Latitude.
+     * @param  double                    $longitude Longitude.
+     * @return \Geocoder\Result\Geocoded A Geocoded result object.
      */
-    function reverse($latitude, $longitude);
+    public function reverse($latitude, $longitude);
 }

src/Geocoder/HttpAdapter/HttpAdapterInterface.php

@@ -20,12 +20,12 @@ interface HttpAdapterInterface
      *
      * @return string
      */
-    function getContent($url);
+    public function getContent($url);
 
     /**
      * Returns the name of the HTTP Adapter.
      *
      * @return string
      */
-    function getName();
+    public function getName();
 }

src/Geocoder/Provider/BingMapsProvider.php

@@ -87,7 +87,7 @@ public function getName()
     }
 
     /**
-     * @param string $query
+     * @param  string $query
      * @return array
      */
     protected function executeQuery($query)

src/Geocoder/Provider/CloudMadeProvider.php

@@ -85,7 +85,7 @@ public function getName()
     }
 
     /**
-     * @param string $query
+     * @param  string $query
      * @return array
      */
     protected function executeQuery($query)

src/Geocoder/Provider/FreeGeoIpProvider.php

@@ -54,7 +54,7 @@ public function getName()
     }
 
     /**
-     * @param string $query
+     * @param  string $query
      * @return array
      */
     protected function executeQuery($query)
@@ -65,7 +65,7 @@ protected function executeQuery($query)
             return $this->getDefaults();
         }
 
-        $data = (array)json_decode($content);
+        $data = (array) json_decode($content);
 
         if (empty($data)) {
             return $this->getDefaults();

src/Geocoder/Provider/GoogleMapsProvider.php

@@ -56,7 +56,7 @@ public function getName()
     }
 
     /**
-     * @param string $query
+     * @param  string $query
      * @return array
      */
     protected function executeQuery($query)
@@ -122,9 +122,9 @@ protected function executeQuery($query)
     /**
      * Update current resultset with given key/value.
      *
-     * @param array  $resultset resultset to update.
-     * @param String $type      component type.
-     * @param object $values    the component values;
+     * @param  array  $resultset resultset to update.
+     * @param  String $type      component type.
+     * @param  object $values    the component values;
      * @return array
      */
     protected function updateAddressComponent(&$resultset, $type, $values)

src/Geocoder/Provider/HostIpProvider.php

@@ -54,7 +54,7 @@ public function getName()
     }
 
     /**
-     * @param string $query
+     * @param  string $query
      * @return array
      */
     protected function executeQuery($query)

src/Geocoder/Provider/IpInfoDbProvider.php

@@ -75,7 +75,7 @@ public function getName()
     }
 
     /**
-     * @param string $query
+     * @param  string $query
      * @return array
      */
     protected function executeQuery($query)
@@ -86,7 +86,7 @@ protected function executeQuery($query)
             return $this->getDefaults();
         }
 
-        $data = (array)json_decode($content);
+        $data = (array) json_decode($content);
 
         if (empty($data) || 'OK' !== $data['statusCode']) {
             return $this->getDefaults();

src/Geocoder/Provider/OpenStreetMapsProvider.php

@@ -139,7 +139,7 @@ public function getName()
     }
 
     /**
-     * @param string $query
+     * @param  string $query
      * @return string
      */
     protected function executeQuery($query)

src/Geocoder/Provider/ProviderInterface.php

@@ -18,23 +18,23 @@ interface ProviderInterface
     /**
      * Returns an associative array with data treated by the provider.
      *
-     * @param string $address An address (IP or street).
+     * @param  string $address An address (IP or street).
      * @return array
      */
-    function getGeocodedData($address);
+    public function getGeocodedData($address);
 
     /**
      * Returns an associative array with data treated by the provider.
      *
-     * @param array $coordinates Coordinates (latitude, longitude).
+     * @param  array $coordinates Coordinates (latitude, longitude).
      * @return array
      */
-    function getReversedData(array $coordinates);
+    public function getReversedData(array $coordinates);
 
     /**
      * Returns the provider's name.
      *
      * @return string
      */
-    function getName();
+    public function getName();
 }

src/Geocoder/Provider/YahooProvider.php

@@ -86,7 +86,7 @@ public function getName()
     }
 
     /**
-     * @param string $query
+     * @param  string $query
      * @return array
      */
     protected function executeQuery($query)
@@ -103,9 +103,9 @@ protected function executeQuery($query)
 
         $json = json_decode($content);
         if (isset($json->ResultSet) && isset($json->ResultSet->Results)) {
-            $data = (array)$json->ResultSet->Results[0];
+            $data = (array) $json->ResultSet->Results[0];
         } elseif (isset($json->ResultSet) && isset($json->ResultSet->Result)) {
-            $data = (array)$json->ResultSet->Result;
+            $data = (array) $json->ResultSet->Result;
         } else {
             return $this->getDefaults();
         }

src/Geocoder/Result/Geocoded.php

@@ -325,7 +325,7 @@ public function offsetUnset($offset)
     /**
      * Format a string data.
      *
-     * @param string $str A string.
+     * @param  string $str A string.
      * @return string
      */
     private function formatString($str)