Merge pull request #156 from maxmind/greg/fix-linting-issues

Run new php-cs-fixer against code

Author: horgh

bin/benchmark.php

@@ -11,7 +11,7 @@
 $count = 40000;
 $startTime = microtime(true);
 for ($i = 0; $i < $count; $i++) {
-    $ip = long2ip(rand(0, pow(2, 32) - 1));
+    $ip = long2ip(rand(0, 2 ** 32 - 1));
     try {
         $t = $reader->city($ip);
     } catch (AddressNotFoundException $e) {

examples/benchmark.php

@@ -10,7 +10,7 @@
 $count = 500000;
 $startTime = microtime(true);
 for ($i = 0; $i < $count; ++$i) {
-    $ip = long2ip(rand(0, pow(2, 32) - 1));
+    $ip = long2ip(rand(0, 2 ** 32 - 1));
     try {
         $t = $reader->city($ip);
     } catch (\GeoIp2\Exception\AddressNotFoundException $e) {

src/Database/Reader.php

@@ -258,7 +258,7 @@ private function getRecord(string $class, string $type, string $ipAddress): arra
      *
      * @return \MaxMind\Db\Reader\Metadata object for the database
      */
-    public function metadata(): \MaxMind\Db\Reader\Metadata
+    public function metadata(): DbReader\Metadata
     {
         return $this->dbReader->metadata();
     }

src/Model/City.php

@@ -69,10 +69,9 @@ private function createSubdivisions(array $raw, array $locales): void
         }
 
         foreach ($raw['subdivisions'] as $sub) {
-            array_push(
-                $this->subdivisions,
+            $this->subdivisions[] =
                 new \GeoIp2\Record\Subdivision($sub, $locales)
-            );
+            ;
         }
     }
 

src/ProviderInterface.php

@@ -11,12 +11,12 @@ interface ProviderInterface
      *
      * @return \GeoIp2\Model\Country a Country model for the requested IP address
      */
-    public function country(string $ipAddress): \GeoIp2\Model\Country;
+    public function country(string $ipAddress): Model\Country;
 
     /**
      * @param string $ipAddress an IPv4 or IPv6 address to lookup
      *
      * @return \GeoIp2\Model\City a City model for the requested IP address
      */
-    public function city(string $ipAddress): \GeoIp2\Model\City;
+    public function city(string $ipAddress): Model\City;
 }

tests/bootstrap.php

@@ -3,7 +3,7 @@
 declare(strict_types=1);
 
 if (!$loader = @include __DIR__ . '/../vendor/autoload.php') {
-    die('Project dependencies missing');
+    exit('Project dependencies missing');
 }
 
 $loader->add('GeoIp2\Test', __DIR__);