Laravel 11 support (#2)

* Laravel 11 support

* Fix styling

---------

Co-authored-by: tjardoo <tjardoo@users.noreply.github.com>

.github/workflows/phpstan.yml

@@ -1,17 +1,17 @@
-name: PHPStan
+name: Run PHPStan
 
 on:
   push:
-    paths:
-      - '**.php'
-      - 'phpstan.neon.dist'
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 jobs:
   phpstan:
     name: phpstan
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -20,7 +20,7 @@ jobs:
           coverage: none
 
       - name: Install composer dependencies
-        uses: ramsey/composer-install@v1
+        uses: ramsey/composer-install@v2
 
       - name: Run PHPStan
-        run: ./vendor/bin/phpstan --error-format=github
+        run: ./vendor/bin/phpstan --error-format=github

.github/workflows/pint.yml

@@ -0,0 +1,25 @@
+name: Run Pint
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+    pint:
+        runs-on: ubuntu-latest
+
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v4
+                with:
+                    ref: ${{ github.head_ref }}
+
+            -   name: Run Pint
+                uses: aglipanci/laravel-pint-action@2.3.0
+
+            -   name: Commit changes
+                uses: stefanzweifel/git-auto-commit-action@v5
+                with:
+                    commit_message: Fix styling

README.md

@@ -2,7 +2,6 @@
 
 [![Latest Stable Version](https://poser.pugx.org/label84/laravel-tagmanager/v/stable?style=flat-square)](https://packagist.org/packages/label84/laravel-tagmanager)
 [![MIT Licensed](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
-[![Quality Score](https://img.shields.io/scrutinizer/g/label84/laravel-tagmanager.svg?style=flat-square)](https://scrutinizer-ci.com/g/label84/laravel-tagmanager)
 [![Total Downloads](https://img.shields.io/packagist/dt/label84/laravel-tagmanager.svg?style=flat-square)](https://packagist.org/packages/label84/laravel-tagmanager)
 
 Easier way to add Google Tag Manager to your Laravel application. Including support for User-ID, E-commerce and Server Side Events (Measurement Protocol).
@@ -25,8 +24,8 @@ Easier way to add Google Tag Manager to your Laravel application. Including supp
 
 | Version | Release |
 |---------|---------|
+| 11.x    | 1.3     |
 | 10.x    | 1.3     |
-| 9.x     | 1.3     |
 
 ## Installation
 

composer.json

@@ -10,11 +10,11 @@
       }
     ],
     "require": {
-      "illuminate/support": "^9.0|^10.0"
+      "illuminate/support": "^10.0|^11.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^7.0|^8.0",
-        "nunomaduro/larastan": "^2.0"
+        "orchestra/testbench": "^8.0|^9.0",
+        "larastan/larastan": "^2.0"
     },
     "extra": {
       "laravel": {

config/config.php

@@ -53,5 +53,5 @@
     /**
      * The session key used to store the measurement protocol client id.
      */
-    'measurement_protocol_client_id_session_key' => 'measurement-protocol-client-id'
+    'measurement_protocol_client_id_session_key' => 'measurement-protocol-client-id',
 ];

phpstan.neon.dist

@@ -1,18 +1,16 @@
 includes:
-    - ./vendor/nunomaduro/larastan/extension.neon
+    - ./vendor/larastan/larastan/extension.neon
 
 parameters:
 
     paths:
         - src
 
-    # The level 8 is the highest level
     level: 8
 
     ignoreErrors:
 
     excludes_analyse:
 
     checkMissingIterableValueType: false
-
-    checkGenericClassInNonGenericObjectType: false
+    checkGenericClassInNonGenericObjectType: false

src/Http/Middleware/TagManagerMiddleware.php

@@ -10,6 +10,7 @@
 class TagManagerMiddleware
 {
     private TagManager $tagManager;
+
     private Session $session;
 
     public function __construct(TagManager $tagManager, Session $session)

src/MeasurementProtocol.php

@@ -18,7 +18,7 @@ public function __construct()
         $this->clientId = session(config('tagmanager.measurement_protocol_client_id_session_key'), '');
     }
 
-    public function event(string $name, array $params = null): array
+    public function event(string $name, ?array $params = null): array
     {
         $event = [
             'name' => $name,
@@ -37,19 +37,19 @@ public function event(string $name, array $params = null): array
         $response = Http::withHeaders([
             'content-type' => 'application/json',
         ])
-        ->withQueryParameters([
-            'measurement_id' => config('tagmanager.measurement_id'),
-            'api_secret' => config('tagmanager.measurement_protocol_api_secret'),
-        ])
-        ->post($this->route(), array_merge(
-            [
-                'client_id' => $this->clientId,
-                'events' => [$event],
-            ],
-            $this->getUserIdArray(),
-        ));
-
-        if($this->isDebugEnabled) {
+            ->withQueryParameters([
+                'measurement_id' => config('tagmanager.measurement_id'),
+                'api_secret' => config('tagmanager.measurement_protocol_api_secret'),
+            ])
+            ->post($this->route(), array_merge(
+                [
+                    'client_id' => $this->clientId,
+                    'events' => [$event],
+                ],
+                $this->getUserIdArray(),
+            ));
+
+        if ($this->isDebugEnabled) {
             return $response->json();
         }
 

src/TagManagerServiceProvider.php

@@ -29,7 +29,7 @@ public function boot(): void
     {
         if ($this->app->runningInConsole()) {
             $this->publishes([
-              __DIR__.'/../config/config.php' => config_path('tagmanager.php'),
+                __DIR__.'/../config/config.php' => config_path('tagmanager.php'),
             ], 'config');
         }
 

src/View/Components/Body.php

@@ -8,6 +8,7 @@
 class Body extends Component
 {
     public string $id;
+
     public bool $isEnabled;
 
     public function __construct()

src/View/Components/Head.php

@@ -11,8 +11,11 @@
 class Head extends Component
 {
     public TagManager $tagManager;
+
     public Session $session;
+
     public string $id;
+
     public bool $isEnabled;
 
     public function __construct(TagManager $tagManager, Session $session)