CHANGELOG.md

@@ -1,6 +1,13 @@
 # Release Notes for 11.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v11.9.1...11.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v11.9.2...11.x)
+
+## [v11.9.2](https://github.com/laravel/framework/compare/v11.9.1...v11.9.2) - 2024-05-30
+
+* [11.x] Fix new exception renderer compatibility with closure middleware by [@ifox](https://github.com/ifox) in https://github.com/laravel/framework/pull/51614
+* [11.x] Fix double-quoted string literals on SQLite by [@hafezdivandari](https://github.com/hafezdivandari) in https://github.com/laravel/framework/pull/51615
+* [11.x] Allow setting Resend api key in mailer specific config by [@riasvdv](https://github.com/riasvdv) in https://github.com/laravel/framework/pull/51618
+* [11.x] Fix only number as session key will result in numbered session keys by [@Katalam](https://github.com/Katalam) in https://github.com/laravel/framework/pull/51611
 
 ## [v11.9.1](https://github.com/laravel/framework/compare/v11.9.0...v11.9.1) - 2024-05-28
 

src/Illuminate/Database/Query/Builder.php

@@ -3749,12 +3749,18 @@ public function updateFrom(array $values)
      * Insert or update a record matching the attributes, and fill it with values.
      *
      * @param  array  $attributes
-     * @param  array  $values
+     * @param  array|callable  $values
      * @return bool
      */
-    public function updateOrInsert(array $attributes, array $values = [])
+    public function updateOrInsert(array $attributes, array|callable $values = [])
     {
-        if (! $this->where($attributes)->exists()) {
+        $exists = $this->where($attributes)->exists();
+
+        if ($values instanceof Closure) {
+            $values = $values($exists);
+        }
+
+        if (! $exists) {
             return $this->insert(array_merge($attributes, $values));
         }
 

src/Illuminate/Filesystem/functions.php

@@ -13,7 +13,7 @@
     function join_paths($basePath, ...$paths)
     {
         foreach ($paths as $index => $path) {
-            if (empty($path)) {
+            if (empty($path) && $path !== '0') {
                 unset($paths[$index]);
             } else {
                 $paths[$index] = DIRECTORY_SEPARATOR.ltrim($path, DIRECTORY_SEPARATOR);

src/Illuminate/Foundation/Application.php

@@ -45,7 +45,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '11.9.2';
+    const VERSION = '11.10.0';
 
     /**
      * The base path for the Laravel installation.
@@ -194,6 +194,13 @@ class Application extends Container implements ApplicationContract, CachesConfig
      */
     protected $namespace;
 
+    /**
+     * Indicates if the framework's base configuration should be merged.
+     *
+     * @var bool
+     */
+    protected $mergeFrameworkConfiguration = true;
+
     /**
      * The prefixes of absolute cache paths for use during normalization.
      *
@@ -1198,6 +1205,28 @@ public function handleCommand(InputInterface $input)
         return $status;
     }
 
+    /**
+     * Determine if the framework's base configuration should be merged.
+     *
+     * @return bool
+     */
+    public function shouldMergeFrameworkConfiguration()
+    {
+        return $this->mergeFrameworkConfiguration;
+    }
+
+    /**
+     * Indicate that the framework's base configuration should not be merged.
+     *
+     * @return $this
+     */
+    public function dontMergeFrameworkConfiguration()
+    {
+        $this->mergeFrameworkConfiguration = false;
+
+        return $this;
+    }
+
     /**
      * Determine if middleware has been disabled for the application.
      *

src/Illuminate/Foundation/Bootstrap/LoadConfiguration.php

@@ -2,7 +2,6 @@
 
 namespace Illuminate\Foundation\Bootstrap;
 
-use Exception;
 use Illuminate\Config\Repository;
 use Illuminate\Contracts\Config\Repository as RepositoryContract;
 use Illuminate\Contracts\Foundation\Application;
@@ -62,11 +61,17 @@ protected function loadConfigurationFiles(Application $app, RepositoryContract $
     {
         $files = $this->getConfigurationFiles($app);
 
-        // if (! isset($files['app'])) {
-        //     throw new Exception('Unable to load the "app" configuration file.');
-        // }
+        $shouldMerge = method_exists($app, 'shouldMergeFrameworkConfiguration')
+            ? $app->shouldMergeFrameworkConfiguration()
+            : true;
 
-        $base = $this->getBaseConfiguration();
+        $base = $shouldMerge
+            ? $this->getBaseConfiguration()
+            : [];
+
+        foreach (array_diff(array_keys($base), array_keys($files)) as $name => $config) {
+            $repository->set($name, $config);
+        }
 
         foreach ($files as $name => $path) {
             $base = $this->loadConfigurationFile($repository, $name, $path, $base);

src/Illuminate/Foundation/Console/EnvironmentEncryptCommand.php

@@ -21,7 +21,7 @@ class EnvironmentEncryptCommand extends Command
                     {--key= : The encryption key}
                     {--cipher= : The encryption cipher}
                     {--env= : The environment to be encrypted}
-                    {--prune= : Delete the original environment file}
+                    {--prune : Delete the original environment file}
                     {--force : Overwrite the existing encrypted environment file}';
 
     /**

src/Illuminate/Foundation/Console/OptimizeClearCommand.php

@@ -36,7 +36,7 @@ public function handle()
             'compiled' => fn () => $this->callSilent('clear-compiled') == 0,
             'config' => fn () => $this->callSilent('config:clear') == 0,
             'events' => fn () => $this->callSilent('event:clear') == 0,
-            'route' => fn () => $this->callSilent('route:clear') == 0,
+            'routes' => fn () => $this->callSilent('route:clear') == 0,
             'views' => fn () => $this->callSilent('view:clear') == 0,
         ])->each(fn ($task, $description) => $this->components->task($description, $task));
 

src/Illuminate/Foundation/Exceptions/Handler.php

@@ -833,9 +833,11 @@ protected function renderExceptionContent(Throwable $e)
     {
         try {
             if (config('app.debug')) {
-                return app()->has(ExceptionRenderer::class)
-                    ? $this->renderExceptionWithCustomRenderer($e)
-                    : $this->container->make(Renderer::class)->render(request(), $e);
+                if (app()->has(ExceptionRenderer::class)) {
+                    return $this->renderExceptionWithCustomRenderer($e);
+                } elseif ($this->container->bound(Renderer::class)) {
+                    return $this->container->make(Renderer::class)->render(request(), $e);
+                }
             }
 
             return $this->renderExceptionWithSymfony($e, config('app.debug'));

src/Illuminate/Foundation/Exceptions/Renderer/Renderer.php

@@ -123,8 +123,16 @@ public static function css()
      */
     public static function js()
     {
+        $viteJsAutoRefresh = '';
+
+        $vite = app(\Illuminate\Foundation\Vite::class);
+
+        if (is_file($vite->hotFile())) {
+            $viteJsAutoRefresh = $vite->__invoke([]);
+        }
+
         return '<script type="text/javascript">'
             .file_get_contents(static::DIST.'scripts.js')
-            .'</script>';
+            .'</script>'.$viteJsAutoRefresh;
     }
 }

src/Illuminate/Foundation/resources/exceptions/renderer/components/card.blade.php

@@ -1,5 +1,5 @@
 <section
-    {{ $attributes->merge(['class' => "@container flex flex-col p-6 sm:p-12 bg-white dark:bg-gray-900/80 text-gray-900 dark:text-gray-100 rounded-lg default:col-span-full default:lg:col-span-6 default:row-span-1 dark:ring-1 dark:ring-gray-800 shadow-xl"]) }}"
+    {{ $attributes->merge(['class' => "@container flex flex-col p-6 sm:p-12 bg-white dark:bg-gray-900/80 text-gray-900 dark:text-gray-100 rounded-lg default:col-span-full default:lg:col-span-6 default:row-span-1 dark:ring-1 dark:ring-gray-800 shadow-xl"]) }}
 >
     {{ $slot }}
 </section>

src/Illuminate/Foundation/resources/exceptions/renderer/components/navigation.blade.php

@@ -21,7 +21,7 @@ class="h-6 w-6 fill-red-500 text-gray-50 dark:text-gray-950"
             </div>
 
             <div class="flex items-center gap-3 sm:gap-6">
-                <x-laravel-exceptions-renderer::theme-swicher />
+                <x-laravel-exceptions-renderer::theme-switcher />
             </div>
         </div>
     </div>

src/Illuminate/Routing/RouteBinding.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Str;
 
 class RouteBinding
@@ -57,7 +58,7 @@ protected static function createClassBinding($container, $binding)
      */
     public static function forModel($container, $class, $callback = null)
     {
-        return function ($value) use ($container, $class, $callback) {
+        return function ($value, $route) use ($container, $class, $callback) {
             if (is_null($value)) {
                 return;
             }
@@ -67,7 +68,11 @@ public static function forModel($container, $class, $callback = null)
             // throw a not found exception otherwise we will return the instance.
             $instance = $container->make($class);
 
-            if ($model = $instance->resolveRouteBinding($value)) {
+            $routeBindingMethod = $route->allowsTrashedBindings() && in_array(SoftDeletes::class, class_uses_recursive($instance))
+                        ? 'resolveSoftDeletableRouteBinding'
+                        : 'resolveRouteBinding';
+
+            if ($model = $instance->{$routeBindingMethod}($value)) {
                 return $model;
             }
 

src/Illuminate/Support/Facades/App.php

@@ -62,6 +62,8 @@
  * @method static \Symfony\Component\HttpFoundation\Response handle(\Symfony\Component\HttpFoundation\Request $request, int $type = 1, bool $catch = true)
  * @method static void handleRequest(\Illuminate\Http\Request $request)
  * @method static int handleCommand(\Symfony\Component\Console\Input\InputInterface $input)
+ * @method static bool shouldMergeFrameworkConfiguration()
+ * @method static \Illuminate\Foundation\Application dontMergeFrameworkConfiguration()
  * @method static bool shouldSkipMiddleware()
  * @method static string getCachedServicesPath()
  * @method static string getCachedPackagesPath()

tests/Filesystem/FilesystemTest.php

@@ -59,21 +59,28 @@ public function testLines()
     {
         $path = self::$tempDir.'/file.txt';
 
-        $contents = LazyCollection::times(3)
-            ->map(function ($number) {
-                return "line-{$number}";
-            })
-            ->join("\n");
-
+        $contents = ' '.PHP_EOL.' spaces around '.PHP_EOL.PHP_EOL.'Line 2'.PHP_EOL.'1 trailing empty line ->'.PHP_EOL.PHP_EOL;
         file_put_contents($path, $contents);
 
         $files = new Filesystem;
         $this->assertInstanceOf(LazyCollection::class, $files->lines($path));
 
         $this->assertSame(
-            ['line-1', 'line-2', 'line-3'],
+            [' ', ' spaces around ', '', 'Line 2', '1 trailing empty line ->', '', ''],
             $files->lines($path)->all()
         );
+
+        // an empty file:
+        ftruncate(fopen($path, 'w'), 0);
+        $this->assertSame([''], $files->lines($path)->all());
+    }
+
+    public function testLinesThrowsExceptionNonexisitingFile()
+    {
+        $this->expectException(FileNotFoundException::class);
+        $this->expectExceptionMessage('File does not exist at path '.__DIR__.'/unknown-file.txt.');
+
+        (new Filesystem)->lines(__DIR__.'/unknown-file.txt');
     }
 
     public function testReplaceCreatesFile()
@@ -324,9 +331,9 @@ public function testMoveDirectoryReturnsFalseWhileOverwritingAndUnableToDeleteDe
     public function testGetThrowsExceptionNonexisitingFile()
     {
         $this->expectException(FileNotFoundException::class);
+        $this->expectExceptionMessage('File does not exist at path '.self::$tempDir.'/unknown-file.txt.');
 
-        $files = new Filesystem;
-        $files->get(self::$tempDir.'/unknown-file.txt');
+        (new Filesystem)->get(self::$tempDir.'/unknown-file.txt');
     }
 
     public function testGetRequireReturnsProperly()
@@ -339,9 +346,9 @@ public function testGetRequireReturnsProperly()
     public function testGetRequireThrowsExceptionNonExistingFile()
     {
         $this->expectException(FileNotFoundException::class);
+        $this->expectExceptionMessage('File does not exist at path '.self::$tempDir.'/unknown-file.txt.');
 
-        $files = new Filesystem;
-        $files->getRequire(self::$tempDir.'/file.php');
+        (new Filesystem)->getRequire(self::$tempDir.'/unknown-file.txt');
     }
 
     public function testJsonReturnsDecodedJsonData()
@@ -564,6 +571,14 @@ public function testRequireOnceRequiresFileProperly()
         $this->assertFalse(function_exists('random_function_xyz_changed'));
     }
 
+    public function testRequireOnceThrowsExceptionNonexisitingFile()
+    {
+        $this->expectException(FileNotFoundException::class);
+        $this->expectExceptionMessage('File does not exist at path '.__DIR__.'/unknown-file.txt.');
+
+        (new Filesystem)->requireOnce(__DIR__.'/unknown-file.txt');
+    }
+
     public function testCopyCopiesFileProperly()
     {
         $filesystem = new Filesystem;

tests/Filesystem/JoinPathsHelperTest.php

@@ -19,8 +19,27 @@ public function testItCanMergePathsForUnix(string $expected, string $given)
 
     public static function unixDataProvider()
     {
-        yield ['app/Http/Kernel.php', join_paths('app', 'Http', 'Kernel.php')];
-        yield ['app/Http/Kernel.php', join_paths('app', '', 'Http', 'Kernel.php')];
+        yield ['very/Basic/Functionality.php', join_paths('very', 'Basic', 'Functionality.php')];
+        yield ['segments/get/ltrimed/by_directory/separator.php', join_paths('segments', '/get/ltrimed', '/by_directory/separator.php')];
+        yield ['only/\\os_separator\\/\\get_ltrimmed.php', join_paths('only', '\\os_separator\\', '\\get_ltrimmed.php')];
+        yield ['/base_path//does_not/get_trimmed.php', join_paths('/base_path/', '/does_not', '/get_trimmed.php')];
+        yield ['Empty/0/1/Segments/00/Get_removed.php', join_paths('Empty', '', '0', null, 0, false, [], '1', 'Segments', '00', 'Get_removed.php')];
+        yield ['', join_paths(null, null, '')];
+        yield ['1/2/3', join_paths(1, 0, 2, 3)];
+        yield ['app/objecty', join_paths('app', new class()
+        {
+            public function __toString()
+            {
+                return 'objecty';
+            }
+        })];
+        yield ['app/0', join_paths('app', new class()
+        {
+            public function __toString()
+            {
+                return '0';
+            }
+        })];
     }
 
     #[RequiresOperatingSystem('Windows')]
@@ -32,7 +51,26 @@ public function testItCanMergePathsForWindows(string $expected, string $given)
 
     public static function windowsDataProvider()
     {
-        yield ['app\Http\Kernel.php', join_paths('app', 'Http', 'Kernel.php')];
-        yield ['app\Http\Kernel.php', join_paths('app', '', 'Http', 'Kernel.php')];
+        yield ['app\Basic\Functionality.php', join_paths('app', 'Basic', 'Functionality.php')];
+        yield ['segments\get\ltrimed\by_directory\separator.php', join_paths('segments', '\get\ltrimed', '\by_directory\separator.php')];
+        yield ['only\\/os_separator/\\/get_ltrimmed.php', join_paths('only', '/os_separator/', '/get_ltrimmed.php')];
+        yield ['\base_path\\\\does_not\get_trimmed.php', join_paths('\\base_path\\', '\does_not', '\get_trimmed.php')];
+        yield ['Empty\0\1\Segments\00\Get_removed.php', join_paths('Empty', '', '0', null, 0, false, [], '1', 'Segments', '00', 'Get_removed.php')];
+        yield ['', join_paths(null, null, '')];
+        yield ['1\2\3', join_paths(1, 2, 3)];
+        yield ['app\\objecty', join_paths('app', new class()
+        {
+            public function __toString()
+            {
+                return 'objecty';
+            }
+        })];
+        yield ['app\\0', join_paths('app', new class()
+        {
+            public function __toString()
+            {
+                return '0';
+            }
+        })];
     }
 }

tests/Foundation/Bootstrap/LoadConfigurationTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Illuminate\Tests\Foundation\Bootstrap;
+
+use Illuminate\Foundation\Application;
+use Illuminate\Foundation\Bootstrap\LoadConfiguration;
+use PHPUnit\Framework\TestCase;
+
+class LoadConfigurationTest extends TestCase
+{
+    public function testLoadsBaseConfiguration()
+    {
+        $app = new Application();
+
+        (new LoadConfiguration())->bootstrap($app);
+
+        $this->assertSame('Laravel', $app['config']['app.name']);
+    }
+
+    public function testDontLoadBaseConfiguration()
+    {
+        $app = new Application();
+        $app->dontMergeFrameworkConfiguration();
+
+        (new LoadConfiguration())->bootstrap($app);
+
+        $this->assertNull($app['config']['app.name']);
+    }
+}