From 35b1c4244f878a5b8c9af7ad6fa18925df20b47e Mon Sep 17 00:00:00 2001 From: Ty N Date: Thu, 7 Jan 2021 23:04:15 -0600 Subject: [PATCH 1/3] Update composer.json Upgraded torann/geoip to v3. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7406678..42018e4 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "require": { "php": ">=7.1", "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": { From 79757936ef7cc139d9568ad70024a43e59f462d0 Mon Sep 17 00:00:00 2001 From: Ty N Date: Thu, 14 Jan 2021 01:46:48 -0600 Subject: [PATCH 2/3] Update Timezone.php Preventing ide-helper from wrongly qualifying the \Carbon\Carbon as \JamesMills\LaravelTimezone\Carbon. --- src/Timezone.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Timezone.php b/src/Timezone.php index 7e9c9d9..bf2607d 100644 --- a/src/Timezone.php +++ b/src/Timezone.php @@ -2,7 +2,7 @@ namespace JamesMills\LaravelTimezone; -use Carbon\Carbon; +use \Carbon\Carbon; class Timezone { From bd38039bdb5892b83e468821d672ebdc32d31be9 Mon Sep 17 00:00:00 2001 From: Ty N Date: Thu, 14 Jan 2021 01:49:58 -0600 Subject: [PATCH 3/3] Update Timezone.php Preventing ide-helper issues with wrongly qualified Carbon class. --- src/Timezone.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Timezone.php b/src/Timezone.php index bf2607d..bc2b6d1 100644 --- a/src/Timezone.php +++ b/src/Timezone.php @@ -2,12 +2,12 @@ namespace JamesMills\LaravelTimezone; -use \Carbon\Carbon; +use Carbon\Carbon; class Timezone { /** - * @param Carbon|null $date + * @param Carbon\Carbon|null $date * @param null $format * @param bool $format_timezone * @return string @@ -37,7 +37,7 @@ public function convertToLocal(?Carbon $date, $format = null, $format_timezone = /** * @param $date - * @return Carbon + * @return Carbon\Carbon */ public function convertFromLocal($date) : Carbon { @@ -45,7 +45,7 @@ public function convertFromLocal($date) : Carbon } /** - * @param Carbon $date + * @param Carbon\Carbon $date * @return string */ private function formatTimezone(Carbon $date) : string