refactor: Remove older versions (#53)

pulkitjalan · web-flow · commit edbeb39a0985 · 2023-04-10T08:14:28.000+01:00
* refactor: Remove older versions

* 🎨

* rename file

* rename file

* Fix styling

* patch

* Fix styling

* remove cache

* update ignore

* exclude 8.0 and laravel 10
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -3,27 +3,19 @@ name: Check & fix styling
 on: [push]
 
 jobs:
-  style:
-    runs-on: ubuntu-latest
+    php-cs-fixer:
+        runs-on: ubuntu-latest
 
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v3
 
-      - name: Fix style
-        uses: docker://oskarstark/php-cs-fixer-ga
-        with:
-          args: --config=.php_cs --allow-risky=yes
+            - name: Run PHP CS Fixer
+              uses: docker://oskarstark/php-cs-fixer-ga
+              with:
+                  args: --config=.php_cs.dist.php --allow-risky=yes
 
-      - name: Extract branch name
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
-        id: extract_branch
-
-      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v2.3.0
-        with:
-          commit_message: Fix styling
-          branch: ${{ steps.extract_branch.outputs.branch }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            - name: Commit changes
+              uses: stefanzweifel/git-auto-commit-action@v4
+              with:
+                  commit_message: Fix styling
diff --git a/.github/workflows/run-tests-L7.yml b/.github/workflows/run-tests-L7.yml
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,4 +1,4 @@
-name: "Run Tests - Current"
+name: "Run Tests"
 
 on: [push]
 
@@ -9,18 +9,21 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, 7.3, 8.1]
-        laravel: [8.*, 10.*]
+        php: [8.0, 8.1, 8.2]
+        laravel: [9.*, 10.*]
         dependency-version: [prefer-lowest, prefer-stable]
+        exclude:
+          - laravel: 10.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.composer/cache/files
           key: dependencies-laravel-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
@@ -40,7 +43,7 @@ jobs:
       - name: Execute tests
         run: vendor/bin/phpunit tests
 
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: build
+          directory: build
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,10 @@
-/vendor
+build
 composer.lock
-.DS_Store
-/build
+vendor
+.php_cs.cache
+coverage
+.phpunit.result.cache
 /.idea
 /.vscode
-.phpunit.result.cache
-.php_cs.cache
+.php-cs-fixer.cache
+.DS_Store
diff --git a/.php_cs.dist.php b/.php_cs.dist.php
@@ -13,14 +13,14 @@
     ->ignoreDotFiles(true)
     ->ignoreVCS(true);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sortAlgorithm' => 'length'],
+        'ordered_imports' => ['sort_algorithm' => 'length'],
         'no_unused_imports' => true,
         'not_operator_with_successor_space' => true,
-        'trailing_comma_in_multiline_array' => true,
+        'trailing_comma_in_multiline' => true,
         'phpdoc_scalar' => true,
         'unary_operator_spaces' => true,
         'binary_operator_spaces' => true,
@@ -29,9 +29,15 @@
         ],
         'phpdoc_single_line_var_spacing' => true,
         'phpdoc_var_without_name' => true,
+        'class_attributes_separation' => [
+            'elements' => [
+                'method' => 'one',
+            ],
+        ],
         'method_argument_space' => [
             'on_multiline' => 'ensure_fully_multiline',
             'keep_multiple_spaces_after_comma' => true,
-        ]
+        ],
+        'single_trait_insert_per_statement' => true,
     ])
     ->setFinder($finder);
diff --git a/composer.json b/composer.json
@@ -16,15 +16,15 @@
         }
     ],
     "require": {
-        "php": "^7.2.5|^8.0",
-        "illuminate/support": "^5.8|^6|^7|^8|^9|^10.0",
-        "illuminate/console": "^5.8|^6|^7|^8|^9|^10.0",
-        "guzzlehttp/guzzle": "^6.5|^7",
-        "geoip2/geoip2": "^2.11"
+        "php": "^8.0",
+        "illuminate/support": "^9|^10.0",
+        "illuminate/console": "^9|^10.0",
+        "guzzlehttp/guzzle": "^7.2",
+        "geoip2/geoip2": "^2.13"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.0|^9.0",
-        "mockery/mockery": "^1.2.3"
+        "phpunit/phpunit": "^9.5.24",
+        "mockery/mockery": "^1.5"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Drivers/IpStackDriver.php b/src/Drivers/IpStackDriver.php
@@ -38,8 +38,8 @@ public function get($ip)
             'city' => Arr::get($data, 'city'),
             'country' => Arr::get($data, 'country_name'),
             'countryCode' => Arr::get($data, 'country_code'),
-            'latitude' => (float) number_format(Arr::get($data, 'latitude'), 5),
-            'longitude' => (float) number_format(Arr::get($data, 'longitude'), 5),
+            'latitude' => (float) number_format(Arr::get($data, 'latitude', 0), 5),
+            'longitude' => (float) number_format(Arr::get($data, 'longitude', 0), 5),
             'region' => Arr::get($data, 'region_name'),
             'regionCode' => Arr::get($data, 'region_code'),
             'timezone' => Arr::get($data, 'time_zone.id'),
diff --git a/src/Drivers/MaxmindApiDriver.php b/src/Drivers/MaxmindApiDriver.php
@@ -20,13 +20,13 @@ protected function create()
         $userId = Arr::get($this->config, 'user_id', false);
         $licenseKey = Arr::get($this->config, 'license_key', false);
         $host = Arr::get($this->config, 'host');
-        $locales = Arr::get($this->config, 'locales');
+        $locales = Arr::get($this->config, 'locales', ['en']);
 
         // check and make sure they are set
         if (! $userId || ! $licenseKey) {
             throw new InvalidCredentialsException();
         }
 
-        return new Client((int) $userId, $licenseKey, $locales, ['host'=>$host]);
+        return new Client((int) $userId, $licenseKey, $locales, ['host' => $host]);
     }
 }
diff --git a/src/Drivers/TelizeDriver.php b/src/Drivers/TelizeDriver.php
@@ -38,8 +38,8 @@ public function get($ip)
             'city' => Arr::get($data, 'city'),
             'country' => Arr::get($data, 'country'),
             'countryCode' => Arr::get($data, 'country_code'),
-            'latitude' => (float) number_format(Arr::get($data, 'latitude'), 5),
-            'longitude' => (float) number_format(Arr::get($data, 'longitude'), 5),
+            'latitude' => (float) number_format(Arr::get($data, 'latitude', 0), 5),
+            'longitude' => (float) number_format(Arr::get($data, 'longitude', 0), 5),
             'region' => Arr::get($data, 'region'),
             'regionCode' => Arr::get($data, 'region_code'),
             'timezone' => Arr::get($data, 'timezone'),
diff --git a/tests/Drivers/IPApiDriverTest.php b/tests/Drivers/IPApiDriverTest.php
@@ -50,7 +50,7 @@ public function test_get_multiple_ipaddress()
         $ip = $geoip->getIp();
 
         $this->assertEquals($this->validIp, $ip);
-        $this->assertTrue(! (filter_var($ip, FILTER_VALIDATE_IP)) === false);
+        $this->assertTrue(! filter_var($ip, FILTER_VALIDATE_IP) === false);
     }
 
     public function test_get_random_ipaddress()
@@ -64,7 +64,7 @@ public function test_get_random_ipaddress()
         $ip = $geoip->getIp();
 
         $this->assertNotEquals($this->invalidIp, $ip);
-        $this->assertTrue(! (filter_var($ip, FILTER_VALIDATE_IP)) === false);
+        $this->assertTrue(! filter_var($ip, FILTER_VALIDATE_IP) === false);
     }
 
     public function test_get_non_random_ipaddress()
@@ -78,7 +78,7 @@ public function test_get_non_random_ipaddress()
         $ip = $geoip->getIp();
 
         $this->assertEquals($this->invalidIp, $ip);
-        $this->assertTrue(! (filter_var($ip, FILTER_VALIDATE_IP)) === false);
+        $this->assertTrue(! filter_var($ip, FILTER_VALIDATE_IP) === false);
     }
 
     public function test_ip_api_pro_exception()

Original file line number	Diff line number	Diff line change
`@@ -20,13 +20,13 @@ protected function create()`
`20`	`20`	`$userId = Arr::get($this->config, 'user_id', false);`
`21`	`21`	`$licenseKey = Arr::get($this->config, 'license_key', false);`
`22`	`22`	`$host = Arr::get($this->config, 'host');`
`23`		`- $locales = Arr::get($this->config, 'locales');`
	`23`	`+ $locales = Arr::get($this->config, 'locales', ['en']);`
`24`	`24`
`25`	`25`	`// check and make sure they are set`
`26`	`26`	`if (! $userId \|\| ! $licenseKey) {`
`27`	`27`	`throw new InvalidCredentialsException();`
`28`	`28`	`}`
`29`	`29`
`30`		`- return new Client((int) $userId, $licenseKey, $locales, ['host'=>$host]);`
	`30`	`+ return new Client((int) $userId, $licenseKey, $locales, ['host' => $host]);`
`31`	`31`	`}`
`32`	`32`	`}`