Merge branch '2.x' of https://github.com/vormkracht10/laravel-google-analytics-v4 into 2.x

Baspa · Baspa · commit ffb5889add1d · 2025-06-24T18:29:11.000+02:00
diff --git a/src/Analytics.php b/src/Analytics.php
@@ -2,7 +2,6 @@
 
 namespace Backstage\Analytics;
 
-use Google\Analytics\Data\V1beta\BetaAnalyticsDataClient;
 use Backstage\Analytics\Service\GoogleAnalyticsService;
 use Backstage\Analytics\Traits\Analytics\DemographicAnalytics;
 use Backstage\Analytics\Traits\Analytics\DevicesAnalytics;
@@ -12,6 +11,7 @@
 use Backstage\Analytics\Traits\Analytics\UsersAnalytics;
 use Backstage\Analytics\Traits\Analytics\ViewsAnalytics;
 use Backstage\Analytics\Traits\ResponseFormatterTrait;
+use Google\Analytics\Data\V1beta\BetaAnalyticsDataClient;
 
 class Analytics
 {
diff --git a/src/Period.php b/src/Period.php
@@ -2,8 +2,8 @@
 
 namespace Backstage\Analytics;
 
-use Illuminate\Support\Carbon;
 use Backstage\Analytics\Exceptions\InvalidPeriod;
+use Illuminate\Support\Carbon;
 
 class Period
 {
diff --git a/src/Traits/Analytics/RealtimeAnalytics.php b/src/Traits/Analytics/RealtimeAnalytics.php
@@ -2,8 +2,8 @@
 
 namespace Backstage\Analytics\Traits\Analytics;
 
-use Illuminate\Support\Arr;
 use Backstage\Analytics\Period;
+use Illuminate\Support\Arr;
 
 trait RealtimeAnalytics
 {
diff --git a/src/Traits/Analytics/SessionsAnalytics.php b/src/Traits/Analytics/SessionsAnalytics.php
@@ -2,8 +2,8 @@
 
 namespace Backstage\Analytics\Traits\Analytics;
 
-use Illuminate\Support\Arr;
 use Backstage\Analytics\Period;
+use Illuminate\Support\Arr;
 
 trait SessionsAnalytics
 {
diff --git a/src/Traits/Analytics/UsersAnalytics.php b/src/Traits/Analytics/UsersAnalytics.php
@@ -2,8 +2,8 @@
 
 namespace Backstage\Analytics\Traits\Analytics;
 
-use Illuminate\Support\Arr;
 use Backstage\Analytics\Period;
+use Illuminate\Support\Arr;
 
 trait UsersAnalytics
 {
diff --git a/src/Traits/Analytics/ViewsAnalytics.php b/src/Traits/Analytics/ViewsAnalytics.php
@@ -2,9 +2,9 @@
 
 namespace Backstage\Analytics\Traits\Analytics;
 
-use Illuminate\Support\Arr;
 use Backstage\Analytics\Enums\Direction;
 use Backstage\Analytics\Period;
+use Illuminate\Support\Arr;
 
 trait ViewsAnalytics
 {
diff --git a/src/Traits/Google/DateRangeTrait.php b/src/Traits/Google/DateRangeTrait.php
@@ -2,8 +2,8 @@
 
 namespace Backstage\Analytics\Traits\Google;
 
-use Google\Analytics\Data\V1beta\DateRange;
 use Backstage\Analytics\Period;
+use Google\Analytics\Data\V1beta\DateRange;
 
 trait DateRangeTrait
 {
diff --git a/src/Traits/Google/OrderByTrait.php b/src/Traits/Google/OrderByTrait.php
@@ -2,10 +2,10 @@
 
 namespace Backstage\Analytics\Traits\Google;
 
+use Backstage\Analytics\Enums\Direction;
 use Google\Analytics\Data\V1beta\OrderBy;
 use Google\Analytics\Data\V1beta\OrderBy\DimensionOrderBy;
 use Google\Analytics\Data\V1beta\OrderBy\MetricOrderBy;
-use Backstage\Analytics\Enums\Direction;
 
 trait OrderByTrait
 {
diff --git a/src/Traits/ResponseFormatterTrait.php b/src/Traits/ResponseFormatterTrait.php
@@ -2,9 +2,9 @@
 
 namespace Backstage\Analytics\Traits;
 
+use Backstage\Analytics\AnalyticsResponse;
 use Google\Analytics\Data\V1beta\RunRealtimeReportResponse;
 use Google\Analytics\Data\V1beta\RunReportResponse;
-use Backstage\Analytics\AnalyticsResponse;
 
 trait ResponseFormatterTrait
 {
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,9 +2,9 @@
 
 namespace Backstage\Analytics\Tests;
 
+use Backstage\Analytics\AnalyticsServiceProvider;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Orchestra\Testbench\TestCase as Orchestra;
-use Backstage\Analytics\AnalyticsServiceProvider;
 
 class TestCase extends Orchestra
 {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Backstage\Analytics;`
`4`	`4`
`5`		`-use Illuminate\Support\Carbon;`
`6`	`5`	`use Backstage\Analytics\Exceptions\InvalidPeriod;`
	`6`	`+use Illuminate\Support\Carbon;`
`7`	`7`
`8`	`8`	`class Period`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Backstage\Analytics\Traits\Analytics;`
`4`	`4`
`5`		`-use Illuminate\Support\Arr;`
`6`	`5`	`use Backstage\Analytics\Period;`
	`6`	`+use Illuminate\Support\Arr;`
`7`	`7`
`8`	`8`	`trait RealtimeAnalytics`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Backstage\Analytics\Traits\Analytics;`
`4`	`4`
`5`		`-use Illuminate\Support\Arr;`
`6`	`5`	`use Backstage\Analytics\Enums\Direction;`
`7`	`6`	`use Backstage\Analytics\Period;`
	`7`	`+use Illuminate\Support\Arr;`
`8`	`8`
`9`	`9`	`trait ViewsAnalytics`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Backstage\Analytics\Traits\Google;`
`4`	`4`
`5`		`-use Google\Analytics\Data\V1beta\DateRange;`
`6`	`5`	`use Backstage\Analytics\Period;`
	`6`	`+use Google\Analytics\Data\V1beta\DateRange;`
`7`	`7`
`8`	`8`	`trait DateRangeTrait`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace Backstage\Analytics\Traits\Google;`
`4`	`4`
	`5`	`+use Backstage\Analytics\Enums\Direction;`
`5`	`6`	`use Google\Analytics\Data\V1beta\OrderBy;`
`6`	`7`	`use Google\Analytics\Data\V1beta\OrderBy\DimensionOrderBy;`
`7`	`8`	`use Google\Analytics\Data\V1beta\OrderBy\MetricOrderBy;`
`8`		`-use Backstage\Analytics\Enums\Direction;`
`9`	`9`
`10`	`10`	`trait OrderByTrait`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Backstage\Analytics\Traits;`
`4`	`4`
	`5`	`+use Backstage\Analytics\AnalyticsResponse;`
`5`	`6`	`use Google\Analytics\Data\V1beta\RunRealtimeReportResponse;`
`6`	`7`	`use Google\Analytics\Data\V1beta\RunReportResponse;`
`7`		`-use Backstage\Analytics\AnalyticsResponse;`
`8`	`8`
`9`	`9`	`trait ResponseFormatterTrait`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace Backstage\Analytics\Tests;`
`4`	`4`
	`5`	`+use Backstage\Analytics\AnalyticsServiceProvider;`
`5`	`6`	`use Illuminate\Database\Eloquent\Factories\Factory;`
`6`	`7`	`use Orchestra\Testbench\TestCase as Orchestra;`
`7`		`-use Backstage\Analytics\AnalyticsServiceProvider;`
`8`	`8`
`9`	`9`	`class TestCase extends Orchestra`
`10`	`10`	`{`