CHANGELOG.md

@@ -1,6 +1,15 @@
 # Release Notes for 10.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v10.34.0...10.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v10.34.2...10.x)
+
+## [v10.34.2](https://github.com/laravel/framework/compare/v10.34.1...v10.34.2) - 2023-11-28
+
+* [v10.x] Add missing methods to newly extended fake `Vite` instance by [@stevebauman](https://github.com/stevebauman) in https://github.com/laravel/framework/pull/49165
+
+## [v10.34.1](https://github.com/laravel/framework/compare/v10.34.0...v10.34.1) - 2023-11-28
+
+* [10.x] Streamline `DatabaseMigrations` and `RefreshDatabase` events by [@crynobone](https://github.com/crynobone) in https://github.com/laravel/framework/pull/49153
+* [10.x] Use HtmlString in Vite fake by [@jasonvarga](https://github.com/jasonvarga) in https://github.com/laravel/framework/pull/49163
 
 ## [v10.34.0](https://github.com/laravel/framework/compare/v10.33.0...v10.34.0) - 2023-11-28
 

composer.json

@@ -44,7 +44,7 @@
         "symfony/console": "^6.2",
         "symfony/error-handler": "^6.2",
         "symfony/finder": "^6.2",
-        "symfony/http-foundation": "^6.3",
+        "symfony/http-foundation": "^6.4",
         "symfony/http-kernel": "^6.2",
         "symfony/mailer": "^6.2",
         "symfony/mime": "^6.2",

src/Illuminate/Cookie/Middleware/EncryptCookies.php

@@ -195,11 +195,7 @@ protected function encrypt(Response $response)
      */
     protected function duplicate(Cookie $cookie, $value)
     {
-        return new Cookie(
-            $cookie->getName(), $value, $cookie->getExpiresTime(),
-            $cookie->getPath(), $cookie->getDomain(), $cookie->isSecure(),
-            $cookie->isHttpOnly(), $cookie->isRaw(), $cookie->getSameSite()
-        );
+        return $cookie->withValue($value);
     }
 
     /**

src/Illuminate/Cookie/composer.json

@@ -20,7 +20,7 @@
         "illuminate/contracts": "^10.0",
         "illuminate/macroable": "^10.0",
         "illuminate/support": "^10.0",
-        "symfony/http-foundation": "^6.2",
+        "symfony/http-foundation": "^6.4",
         "symfony/http-kernel": "^6.2"
     },
     "autoload": {

src/Illuminate/Database/Eloquent/Model.php

@@ -106,7 +106,7 @@ abstract class Model implements Arrayable, ArrayAccess, CanBeEscapedWhenCastToSt
     public $exists = false;
 
     /**
-     * Indicates if the model was inserted during the current request lifecycle.
+     * Indicates if the model was inserted during the object's lifecycle.
      *
      * @var bool
      */

src/Illuminate/Database/Eloquent/Relations/Concerns/InteractsWithDictionary.php

@@ -3,7 +3,7 @@
 namespace Illuminate\Database\Eloquent\Relations\Concerns;
 
 use BackedEnum;
-use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use InvalidArgumentException;
 use UnitEnum;
 
 trait InteractsWithDictionary
@@ -14,7 +14,7 @@ trait InteractsWithDictionary
      * @param  mixed  $attribute
      * @return mixed
      *
-     * @throws \Doctrine\Instantiator\Exception\InvalidArgumentException
+     * @throws \InvalidArgumentException
      */
     protected function getDictionaryKey($attribute)
     {

src/Illuminate/Database/Schema/Builder.php

@@ -168,6 +168,25 @@ public function hasTable($table)
         return false;
     }
 
+    /**
+     * Determine if the given view exists.
+     *
+     * @param  string  $view
+     * @return bool
+     */
+    public function hasView($view)
+    {
+        $view = $this->connection->getTablePrefix().$view;
+
+        foreach ($this->getViews() as $value) {
+            if (strtolower($view) === strtolower($value['name'])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Get the tables that belong to the database.
      *

src/Illuminate/Foundation/Application.php

@@ -38,7 +38,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '10.34.2';
+    const VERSION = '10.35.0';
 
     /**
      * The base path for the Laravel installation.

src/Illuminate/Foundation/Console/DownCommand.php

@@ -7,6 +7,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Events\MaintenanceModeEnabled;
 use Illuminate\Foundation\Exceptions\RegisterErrorViewPaths;
+use Illuminate\Support\Str;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Throwable;
 
@@ -23,6 +24,7 @@ class DownCommand extends Command
                                  {--retry= : The number of seconds after which the request may be retried}
                                  {--refresh= : The number of seconds after which the browser may refresh}
                                  {--secret= : The secret phrase that may be used to bypass maintenance mode}
+                                 {--with-secret : Generate a random secret phrase that may be used to bypass maintenance mode}
                                  {--status=503 : The status code that should be used when returning the maintenance mode response}';
 
     /**
@@ -46,7 +48,9 @@ public function handle()
                 return 0;
             }
 
-            $this->laravel->maintenanceMode()->activate($this->getDownFilePayload());
+            $downFilePayload = $this->getDownFilePayload();
+
+            $this->laravel->maintenanceMode()->activate($downFilePayload);
 
             file_put_contents(
                 storage_path('framework/maintenance.php'),
@@ -56,6 +60,10 @@ public function handle()
             $this->laravel->get('events')->dispatch(new MaintenanceModeEnabled());
 
             $this->components->info('Application is now in maintenance mode.');
+
+            if ($downFilePayload['secret'] !== null) {
+                $this->components->info('You may bypass maintenance mode via ['.config('app.url')."/{$downFilePayload['secret']}].");
+            }
         } catch (Exception $e) {
             $this->components->error(sprintf(
                 'Failed to enter maintenance mode: %s.',
@@ -78,7 +86,7 @@ protected function getDownFilePayload()
             'redirect' => $this->redirectPath(),
             'retry' => $this->getRetryTime(),
             'refresh' => $this->option('refresh'),
-            'secret' => $this->option('secret'),
+            'secret' => $this->getSecret(),
             'status' => (int) $this->option('status', 503),
             'template' => $this->option('render') ? $this->prerenderView() : null,
         ];
@@ -137,4 +145,18 @@ protected function getRetryTime()
 
         return is_numeric($retry) && $retry > 0 ? (int) $retry : null;
     }
+
+    /**
+     * Get the secret phrase that may be used to bypass maintenance mode.
+     *
+     * @return string|null
+     */
+    protected function getSecret()
+    {
+        return match (true) {
+            ! is_null($this->option('secret')) => $this->option('secret'),
+            $this->option('with-secret') => Str::random(),
+            default => null,
+        };
+    }
 }

src/Illuminate/Foundation/Http/Middleware/VerifyCsrfToken.php

@@ -211,7 +211,8 @@ protected function newCookie($request, $config)
             $config['secure'],
             false,
             false,
-            $config['same_site'] ?? null
+            $config['same_site'] ?? null,
+            $config['partitioned'] ?? false
         );
     }
 

src/Illuminate/Http/composer.json

@@ -22,7 +22,7 @@
         "illuminate/macroable": "^10.0",
         "illuminate/session": "^10.0",
         "illuminate/support": "^10.0",
-        "symfony/http-foundation": "^6.2",
+        "symfony/http-foundation": "^6.4",
         "symfony/http-kernel": "^6.2",
         "symfony/mime": "^6.2"
     },

src/Illuminate/Queue/Console/RetryCommand.php

@@ -70,7 +70,11 @@ protected function getJobIds()
         $ids = (array) $this->argument('id');
 
         if (count($ids) === 1 && $ids[0] === 'all') {
-            return Arr::pluck($this->laravel['queue.failer']->all(), 'id');
+            $failer = $this->laravel['queue.failer'];
+
+            return method_exists($failer, 'ids')
+                ? $failer->ids()
+                : Arr::pluck($failer->all(), 'id');
         }
 
         if ($queue = $this->option('queue')) {
@@ -92,10 +96,14 @@ protected function getJobIds()
      */
     protected function getJobIdsByQueue($queue)
     {
-        $ids = collect($this->laravel['queue.failer']->all())
-                        ->where('queue', $queue)
-                        ->pluck('id')
-                        ->toArray();
+        $failer = $this->laravel['queue.failer'];
+
+        $ids = method_exists($failer, 'ids')
+            ? $failer->ids($queue)
+            : collect($failer->all())
+                ->where('queue', $queue)
+                ->pluck('id')
+                ->toArray();
 
         if (count($ids) === 0) {
             $this->components->error("Unable to find failed jobs for queue [{$queue}].");

src/Illuminate/Queue/Failed/DatabaseFailedJobProvider.php

@@ -64,6 +64,21 @@ public function log($connection, $queue, $payload, $exception)
         ));
     }
 
+    /**
+     * Get the IDs of all of the failed jobs.
+     *
+     * @param  string|null  $queue
+     * @return array
+     */
+    public function ids($queue = null)
+    {
+        return $this->getTable()
+            ->when(! is_null($queue), fn ($query) => $query->where('queue', $queue))
+            ->orderBy('id', 'desc')
+            ->pluck('id')
+            ->all();
+    }
+
     /**
      * Get a list of all of the failed jobs.
      *

src/Illuminate/Queue/Failed/DatabaseUuidFailedJobProvider.php

@@ -67,6 +67,21 @@ public function log($connection, $queue, $payload, $exception)
         return $uuid;
     }
 
+    /**
+     * Get the IDs of all of the failed jobs.
+     *
+     * @param  string|null  $queue
+     * @return array
+     */
+    public function ids($queue = null)
+    {
+        return $this->getTable()
+            ->when(! is_null($queue), fn ($query) => $query->where('queue', $queue))
+            ->orderBy('id', 'desc')
+            ->pluck('uuid')
+            ->all();
+    }
+
     /**
      * Get a list of all of the failed jobs.
      *

src/Illuminate/Queue/Failed/DynamoDbFailedJobProvider.php

@@ -78,6 +78,20 @@ public function log($connection, $queue, $payload, $exception)
         return $id;
     }
 
+    /**
+     * Get the IDs of all of the failed jobs.
+     *
+     * @param  string|null  $queue
+     * @return array
+     */
+    public function ids($queue = null)
+    {
+        return collect($this->all())
+            ->when(! is_null($queue), fn ($collect) => $collect->where('queue', $queue))
+            ->pluck('id')
+            ->all();
+    }
+
     /**
      * Get a list of all of the failed jobs.
      *

src/Illuminate/Queue/Failed/FailedJobProviderInterface.php

@@ -2,6 +2,9 @@
 
 namespace Illuminate\Queue\Failed;
 
+/**
+ * @method array ids(string $queue = null)
+ */
 interface FailedJobProviderInterface
 {
     /**

src/Illuminate/Queue/Failed/FileFailedJobProvider.php

@@ -78,6 +78,20 @@ public function log($connection, $queue, $payload, $exception)
         });
     }
 
+    /**
+     * Get the IDs of all of the failed jobs.
+     *
+     * @param  string|null  $queue
+     * @return array
+     */
+    public function ids($queue = null)
+    {
+        return collect($this->all())
+            ->when(! is_null($queue), fn ($collect) => $collect->where('queue', $queue))
+            ->pluck('id')
+            ->all();
+    }
+
     /**
      * Get a list of all of the failed jobs.
      *

src/Illuminate/Queue/Failed/NullFailedJobProvider.php

@@ -18,6 +18,17 @@ public function log($connection, $queue, $payload, $exception)
         //
     }
 
+    /**
+     * Get the IDs of all of the failed jobs.
+     *
+     * @param  string|null  $queue
+     * @return array
+     */
+    public function ids($queue = null)
+    {
+        return [];
+    }
+
     /**
      * Get a list of all of the failed jobs.
      *

src/Illuminate/Routing/Router.php

@@ -119,6 +119,13 @@ class Router implements BindingRegistrar, RegistrarContract
      */
     protected $groupStack = [];
 
+    /**
+     * The registered custom implicit binding callback.
+     *
+     * @var array
+     */
+    protected $implicitBindingCallback;
+
     /**
      * All of the verbs supported by the router.
      *
@@ -949,7 +956,24 @@ public function substituteBindings($route)
      */
     public function substituteImplicitBindings($route)
     {
-        ImplicitRouteBinding::resolveForRoute($this->container, $route);
+        $default = fn () => ImplicitRouteBinding::resolveForRoute($this->container, $route);
+
+        return call_user_func(
+            $this->implicitBindingCallback ?? $default, $this->container, $route, $default
+        );
+    }
+
+    /**
+     * Register a callback to to run after implicit bindings are substituted.
+     *
+     * @param  callable  $callback
+     * @return $this
+     */
+    public function substituteImplicitBindingsUsing($callback)
+    {
+        $this->implicitBindingCallback = $callback;
+
+        return $this;
     }
 
     /**

src/Illuminate/Routing/composer.json

@@ -25,7 +25,7 @@
         "illuminate/pipeline": "^10.0",
         "illuminate/session": "^10.0",
         "illuminate/support": "^10.0",
-        "symfony/http-foundation": "^6.2",
+        "symfony/http-foundation": "^6.4",
         "symfony/http-kernel": "^6.2",
         "symfony/routing": "^6.2"
     },

src/Illuminate/Session/Middleware/StartSession.php

@@ -219,9 +219,16 @@ protected function addCookieToResponse(Response $response, Session $session)
     {
         if ($this->sessionIsPersistent($config = $this->manager->getSessionConfig())) {
             $response->headers->setCookie(new Cookie(
-                $session->getName(), $session->getId(), $this->getCookieExpirationDate(),
-                $config['path'], $config['domain'], $config['secure'] ?? false,
-                $config['http_only'] ?? true, false, $config['same_site'] ?? null
+                $session->getName(),
+                $session->getId(),
+                $this->getCookieExpirationDate(),
+                $config['path'],
+                $config['domain'],
+                $config['secure'] ?? false,
+                $config['http_only'] ?? true,
+                false,
+                $config['same_site'] ?? null,
+                $config['partitioned'] ?? false
             ));
         }
     }

src/Illuminate/Session/composer.json

@@ -22,7 +22,7 @@
         "illuminate/filesystem": "^10.0",
         "illuminate/support": "^10.0",
         "symfony/finder": "^6.2",
-        "symfony/http-foundation": "^6.2"
+        "symfony/http-foundation": "^6.4"
     },
     "autoload": {
         "psr-4": {

src/Illuminate/Support/Facades/Route.php

@@ -37,6 +37,7 @@
  * @method static \Symfony\Component\HttpFoundation\Response toResponse(\Symfony\Component\HttpFoundation\Request $request, mixed $response)
  * @method static \Illuminate\Routing\Route substituteBindings(\Illuminate\Routing\Route $route)
  * @method static void substituteImplicitBindings(\Illuminate\Routing\Route $route)
+ * @method static \Illuminate\Routing\Router substituteImplicitBindingsUsing(callable $callback)
  * @method static void matched(string|callable $callback)
  * @method static array getMiddleware()
  * @method static \Illuminate\Routing\Router aliasMiddleware(string $name, string $class)

src/Illuminate/Support/Facades/Schema.php

@@ -11,6 +11,7 @@
  * @method static bool createDatabase(string $name)
  * @method static bool dropDatabaseIfExists(string $name)
  * @method static bool hasTable(string $table)
+ * @method static bool hasView(string $view)
  * @method static array getTables()
  * @method static array getViews()
  * @method static bool hasColumn(string $table, string $column)

src/Illuminate/Support/Number.php

@@ -141,30 +141,71 @@ public static function fileSize(int|float $bytes, int $precision = 0, ?int $maxP
      * @param  int|null  $maxPrecision
      * @return string
      */
-    public static function forHumans(int|float $number, int $precision = 0, ?int $maxPrecision = null)
+    public static function abbreviate(int|float $number, int $precision = 0, ?int $maxPrecision = null)
     {
-        $units = [
-            3 => 'thousand',
-            6 => 'million',
-            9 => 'billion',
-            12 => 'trillion',
-            15 => 'quadrillion',
-        ];
+        return static::forHumans($number, $precision, $maxPrecision, abbreviate: true);
+    }
+
+    /**
+     * Convert the number to its human readable equivalent.
+     *
+     * @param  int  $number
+     * @param  int  $precision
+     * @param  int|null  $maxPrecision
+     * @return string
+     */
+    public static function forHumans(int|float $number, int $precision = 0, ?int $maxPrecision = null, bool $abbreviate = false)
+    {
+        return static::summarize($number, $precision, $maxPrecision, $abbreviate ? [
+            3 => 'K',
+            6 => 'M',
+            9 => 'B',
+            12 => 'T',
+            15 => 'Q',
+        ] : [
+            3 => ' thousand',
+            6 => ' million',
+            9 => ' billion',
+            12 => ' trillion',
+            15 => ' quadrillion',
+        ]);
+    }
+
+    /**
+     * Convert the number to its human readable equivalent.
+     *
+     * @param  int  $number
+     * @param  int  $precision
+     * @param  int|null  $maxPrecision
+     * @param  array  $units
+     * @return string
+     */
+    protected static function summarize(int|float $number, int $precision = 0, ?int $maxPrecision = null, array $units = [])
+    {
+        if (empty($units)) {
+            $units = [
+                3 => 'K',
+                6 => 'M',
+                9 => 'B',
+                12 => 'T',
+                15 => 'Q',
+            ];
+        }
 
         switch (true) {
             case $number === 0:
                 return '0';
             case $number < 0:
-                return sprintf('-%s', static::forHumans(abs($number), $precision, $maxPrecision));
+                return sprintf('-%s', static::summarize(abs($number), $precision, $maxPrecision, $units));
             case $number >= 1e15:
-                return sprintf('%s quadrillion', static::forHumans($number / 1e15, $precision, $maxPrecision));
+                return sprintf('%s'.end($units), static::summarize($number / 1e15, $precision, $maxPrecision, $units));
         }
 
         $numberExponent = floor(log10($number));
         $displayExponent = $numberExponent - ($numberExponent % 3);
         $number /= pow(10, $displayExponent);
 
-        return trim(sprintf('%s %s', static::format($number, $precision, $maxPrecision), $units[$displayExponent] ?? ''));
+        return trim(sprintf('%s%s', static::format($number, $precision, $maxPrecision), $units[$displayExponent] ?? ''));
     }
 
     /**
@@ -195,7 +236,7 @@ public static function useLocale(string $locale)
     }
 
     /**
-     * Ensure the "intl" PHP exntension is installed.
+     * Ensure the "intl" PHP extension is installed.
      *
      * @return void
      */

src/Illuminate/Testing/Fluent/AssertableJson.php

@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Traits\Conditionable;
 use Illuminate\Support\Traits\Macroable;
 use Illuminate\Support\Traits\Tappable;
 use Illuminate\Testing\AssertableJsonString;
@@ -16,6 +17,7 @@ class AssertableJson implements Arrayable
         Concerns\Matching,
         Concerns\Debugging,
         Concerns\Interaction,
+        Conditionable,
         Macroable,
         Tappable;
 

src/Illuminate/Testing/TestResponse.php

@@ -498,7 +498,8 @@ public function getCookie($cookieName, $decrypt = true, $unserialize = false)
                     $cookie->isSecure(),
                     $cookie->isHttpOnly(),
                     $cookie->isRaw(),
-                    $cookie->getSameSite()
+                    $cookie->getSameSite(),
+                    $cookie->isPartitioned()
                 );
             }
         }

src/Illuminate/Validation/composer.json

@@ -25,7 +25,7 @@
         "illuminate/macroable": "^10.0",
         "illuminate/support": "^10.0",
         "illuminate/translation": "^10.0",
-        "symfony/http-foundation": "^6.2",
+        "symfony/http-foundation": "^6.4",
         "symfony/mime": "^6.2"
     },
     "autoload": {

src/Illuminate/View/Compilers/BladeCompiler.php

@@ -33,6 +33,7 @@ class BladeCompiler extends Compiler implements CompilerInterface
         Concerns\CompilesStacks,
         Concerns\CompilesStyles,
         Concerns\CompilesTranslations,
+        Concerns\CompilesUseStatements,
         ReflectsClosures;
 
     /**

src/Illuminate/View/Compilers/Concerns/CompilesComponents.php

@@ -67,6 +67,7 @@ public static function compileClassComponentOpening(string $component, string $a
     {
         return implode("\n", [
             '<?php if (isset($component)) { $__componentOriginal'.$hash.' = $component; } ?>',
+            '<?php if (isset($attributes)) { $__attributesOriginal'.$hash.' = $attributes; } ?>',
             '<?php $component = '.$component.'::resolve('.($data ?: '[]').' + (isset($attributes) && $attributes instanceof Illuminate\View\ComponentAttributeBag ? (array) $attributes->getIterator() : [])); ?>',
             '<?php $component->withName('.$alias.'); ?>',
             '<?php if ($component->shouldRender()): ?>',
@@ -94,6 +95,10 @@ public function compileEndComponentClass()
         $hash = array_pop(static::$componentHashStack);
 
         return $this->compileEndComponent()."\n".implode("\n", [
+            '<?php endif; ?>',
+            '<?php if (isset($__attributesOriginal'.$hash.')): ?>',
+            '<?php $attributes = $__attributesOriginal'.$hash.'; ?>',
+            '<?php unset($__attributesOriginal'.$hash.'); ?>',
             '<?php endif; ?>',
             '<?php if (isset($__componentOriginal'.$hash.')): ?>',
             '<?php $component = $__componentOriginal'.$hash.'; ?>',

src/Illuminate/View/Compilers/Concerns/CompilesUseStatements.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Illuminate\View\Compilers\Concerns;
+
+trait CompilesUseStatements
+{
+    /**
+     * Compile the use statements into valid PHP.
+     *
+     * @param  string  $expression
+     * @return string
+     */
+    protected function compileUse($expression)
+    {
+        $segments = explode(',', preg_replace("/[\(\)]/", '', $expression));
+
+        $use = trim($segments[0], " '\"");
+        $as = isset($segments[1]) ? ' as '.trim($segments[1], " '\"") : '';
+
+        return "<?php use \\{$use}{$as}; ?>";
+    }
+}

tests/Integration/Database/SchemaBuilderTest.php

@@ -164,6 +164,13 @@ public function testGetTables()
         }
     }
 
+    public function testHasView()
+    {
+        DB::statement('create view foo (id) as select 1');
+
+        $this->assertTrue(Schema::hasView('foo'));
+    }
+
     public function testGetViews()
     {
         DB::statement('create view foo (id) as select 1');

tests/Routing/RoutingRouteTest.php

@@ -1756,6 +1756,27 @@ public function testImplicitBindings()
         $this->assertSame('taylor', $router->dispatch(Request::create('foo/taylor', 'GET'))->getContent());
     }
 
+    public function testImplicitBindingsWithClosure()
+    {
+        $router = $this->getRouter();
+
+        $router->substituteImplicitBindingsUsing(function ($container, $route, $default) {
+            $default = $default();
+
+            $model = $route->parameter('bar');
+            $model->value = 'otwell';
+        });
+
+        $router->get('foo/{bar}', [
+            'middleware' => SubstituteBindings::class,
+            'uses' => function (RoutingTestUserModel $bar) {
+                return $bar->value;
+            },
+        ]);
+
+        $this->assertSame('otwell', $router->dispatch(Request::create('foo/taylor', 'GET'))->getContent());
+    }
+
     public function testImplicitBindingsWhereScopedBindingsArePrevented()
     {
         $router = $this->getRouter();

tests/Support/SupportNumberTest.php

@@ -208,6 +208,59 @@ public function testToHuman()
         $this->assertSame('-1 thousand quadrillion', Number::forHumans(-1000000000000000000));
     }
 
+    public function testSummarize()
+    {
+        $this->assertSame('1', Number::abbreviate(1));
+        $this->assertSame('1.00', Number::abbreviate(1, precision: 2));
+        $this->assertSame('10', Number::abbreviate(10));
+        $this->assertSame('100', Number::abbreviate(100));
+        $this->assertSame('1K', Number::abbreviate(1000));
+        $this->assertSame('1.00K', Number::abbreviate(1000, precision: 2));
+        $this->assertSame('1K', Number::abbreviate(1000, maxPrecision: 2));
+        $this->assertSame('1K', Number::abbreviate(1230));
+        $this->assertSame('1.2K', Number::abbreviate(1230, maxPrecision: 1));
+        $this->assertSame('1M', Number::abbreviate(1000000));
+        $this->assertSame('1B', Number::abbreviate(1000000000));
+        $this->assertSame('1T', Number::abbreviate(1000000000000));
+        $this->assertSame('1Q', Number::abbreviate(1000000000000000));
+        $this->assertSame('1KQ', Number::abbreviate(1000000000000000000));
+
+        $this->assertSame('123', Number::abbreviate(123));
+        $this->assertSame('1K', Number::abbreviate(1234));
+        $this->assertSame('1.23K', Number::abbreviate(1234, precision: 2));
+        $this->assertSame('12K', Number::abbreviate(12345));
+        $this->assertSame('1M', Number::abbreviate(1234567));
+        $this->assertSame('1B', Number::abbreviate(1234567890));
+        $this->assertSame('1T', Number::abbreviate(1234567890123));
+        $this->assertSame('1.23T', Number::abbreviate(1234567890123, precision: 2));
+        $this->assertSame('1Q', Number::abbreviate(1234567890123456));
+        $this->assertSame('1.23KQ', Number::abbreviate(1234567890123456789, precision: 2));
+        $this->assertSame('490K', Number::abbreviate(489939));
+        $this->assertSame('489.9390K', Number::abbreviate(489939, precision: 4));
+        $this->assertSame('500.00000M', Number::abbreviate(500000000, precision: 5));
+
+        $this->assertSame('1MQ', Number::abbreviate(1000000000000000000000));
+        $this->assertSame('1BQ', Number::abbreviate(1000000000000000000000000));
+        $this->assertSame('1TQ', Number::abbreviate(1000000000000000000000000000));
+        $this->assertSame('1QQ', Number::abbreviate(1000000000000000000000000000000));
+        $this->assertSame('1KQQ', Number::abbreviate(1000000000000000000000000000000000));
+
+        $this->assertSame('0', Number::abbreviate(0));
+        $this->assertSame('-1', Number::abbreviate(-1));
+        $this->assertSame('-1.00', Number::abbreviate(-1, precision: 2));
+        $this->assertSame('-10', Number::abbreviate(-10));
+        $this->assertSame('-100', Number::abbreviate(-100));
+        $this->assertSame('-1K', Number::abbreviate(-1000));
+        $this->assertSame('-1.23K', Number::abbreviate(-1234, precision: 2));
+        $this->assertSame('-1.2K', Number::abbreviate(-1234, maxPrecision: 1));
+        $this->assertSame('-1M', Number::abbreviate(-1000000));
+        $this->assertSame('-1B', Number::abbreviate(-1000000000));
+        $this->assertSame('-1T', Number::abbreviate(-1000000000000));
+        $this->assertSame('-1.1T', Number::abbreviate(-1100000000000, maxPrecision: 1));
+        $this->assertSame('-1Q', Number::abbreviate(-1000000000000000));
+        $this->assertSame('-1KQ', Number::abbreviate(-1000000000000000000));
+    }
+
     protected function needsIntlExtension()
     {
         if (! extension_loaded('intl')) {

tests/View/Blade/BladeComponentTagCompilerTest.php

@@ -715,7 +715,7 @@ public function testAttributesTreatedAsPropsAreRemovedFromFinalAttributes()
         $component->shouldReceive('shouldRender')->once()->andReturn(true);
         $component->shouldReceive('resolveView')->once()->andReturn('');
         $component->shouldReceive('data')->once()->andReturn([]);
-        $component->shouldReceive('withAttributes')->once();
+        $component->shouldReceive('withAttributes')->with(['attributes' => new ComponentAttributeBag(['other' => 'ok'])])->once();
 
         Component::resolveComponentsUsing(fn () => $component);
 
@@ -730,7 +730,57 @@ public function testAttributesTreatedAsPropsAreRemovedFromFinalAttributes()
         eval(" ?> $template <?php ");
         ob_get_clean();
 
-        $this->assertNull($attributes->get('userId'));
+        $this->assertSame($attributes->get('userId'), 'bar');
+        $this->assertSame($attributes->get('other'), 'ok');
+    }
+
+    public function testOriginalAttributesAreRestoredAfterRenderingChildComponentWithProps()
+    {
+        $container = new Container;
+        $container->instance(Application::class, $app = m::mock(Application::class));
+        $container->instance(Factory::class, $factory = m::mock(Factory::class));
+        $container->alias(Factory::class, 'view');
+        $app->shouldReceive('getNamespace')->never()->andReturn('App\\');
+        $factory->shouldReceive('exists')->never();
+
+        Container::setInstance($container);
+
+        $attributes = new ComponentAttributeBag(['userId' => 'bar', 'other' => 'ok']);
+
+        $containerComponent = m::mock(Component::class);
+        $containerComponent->shouldReceive('withName')->with('container')->once();
+        $containerComponent->shouldReceive('shouldRender')->once()->andReturn(true);
+        $containerComponent->shouldReceive('resolveView')->once()->andReturn('');
+        $containerComponent->shouldReceive('data')->once()->andReturn([]);
+        $containerComponent->shouldReceive('withAttributes')->once();
+
+        $profileComponent = m::mock(Component::class);
+        $profileComponent->shouldReceive('withName')->with('profile')->once();
+        $profileComponent->shouldReceive('shouldRender')->once()->andReturn(true);
+        $profileComponent->shouldReceive('resolveView')->once()->andReturn('');
+        $profileComponent->shouldReceive('data')->once()->andReturn([]);
+        $profileComponent->shouldReceive('withAttributes')->with(['attributes' => new ComponentAttributeBag(['other' => 'ok'])])->once();
+
+        Component::resolveComponentsUsing(fn ($component) => match ($component) {
+            TestContainerComponent::class => $containerComponent,
+            TestProfileComponent::class => $profileComponent,
+        });
+
+        $__env = m::mock(\Illuminate\View\Factory::class);
+        $__env->shouldReceive('startComponent')->twice();
+        $__env->shouldReceive('renderComponent')->twice();
+
+        $template = $this->compiler([
+            'container' => TestContainerComponent::class,
+            'profile' => TestProfileComponent::class,
+        ])->compileTags('<x-container><x-profile {{ $attributes }} /></x-container>');
+        $template = $this->compiler->compileString($template);
+
+        ob_start();
+        eval(" ?> $template <?php ");
+        ob_get_clean();
+
+        $this->assertSame($attributes->get('userId'), 'bar');
         $this->assertSame($attributes->get('other'), 'ok');
     }
 
@@ -797,3 +847,11 @@ public function render()
         return 'input';
     }
 }
+
+class TestContainerComponent extends Component
+{
+    public function render()
+    {
+        return 'container';
+    }
+}

tests/View/Blade/BladeComponentsTest.php

@@ -17,6 +17,7 @@ public function testComponentsAreCompiled()
     public function testClassComponentsAreCompiled()
     {
         $this->assertSame('<?php if (isset($component)) { $__componentOriginal2dda3d2f2f9b76bd400bf03f0b84e87f = $component; } ?>
+<?php if (isset($attributes)) { $__attributesOriginal2dda3d2f2f9b76bd400bf03f0b84e87f = $attributes; } ?>
 <?php $component = Illuminate\Tests\View\Blade\ComponentStub::class::resolve(["foo" => "bar"] + (isset($attributes) && $attributes instanceof Illuminate\View\ComponentAttributeBag ? (array) $attributes->getIterator() : [])); ?>
 <?php $component->withName(\'test\'); ?>
 <?php if ($component->shouldRender()): ?>
@@ -36,6 +37,10 @@ public function testEndComponentClassesAreCompiled()
 
         $this->assertSame('<?php echo $__env->renderComponent(); ?>
 <?php endif; ?>
+<?php if (isset($__attributesOriginal79aef92e83454121ab6e5f64077e7d8a)): ?>
+<?php $attributes = $__attributesOriginal79aef92e83454121ab6e5f64077e7d8a; ?>
+<?php unset($__attributesOriginal79aef92e83454121ab6e5f64077e7d8a); ?>
+<?php endif; ?>
 <?php if (isset($__componentOriginal79aef92e83454121ab6e5f64077e7d8a)): ?>
 <?php $component = $__componentOriginal79aef92e83454121ab6e5f64077e7d8a; ?>
 <?php unset($__componentOriginal79aef92e83454121ab6e5f64077e7d8a); ?>

tests/View/Blade/BladeUseTest.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Illuminate\Tests\View\Blade;
+
+class BladeUseTest extends AbstractBladeTestCase
+{
+    public function testUseStatementsAreCompiled()
+    {
+        $string = "Foo @use('SomeNamespace\SomeClass', 'Foo') bar";
+        $expected = "Foo <?php use \SomeNamespace\SomeClass as Foo; ?> bar";
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+
+    public function testUseStatementsWithoutAsAreCompiled()
+    {
+        $string = "Foo @use('SomeNamespace\SomeClass') bar";
+        $expected = "Foo <?php use \SomeNamespace\SomeClass; ?> bar";
+        $this->assertEquals($expected, $this->compiler->compileString($string));
+    }
+}