Pullrequests/keenminded/forked (#62)

* Update composer.json

Upgraded torann/geoip to v3.

* Update Timezone.php

Preventing ide-helper from wrongly qualifying the \Carbon\Carbon as \JamesMills\LaravelTimezone\Carbon.

* Update Timezone.php

Preventing ide-helper issues with wrongly qualified Carbon class.

* Updating the required version of PHP to 7.2

* Using psr2 for styleci preset to match php_codesniffer config

* Upping requirement to php 7.4

Co-authored-by: Ty N <keenminded@users.noreply.github.com>

Author: jamesmills

composer.json

@@ -13,9 +13,9 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=7.4",
         "laravel/framework": "5.6.* || 5.7.* || 5.8.* || ^6 || ^7 || ^8",
-        "torann/geoip": "^1.0",
+        "torann/geoip": "^3.0",
         "nesbot/carbon": "^1.0 || ^2.0"
     },
     "autoload": {

src/Timezone.php

@@ -7,7 +7,7 @@
 class Timezone
 {
     /**
-     * @param  Carbon|null  $date
+     * @param  Carbon\Carbon|null  $date
      * @param  null  $format
      * @param  bool  $format_timezone
      * @return string
@@ -37,15 +37,15 @@ public function convertToLocal(?Carbon $date, $format = null, $format_timezone =
 
     /**
      * @param $date
-     * @return Carbon
+     * @return Carbon\Carbon
      */
     public function convertFromLocal($date) : Carbon
     {
         return Carbon::parse($date, auth()->user()->timezone)->setTimezone('UTC');
     }
 
     /**
-     * @param  Carbon  $date
+     * @param  Carbon\Carbon  $date
      * @return string
      */
     private function formatTimezone(Carbon $date) : string