Merge pull request #159 from maxmind/greg/php-cs-fixer

Update php-cs-fixer

Author: rafl

.php_cs

@@ -5,12 +5,20 @@ return PhpCsFixer\Config::create()
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
+        '@PhpCsFixer' => true,
+        '@PSR1' => true,
+        '@PSR2' => true,
+        '@PSR12' => true,
+        '@PSR12:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'combine_consecutive_unsets' => true,
         'concat_space' => [ 'spacing' => 'one'],
+        'explicit_string_variable' => false,
+        'fopen_flags' => ['b_mode' => true],
         'heredoc_to_nowdoc' => true,
         'increment_style' => false,
-        'list_syntax' => ['syntax' => 'long'],
+        'list_syntax' => ['syntax' => 'short'],
+        'multiline_whitespace_before_semicolons' => false,
         'no_extra_consecutive_blank_lines' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'],
         'no_short_echo_tag' => true,
         'no_unreachable_default_argument_value' => true,
@@ -23,6 +31,7 @@ return PhpCsFixer\Config::create()
         'phpdoc_add_missing_param_annotation' => true,
         'phpdoc_no_alias_tag' => false,
         'phpdoc_order' => true,
+        'phpdoc_types_order' => ['sort_algorithm' => 'alpha', 'null_adjustment' => 'always_last'],
         'semicolon_after_instruction' => true,
         'single_line_throw' => false,
         'strict_comparison' => true,
@@ -31,6 +40,7 @@ return PhpCsFixer\Config::create()
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()
+            ->exclude('ext')
             ->in(__DIR__)
     )
 ;

bin/benchmark.php

@@ -10,8 +10,9 @@
 $reader = new Reader('GeoLite2-City.mmdb');
 $count = 40000;
 $startTime = microtime(true);
-for ($i = 0; $i < $count; $i++) {
+for ($i = 0; $i < $count; ++$i) {
     $ip = long2ip(rand(0, 2 ** 32 - 1));
+
     try {
         $t = $reader->city($ip);
     } catch (AddressNotFoundException $e) {

dev-bin/phar-test.php

@@ -12,4 +12,5 @@
 }
 
 echo 'Problem with Phar!';
+
 exit(1);

examples/benchmark.php

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

src/Database/Reader.php

@@ -218,7 +218,7 @@ public function isp(string $ipAddress): \GeoIp2\Model\Isp
 
     private function modelFor(string $class, string $type, string $ipAddress): AbstractModel
     {
-        list($record, $prefixLen) = $this->getRecord($class, $type, $ipAddress);
+        [$record, $prefixLen] = $this->getRecord($class, $type, $ipAddress);
 
         $record['traits']['ip_address'] = $ipAddress;
         $record['traits']['prefix_len'] = $prefixLen;
@@ -230,7 +230,7 @@ private function modelFor(string $class, string $type, string $ipAddress): Abstr
 
     private function flatModelFor(string $class, string $type, string $ipAddress): AbstractModel
     {
-        list($record, $prefixLen) = $this->getRecord($class, $type, $ipAddress);
+        [$record, $prefixLen] = $this->getRecord($class, $type, $ipAddress);
 
         $record['ip_address'] = $ipAddress;
         $record['prefix_len'] = $prefixLen;
@@ -243,11 +243,12 @@ private function getRecord(string $class, string $type, string $ipAddress): arra
     {
         if (strpos($this->dbType, $type) === false) {
             $method = lcfirst($class);
+
             throw new \BadMethodCallException(
                 "The $method method cannot be used to open a {$this->dbType} database"
             );
         }
-        list($record, $prefixLen) = $this->dbReader->getWithPrefixLen($ipAddress);
+        [$record, $prefixLen] = $this->dbReader->getWithPrefixLen($ipAddress);
         if ($record === null) {
             throw new AddressNotFoundException(
                 "The address $ipAddress is not in the database."

src/Model/AbstractModel.php

@@ -47,7 +47,7 @@ protected function get(string $field)
     public function __get(string $attr)
     {
         if ($attr !== 'instance' && property_exists($this, $attr)) {
-            return $this->$attr;
+            return $this->{$attr};
         }
 
         throw new \RuntimeException("Unknown attribute: $attr");
@@ -58,7 +58,7 @@ public function __get(string $attr)
      */
     public function __isset(string $attr): bool
     {
-        return $attr !== 'instance' && isset($this->$attr);
+        return $attr !== 'instance' && isset($this->{$attr});
     }
 
     public function jsonSerialize(): array

src/Model/City.php

@@ -91,7 +91,7 @@ private function createSubdivisions(array $raw, array $locales): void
     public function __get(string $attr)
     {
         if ($attr === 'mostSpecificSubdivision') {
-            return $this->$attr();
+            return $this->{$attr}();
         }
 
         return parent::__get($attr);

src/Record/AbstractRecord.php

@@ -31,20 +31,22 @@ public function __get(string $attr)
 
         if ($this->__isset($attr)) {
             return $this->record[$key];
-        } elseif ($this->validAttribute($attr)) {
+        }
+        if ($this->validAttribute($attr)) {
             if (preg_match('/^is_/', $key)) {
                 return false;
             }
 
             return null;
         }
+
         throw new \RuntimeException("Unknown attribute: $attr");
     }
 
     public function __isset(string $attr): bool
     {
-        return $this->validAttribute($attr) &&
-             isset($this->record[$this->attributeToKey($attr)]);
+        return $this->validAttribute($attr)
+             && isset($this->record[$this->attributeToKey($attr)]);
     }
 
     private function attributeToKey(string $attr): string

src/Record/Traits.php

@@ -139,7 +139,7 @@ class Traits extends AbstractRecord
 
     public function __construct(?array $record)
     {
-        if (!isset($record['network']) && isset($record['ip_address']) && isset($record['prefix_len'])) {
+        if (!isset($record['network']) && isset($record['ip_address'], $record['prefix_len'])) {
             $record['network'] = Util::cidr($record['ip_address'], $record['prefix_len']);
         }
 

src/WebService/Client.php

@@ -61,7 +61,7 @@ class Client implements ProviderInterface
      */
     private static $basePath = '/geoip/v2.1';
 
-    const VERSION = 'v2.11.0';
+    public const VERSION = 'v2.11.0';
 
     /**
      * Constructor.