fixes

Author: pulkitjalan

.gitignore

@@ -2,4 +2,6 @@
 composer.lock
 .DS_Store
 /build
-.idea
+/.idea
+/.vscode
+.phpunit.result.cache

.php_cs

@@ -8,13 +8,16 @@ return PhpCsFixer\Config::create()
         'method_separation' => true,
         'no_multiline_whitespace_before_semicolons' => true,
         'single_quote' => true,
+        'ordered_imports' => [
+            'sort_algorithm' => 'length',
+        ],
 
         'binary_operator_spaces' => [
             'align_double_arrow' => false,
             'align_equals' => false,
         ],
         'blank_line_after_opening_tag' => true,
-        'blank_line_before_return' => true, // DEPRECATED: use blank_line_before_statement instead.
+        'blank_line_before_return' => true,
         'blank_line_before_statement' => [
             'statements' => [
                 'break',
@@ -28,21 +31,22 @@ return PhpCsFixer\Config::create()
         'braces' => [
             'allow_single_line_closure' => true,
         ],
-        // 'cast_spaces' => true,
-        // 'class_definition' => ['singleLine' => true],
+        'cast_spaces' => [
+            'space' => 'single',
+        ],
         'concat_space' => ['spacing' => 'none'],
         'declare_equal_normalize' => true,
         'function_typehint_space' => true,
         'hash_to_slash_comment' => true,
         'include' => true,
         'lowercase_cast' => true,
-        // 'native_function_casing' => true,
+        'native_function_casing' => true,
         // 'new_with_braces' => true,
-        // 'no_blank_lines_after_class_opening' => true,
-        // 'no_blank_lines_after_phpdoc' => true,
-        // 'no_empty_comment' => true,
-        // 'no_empty_phpdoc' => true,
-        // 'no_empty_statement' => true,
+        'no_blank_lines_after_class_opening' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_empty_comment' => true,
+        'no_empty_phpdoc' => true,
+        'no_empty_statement' => true,
         'no_extra_consecutive_blank_lines' => [
             'curly_brace_block',
             'extra',
@@ -69,18 +73,20 @@ return PhpCsFixer\Config::create()
         // 'normalize_index_brace' => true,
         'object_operator_without_whitespace' => true,
         // 'php_unit_fqcn_annotation' => true,
-        // 'phpdoc_align' => true,
+        'phpdoc_align' => [
+            'align' => 'vertical',
+        ],
         // 'phpdoc_annotation_without_dot' => true,
-        // 'phpdoc_indent' => true,
+        'phpdoc_indent' => true,
         // 'phpdoc_inline_tag' => true,
         // 'phpdoc_no_access' => true,
         // 'phpdoc_no_alias_tag' => true,
         // 'phpdoc_no_empty_return' => true,
-        // 'phpdoc_no_package' => true,
+        'phpdoc_no_package' => true,
         // 'phpdoc_no_useless_inheritdoc' => true,
         // 'phpdoc_return_self_reference' => true,
-        // 'phpdoc_scalar' => true,
-        // 'phpdoc_separation' => true,
+        'phpdoc_scalar' => true,
+        'phpdoc_separation' => true,
         // 'phpdoc_single_line_var_spacing' => true,
         // 'phpdoc_summary' => true,
         // 'phpdoc_to_comment' => true,
@@ -90,11 +96,11 @@ return PhpCsFixer\Config::create()
         // 'pre_increment' => true,
         // 'return_type_declaration' => true,
         // 'self_accessor' => true,
-        // 'short_scalar_cast' => true,
+        'short_scalar_cast' => true,
         'single_blank_line_before_namespace' => true,
         // 'single_class_element_per_statement' => true,
-        // 'space_after_semicolon' => true,
-        // 'standardize_not_equals' => true,
+        'space_after_semicolon' => true,
+        'standardize_not_equals' => true,
         'ternary_operator_spaces' => true,
         'trailing_comma_in_multiline_array' => true,
         'trim_array_spaces' => true,

.travis.yml

@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
   - 7.2
   - 7.3
 

README.md

@@ -19,7 +19,7 @@ GeoIP
 
 ## Requirements
 
-* PHP >= 7.0
+* PHP >= 7.2
 
 ## Installation
 

composer.json

@@ -17,8 +17,8 @@
         "geoip2/geoip2": "^2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
-        "mockery/mockery": "^1.0"
+        "phpunit/phpunit": "^8.3",
+        "mockery/mockery": "^1.2.3"
     },
     "autoload": {
         "psr-4": {

src/Drivers/IpStackDriver.php

@@ -2,8 +2,8 @@
 
 namespace PulkitJalan\GeoIP\Drivers;
 
-use GuzzleHttp\Exception\RequestException;
 use Illuminate\Support\Arr;
+use GuzzleHttp\Exception\RequestException;
 use PulkitJalan\GeoIP\Exceptions\InvalidCredentialsException;
 
 class IpStackDriver extends AbstractGeoIPDriver
@@ -15,7 +15,7 @@ public function __construct(array $config)
     {
         parent::__construct($config);
 
-        if (! array_get($this->config, 'key')) {
+        if (! Arr::get($this->config, 'key')) {
             throw new InvalidCredentialsException();
         }
     }

src/Drivers/MaxmindDriver.php

@@ -3,11 +3,11 @@
 namespace PulkitJalan\GeoIP\Drivers;
 
 use GeoIp2\Database\Reader;
-use GeoIp2\Exception\AddressNotFoundException;
-use GeoIp2\WebService\Client;
 use Illuminate\Support\Arr;
-use PulkitJalan\GeoIP\Exceptions\InvalidCredentialsException;
+use GeoIp2\WebService\Client;
+use GeoIp2\Exception\AddressNotFoundException;
 use PulkitJalan\GeoIP\Exceptions\InvalidDatabaseException;
+use PulkitJalan\GeoIP\Exceptions\InvalidCredentialsException;
 
 class MaxmindDriver extends AbstractGeoIPDriver
 {

src/Drivers/TelizeDriver.php

@@ -2,8 +2,8 @@
 
 namespace PulkitJalan\GeoIP\Drivers;
 
-use GuzzleHttp\Exception\RequestException;
 use Illuminate\Support\Arr;
+use GuzzleHttp\Exception\RequestException;
 use PulkitJalan\GeoIP\Exceptions\InvalidCredentialsException;
 
 class TelizeDriver extends AbstractGeoIPDriver
@@ -15,7 +15,7 @@ public function __construct(array $config)
     {
         parent::__construct($config);
 
-        if (! array_get($this->config, 'key')) {
+        if (! Arr::get($this->config, 'key')) {
             throw new InvalidCredentialsException();
         }
     }

src/GeoIPManager.php

@@ -4,10 +4,10 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use PulkitJalan\GeoIP\Drivers\IpStackDriver;
 use PulkitJalan\GeoIP\Drivers\IPApiDriver;
-use PulkitJalan\GeoIP\Drivers\MaxmindDriver;
 use PulkitJalan\GeoIP\Drivers\TelizeDriver;
+use PulkitJalan\GeoIP\Drivers\IpStackDriver;
+use PulkitJalan\GeoIP\Drivers\MaxmindDriver;
 use PulkitJalan\GeoIP\Exceptions\InvalidDriverException;
 
 class GeoIPManager

src/GeoIPUpdater.php

@@ -3,8 +3,8 @@
 namespace PulkitJalan\GeoIP;
 
 use Exception;
-use GuzzleHttp\Client as GuzzleClient;
 use Illuminate\Support\Arr;
+use GuzzleHttp\Client as GuzzleClient;
 
 class GeoIPUpdater
 {