Add support for PHP83 (nabeelio#1763)

* Add PHP83 to build * Upgrade minimum laravel version * Use PHP83 in sail * Fix drop_user_oauth_tokens_foreign_keys with sqlite (tests) * Add themeEngine to ThemeViewFinder * Fix deprecated null value for first parameter of str_contains in Rank * Upgrade jmikola/geojson to fix deprecated warnings * Fix null parameter to DateTimeImmutable deprecated * Upgrade santigarcor/laratrust to fix deprecation warnings * Update composer.lock * Fix warning in CommaDelimitedCast.php * Update composer.lock --------- Co-authored-by: Nabeel S <[email protected]>
arthurpar06 · Feb 28, 2024 · 143d927 · 143d927
1 parent 6f352eb
commit 143d927
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 39 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php-versions: ['8.1', '8.2']
+        php-versions: ['8.1', '8.2', '8.3']
     name: PHP ${{ matrix.php-versions }}
     env:
       extensions: intl, pcov, mbstring

diff --git a/app/Database/migrations/2023_12_24_091030_drop_user_oauth_tokens_foreign_keys.php b/app/Database/migrations/2023_12_24_091030_drop_user_oauth_tokens_foreign_keys.php
@@ -2,21 +2,24 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 
 return new class() extends Migration {
     public function up(): void
     {
-        Schema::table('user_oauth_tokens', function (Blueprint $table) {
-            $foreignKeys = Schema::getForeignKeys('user_oauth_tokens');
+        if (DB::getDriverName() !== 'sqlite') {
+            Schema::table('user_oauth_tokens', function (Blueprint $table) {
+                $foreignKeys = Schema::getForeignKeys('user_oauth_tokens');
 
-            foreach ($foreignKeys as $foreignKey) {
-                if (in_array('user_id', $foreignKey['columns'], true)) {
-                    $table->dropForeign(['user_id']);
-                    break;
+                foreach ($foreignKeys as $foreignKey) {
+                    if (in_array('user_id', $foreignKey['columns'], true)) {
+                        $table->dropForeign(['user_id']);
+                        break;
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     public function down(): void

diff --git a/app/Models/Casts/CommaDelimitedCast.php b/app/Models/Casts/CommaDelimitedCast.php
@@ -18,7 +18,7 @@ class CommaDelimitedCast implements CastsAttributes
      */
     public function get($model, string $key, $value, array $attributes)
     {
-        if (empty(trim($value))) {
+        if (empty($value) || empty(trim($value))) {
             return [];
         }
 

diff --git a/app/Models/Rank.php b/app/Models/Rank.php
@@ -68,7 +68,17 @@ class Rank extends Model
     public function imageUrl(): Attribute
     {
         return Attribute::make(
-            get: fn ($value) => str_contains($value, 'http') ? $value : (filled($value) ? public_url($value) : null),
+            get: function ($value) {
+                if (!filled($value)) {
+                    return null;
+                }
+
+                if (str_contains($value, 'http')) {
+                    return $value;
+                }
+
+                return public_url($value);
+            },
         );
     }
 

diff --git a/app/Support/ThemeViewFinder.php b/app/Support/ThemeViewFinder.php
@@ -8,6 +8,8 @@
 
 class ThemeViewFinder extends \Igaster\LaravelTheme\themeViewFinder
 {
+    protected $themeEngine;
+
     public function __construct(Filesystem $files, array $paths, array $extensions = null)
     {
         //$this->themeEngine = \App::make('igaster.themes');

diff --git a/app/Support/Timezonelist.php b/app/Support/Timezonelist.php
@@ -76,7 +76,7 @@ class Timezonelist
     public static function formatTimezone($timezone, $continent, $htmlencode = true)
     {
         try {
-            $time = new \DateTimeImmutable(null, new DateTimeZone($timezone));
+            $time = new \DateTimeImmutable('now', new DateTimeZone($timezone));
         } catch (\Exception $e) {
             Log::error($e->getMessage());
             return '';

diff --git a/composer.json b/composer.json
@@ -39,14 +39,14 @@
         "psr/container": "1.1.1",
         "composer/composer": "~2.6.5",
         "composer/installers": "~1.12.0",
-        "laravel/framework": "~v10.0",
+        "laravel/framework": "~v10.22",
         "arrilot/laravel-widgets": "~3.13.0",
         "doctrine/dbal": "^3.0",
         "guzzlehttp/guzzle": "~7.4.1",
         "hashids/hashids": "~4.1.0",
         "igaster/laravel-theme": "dev-master",
         "intervention/image": "~2.4",
-        "jmikola/geojson": "1.0.*",
+        "jmikola/geojson": "^1.2.0",
         "joshbrw/laravel-module-installer": "~2.0.1",
         "laracasts/flash": "~3.2.2",
         "laravel/helpers": "~v1.6.0",
@@ -63,7 +63,7 @@
         "php-units-of-measure/php-units-of-measure": "~2.1.0",
         "phpvms/sample-module": "~1.0",
         "prettus/l5-repository": "~2.9.0",
-        "santigarcor/laratrust": "^8.0",
+        "santigarcor/laratrust": "^8.2.2",
         "semver/semver": "~1.1.0",
         "spatie/valuestore": "~1.3.2",
         "tivie/php-os-detector": "~1.1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,11 +1,11 @@
 services:
     laravel.test:
         build:
-            context: ./vendor/laravel/sail/runtimes/8.2
+            context: ./vendor/laravel/sail/runtimes/8.3
             dockerfile: Dockerfile
             args:
                 WWWGROUP: '${WWWGROUP}'
-        image: sail-8.2/app
+        image: sail-8.3/app
         extra_hosts:
             - 'host.docker.internal:host-gateway'
         ports: