laravel 11

RTippin · May 23, 2024 · 858ae14 · 858ae14
1 parent 90930b0
commit 858ae14
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@
 | `8.x`   | `^7.4` `^8.0` `^8.1` | `<= 1.19.1` |
 | `9.x`   |   `^8.0.2` `^8.1`    | `>= 1.20.0` |
 | `10.x`  | `^8.1` `^8.2` `^8.3` | `>= 1.22.0` |
+| `11.x`  |    `^8.2` `^8.3`     | `>= 1.23.0` |
 
 - Route model binding enabled in your API / WEB middleware groups.
 

diff --git a/composer.json b/composer.json
@@ -18,13 +18,12 @@
         "php": "^8.1|^8.2|^8.3",
         "ext-json": "*",
         "intervention/image": "^2.5",
-        "intervention/imagecache": "^2.5",
         "joypixels/emoji-toolkit": "^6.0",
-        "laravel/framework": "^10.0"
+        "laravel/framework": "^11.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^10.0",
-        "orchestra/testbench": "^8.0"
+        "orchestra/testbench": "^9.0"
     },
     "autoload": {
         "files": [

diff --git a/phpunit.xml b/phpunit.xml
@@ -17,6 +17,6 @@
     <env name="APP_ENV" value="self-testing"/>
     <env name="APP_KEY" value="base64:yk+bUVuZa1p86Dqjk9OjVK2R1pm6XHxC6xEKFq8utH0="/>
     <env name="APP_URL" value="http://messenger.test"/>
-    <env name="CACHE_DRIVER" value="file"/>
+    <env name="CACHE_DRIVER" value="array"/>
   </php>
 </phpunit>
diff --git a/src/Actions/Invites/StoreInvite.php b/src/Actions/Invites/StoreInvite.php
@@ -12,6 +12,7 @@
 use RTippin\Messenger\Messenger;
 use RTippin\Messenger\Models\Invite;
 use RTippin\Messenger\Models\Thread;
+use Throwable;
 
 class StoreInvite extends InviteAction
 {
@@ -93,7 +94,11 @@ private function setExpiresAt(?string $expires): ?Carbon
             return null;
         }
 
-        return Carbon::parse($expires);
+        try {
+            return Carbon::parse($expires);
+        } catch (Throwable) {
+            return null;
+        }
     }
 
     /**

diff --git a/src/Commands/InstallCommand.php b/src/Commands/InstallCommand.php
@@ -3,6 +3,7 @@
 namespace RTippin\Messenger\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 use RTippin\Messenger\Messenger;
 
@@ -78,25 +79,21 @@ private function registerMessengerServiceProvider(): void
     {
         $namespace = Str::replaceLast('\\', '', $this->laravel->getNamespace());
 
-        $appConfig = file_get_contents(config_path('app.php'));
+        if (file_exists($this->laravel->bootstrapPath('providers.php'))) {
+            ServiceProvider::addProviderToBootstrapFile("{$namespace}\\Providers\\MessengerServiceProvider");
+        } else {
+            $appConfig = file_get_contents(config_path('app.php'));
 
-        if (Str::contains($appConfig, $namespace.'\\Providers\\MessengerServiceProvider::class')) {
-            return;
-        }
-
-        $lineEndingCount = [
-            "\r\n" => substr_count($appConfig, "\r\n"),
-            "\r" => substr_count($appConfig, "\r"),
-            "\n" => substr_count($appConfig, "\n"),
-        ];
+            if (Str::contains($appConfig, $namespace.'\\Providers\\MessengerServiceProvider::class')) {
+                return;
+            }
 
-        $eol = array_keys($lineEndingCount, max($lineEndingCount))[0];
-
-        file_put_contents(config_path('app.php'), str_replace(
-            "{$namespace}\\Providers\EventServiceProvider::class,".$eol,
-            "{$namespace}\\Providers\EventServiceProvider::class,".$eol."        {$namespace}\Providers\MessengerServiceProvider::class,".$eol,
-            $appConfig
-        ));
+            file_put_contents(config_path('app.php'), str_replace(
+                "{$namespace}\\Providers\EventServiceProvider::class,".PHP_EOL,
+                "{$namespace}\\Providers\EventServiceProvider::class,".PHP_EOL."        {$namespace}\Providers\MessengerServiceProvider::class,".PHP_EOL,
+                $appConfig
+            ));
+        }
 
         file_put_contents(app_path('Providers/MessengerServiceProvider.php'), str_replace(
             "namespace App\Providers;",

diff --git a/src/Services/ImageRenderService.php b/src/Services/ImageRenderService.php
@@ -301,13 +301,9 @@ private function renderImageSize(string $file, string $size)
                 ? $width = null
                 : $height = null;
 
-            $resize = $this->imageManager->cache(function ($image) use ($file, $width, $height) {
-                return $image->make($file)->resize($width, $height, function ($constraint) {
-                    $constraint->aspectRatio();
-                });
-            }, 120);
-
-            return $this->imageManager->make($resize)->response();
+            return $this->imageManager->make($file)->resize($width, $height, function ($constraint) {
+                $constraint->aspectRatio();
+            })->response();
         } catch (Exception $e) {
             report($e);
         }

diff --git a/tests/Http/CallChannelTest.php b/tests/Http/CallChannelTest.php
@@ -15,6 +15,10 @@ protected function getEnvironmentSetUp($app): void
 
         // Need to set a driver other than null
         // for broadcast routes to be utilized
+        $app->get('config')->set('broadcasting.connections.redis', [
+            'driver' => 'redis',
+            'connection' => 'default',
+        ]);
         $app->get('config')->set('broadcasting.default', 'redis');
     }
 

diff --git a/tests/Http/ProviderChannelTest.php b/tests/Http/ProviderChannelTest.php
@@ -13,6 +13,10 @@ protected function getEnvironmentSetUp($app): void
 
         // Need to set a driver other than null
         // for broadcast routes to be utilized
+        $app->get('config')->set('broadcasting.connections.redis', [
+            'driver' => 'redis',
+            'connection' => 'default',
+        ]);
         $app->get('config')->set('broadcasting.default', 'redis');
     }
 

diff --git a/tests/Http/ThreadChannelTest.php b/tests/Http/ThreadChannelTest.php
@@ -14,6 +14,10 @@ protected function getEnvironmentSetUp($app): void
 
         // Need to set a driver other than null
         // for broadcast routes to be utilized
+        $app->get('config')->set('broadcasting.connections.redis', [
+            'driver' => 'redis',
+            'connection' => 'default',
+        ]);
         $app->get('config')->set('broadcasting.default', 'redis');
     }