From d34ddd8e9da917f9376d246fe4c33d2b3b597a3f Mon Sep 17 00:00:00 2001
From: Tony BOTALLA <botalla@novius.fr>
Date: Wed, 10 Jul 2024 14:48:12 +0200
Subject: [PATCH] Laravel 11 + PHP 8.2

---
 .github/workflows/main.yml                    | 32 +++++++++++++++++++
 README.md                                     |  8 +++--
 composer.json                                 |  6 ++--
 src/Helpers/SessionHelper.php                 |  8 ++---
 ...LaravelNovaTranslatableServiceProvider.php |  4 +--
 src/Nova/Fields/Locale.php                    |  2 +-
 src/Nova/Fields/Translations.php              |  2 +-
 7 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..81b83f0
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,32 @@
+name: Novius CI
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  lint-php:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: shivammathur/setup-php@v2
+      with:
+        php-versions: '8.3'
+
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Cache composer dependencies
+      uses: actions/cache@v3
+      with:
+        path: vendor
+        key: composer-${{ hashFiles('composer.lock') }}
+
+    - name: Install Dependencies
+      run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+    - name: Lint PHP code via Laravel Pint
+      run: composer run-script lint
diff --git a/README.md b/README.md
index 70cfcbf..aa55542 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,12 @@ This package allows you to manage Laravel Models which use [Laravel Translatable
 ## Requirements
 
 * Laravel Nova >= 4.0
-* Laravel Translatable >= 0.0.1
-* Laravel >= 8.0
+* Laravel >= 10.0
+* PHP >= 8.2
+
+> **NOTE**: These instructions are for Laravel >= 10.0 and PHP >= 8.2 If you are using prior version, please
+> see the [previous version's docs](https://github.com/novius/laravel-nova-translatable/tree/0.x).
+
 
 ## Installation
 
diff --git a/composer.json b/composer.json
index 0238498..34295b3 100644
--- a/composer.json
+++ b/composer.json
@@ -15,10 +15,10 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "illuminate/support": "^8.83.4|^9.3.1|^10.0",
+        "php": ">=8.2",
+        "illuminate/support": "^10.0|^11.0",
         "laravel/nova": "^4.0",
-        "novius/laravel-translatable": "^0.0.5"
+        "novius/laravel-translatable": "^1.0"
     },
     "require-dev": {
         "laravel/pint": "^1.10"
diff --git a/src/Helpers/SessionHelper.php b/src/Helpers/SessionHelper.php
index e820fca..e6ba682 100644
--- a/src/Helpers/SessionHelper.php
+++ b/src/Helpers/SessionHelper.php
@@ -4,7 +4,7 @@
 
 class SessionHelper
 {
-    protected static function sessionKey(string $resource = null): string
+    protected static function sessionKey(?string $resource = null): string
     {
         if ($resource !== null) {
             return 'laravel_nova_translatable_'.$resource.'_current_locale';
@@ -13,17 +13,17 @@ protected static function sessionKey(string $resource = null): string
         return 'laravel_nova_translatable_current_locale';
     }
 
-    public static function currentLocale(string $resource = null): ?string
+    public static function currentLocale(?string $resource = null): ?string
     {
         return session()->get(static::sessionKey($resource));
     }
 
-    public static function clearCurrentLocale(string $resource = null): void
+    public static function clearCurrentLocale(?string $resource = null): void
     {
         session()->forget(static::sessionKey($resource));
     }
 
-    public static function setCurrentLocale(string $locale, string $resource = null): void
+    public static function setCurrentLocale(string $locale, ?string $resource = null): void
     {
         session()->put(static::sessionKey($resource), $locale);
     }
diff --git a/src/LaravelNovaTranslatableServiceProvider.php b/src/LaravelNovaTranslatableServiceProvider.php
index 6d17fae..83b3e44 100644
--- a/src/LaravelNovaTranslatableServiceProvider.php
+++ b/src/LaravelNovaTranslatableServiceProvider.php
@@ -13,9 +13,7 @@
 
 class LaravelNovaTranslatableServiceProvider extends ServiceProvider
 {
-    public function register(): void
-    {
-    }
+    public function register(): void {}
 
     /**
      * Bootstrap services.
diff --git a/src/Nova/Fields/Locale.php b/src/Nova/Fields/Locale.php
index c5bb73a..3f265c3 100644
--- a/src/Nova/Fields/Locale.php
+++ b/src/Nova/Fields/Locale.php
@@ -18,7 +18,7 @@ class Locale extends Select
 
     public $copyable = false;
 
-    public function __construct($name = null, $attribute = null, callable $resolveCallback = null)
+    public function __construct($name = null, $attribute = null, ?callable $resolveCallback = null)
     {
         $name = $name ?? trans('laravel-nova-translatable::messages.language');
 
diff --git a/src/Nova/Fields/Translations.php b/src/Nova/Fields/Translations.php
index 3257cc1..85858ce 100644
--- a/src/Nova/Fields/Translations.php
+++ b/src/Nova/Fields/Translations.php
@@ -21,7 +21,7 @@ class Translations extends Text
 
     public bool $withoutMissing = false;
 
-    public function __construct($name = null, $attribute = null, callable $resolveCallback = null)
+    public function __construct($name = null, $attribute = null, ?callable $resolveCallback = null)
     {
         $name = $name ?? trans('laravel-nova-translatable::messages.translations');