diff --git a/src/Illuminate/Console/View/Components/Component.php b/src/Illuminate/Console/View/Components/Component.php index 263d0034ad1..e0dabbb2d1d 100644 --- a/src/Illuminate/Console/View/Components/Component.php +++ b/src/Illuminate/Console/View/Components/Component.php @@ -6,6 +6,7 @@ use Illuminate\Console\QuestionHelper; use ReflectionClass; use Symfony\Component\Console\Helper\SymfonyQuestionHelper; + use function Termwind\render; use function Termwind\renderUsing; diff --git a/src/Illuminate/Console/View/Components/Task.php b/src/Illuminate/Console/View/Components/Task.php index cac979db7cd..c5b326b1710 100644 --- a/src/Illuminate/Console/View/Components/Task.php +++ b/src/Illuminate/Console/View/Components/Task.php @@ -3,9 +3,10 @@ namespace Illuminate\Console\View\Components; use Symfony\Component\Console\Output\OutputInterface; -use function Termwind\terminal; use Throwable; +use function Termwind\terminal; + class Task extends Component { /** diff --git a/src/Illuminate/Console/resources/views/components/line.php b/src/Illuminate/Console/resources/views/components/line.php index a6c38cfab00..a759564c739 100644 --- a/src/Illuminate/Console/resources/views/components/line.php +++ b/src/Illuminate/Console/resources/views/components/line.php @@ -1,8 +1,8 @@
+ echo 'ml-1'; + } ?>">
diff --git a/src/Illuminate/Database/Eloquent/Casts/ArrayObject.php b/src/Illuminate/Database/Eloquent/Casts/ArrayObject.php index 896445ee1a4..176b7335ccd 100644 --- a/src/Illuminate/Database/Eloquent/Casts/ArrayObject.php +++ b/src/Illuminate/Database/Eloquent/Casts/ArrayObject.php @@ -9,6 +9,7 @@ /** * @template TKey of array-key * @template TItem + * * @extends \ArrayObject */ class ArrayObject extends BaseArrayObject implements Arrayable, JsonSerializable diff --git a/src/Illuminate/Foundation/Console/ServeCommand.php b/src/Illuminate/Foundation/Console/ServeCommand.php index 1e5e3d0075b..9a27fa45964 100644 --- a/src/Illuminate/Foundation/Console/ServeCommand.php +++ b/src/Illuminate/Foundation/Console/ServeCommand.php @@ -9,6 +9,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Process\PhpExecutableFinder; use Symfony\Component\Process\Process; + use function Termwind\terminal; #[AsCommand(name: 'serve')] diff --git a/src/Illuminate/Foundation/Exceptions/Whoops/WhoopsExceptionRenderer.php b/src/Illuminate/Foundation/Exceptions/Whoops/WhoopsExceptionRenderer.php index 908d9a26286..82f707e0a62 100644 --- a/src/Illuminate/Foundation/Exceptions/Whoops/WhoopsExceptionRenderer.php +++ b/src/Illuminate/Foundation/Exceptions/Whoops/WhoopsExceptionRenderer.php @@ -3,9 +3,10 @@ namespace Illuminate\Foundation\Exceptions\Whoops; use Illuminate\Contracts\Foundation\ExceptionRenderer; -use function tap; use Whoops\Run as Whoops; +use function tap; + class WhoopsExceptionRenderer implements ExceptionRenderer { /** diff --git a/src/Illuminate/Log/LogManager.php b/src/Illuminate/Log/LogManager.php index 4c1d3c882e0..e02b066991a 100644 --- a/src/Illuminate/Log/LogManager.php +++ b/src/Illuminate/Log/LogManager.php @@ -402,16 +402,19 @@ protected function createMonologDriver(array $config) $config['handler_with'] ?? [] ); + $handler = $this->prepareHandler( + $this->app->make($config['handler'], $with), $config + ); + + $processors = collect($config['processors'] ?? []) + ->map(fn ($processor) => $this->app->make($processor['processor'] ?? $processor, $processor['with'] ?? [])) + ->toArray(); + return new Monolog( $this->parseChannel($config), - [ - $this->prepareHandler( - $this->app->make($config['handler'], $with), $config - ), - ], - collect($config['processors'] ?? []) - ->map(fn ($processor) => $this->app->make($processor['processor'] ?? $processor, $processor['with'] ?? []) - )->toArray()); + [$handler], + $processors, + ); } /** diff --git a/src/Illuminate/Mail/Mailable.php b/src/Illuminate/Mail/Mailable.php index ba4aeccdc45..ca987c58357 100644 --- a/src/Illuminate/Mail/Mailable.php +++ b/src/Illuminate/Mail/Mailable.php @@ -1365,7 +1365,7 @@ public function assertDontSeeInHtml($string, $escape = true) */ public function assertSeeInOrderInHtml($strings, $escape = true) { - $strings = $escape ? array_map('e', ($strings)) : $strings; + $strings = $escape ? array_map('e', $strings) : $strings; [$html, $text] = $this->renderForAssertions(); diff --git a/src/Illuminate/Queue/Console/WorkCommand.php b/src/Illuminate/Queue/Console/WorkCommand.php index b95006ab151..2cf44161b8d 100644 --- a/src/Illuminate/Queue/Console/WorkCommand.php +++ b/src/Illuminate/Queue/Console/WorkCommand.php @@ -14,6 +14,7 @@ use Illuminate\Support\Carbon; use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Terminal; + use function Termwind\terminal; #[AsCommand(name: 'queue:work')] diff --git a/tests/Foundation/FoundationViteTest.php b/tests/Foundation/FoundationViteTest.php index 6fc4b854dd4..4c0319a6afb 100644 --- a/tests/Foundation/FoundationViteTest.php +++ b/tests/Foundation/FoundationViteTest.php @@ -829,7 +829,7 @@ public function testItCanSpecifyAttributesForPreloadedAssets() .'' .'' .'', - $result->toHtml()); + $result->toHtml()); $this->assertSame([ "https://example.com/$buildDir/assets/app.versioned.css" => [ @@ -1041,7 +1041,7 @@ public function testPreloadAssetsGetAssetNonce() .'' .'' .'', - $result->toHtml()); + $result->toHtml()); $this->assertSame([ "https://example.com/$buildDir/assets/app.versioned.css" => [ @@ -1088,7 +1088,7 @@ public function testCrossoriginAttributeIsInheritedByPreloadTags() .'' .'' .'', - $result->toHtml()); + $result->toHtml()); $this->assertSame([ "https://example.com/$buildDir/assets/app.versioned.css" => [ @@ -1127,7 +1127,7 @@ public function testItCanConfigureTheManifestFilename() $this->assertSame( '' .'', - $result->toHtml()); + $result->toHtml()); unlink(public_path("{$buildDir}/custom-manifest.json")); rmdir(public_path($buildDir)); @@ -1166,7 +1166,7 @@ public function testItOnlyOutputsUniquePreloadTags() .'' .'' .'', - $result->toHtml()); + $result->toHtml()); $this->assertSame([ "https://example.com/$buildDir/assets/app-versioned.css" => [ diff --git a/tests/Support/SupportStrTest.php b/tests/Support/SupportStrTest.php index 25cf6f9960e..6a202d19250 100755 --- a/tests/Support/SupportStrTest.php +++ b/tests/Support/SupportStrTest.php @@ -172,10 +172,10 @@ public function testStrExcerpt() $this->assertSame('...abc...', Str::excerpt('z abc d', 'b', ['radius' => 1])); $this->assertSame('[...]is a beautiful morn[...]', Str::excerpt('This is a beautiful morning', 'beautiful', ['omission' => '[...]', 'radius' => 5])); $this->assertSame( - 'This is the ultimate supercalifragilisticexpialidoceous very looooooooooooooooooong looooooooooooong beautiful morning with amazing sunshine and awesome tempera[...]', - Str::excerpt('This is the ultimate supercalifragilisticexpialidoceous very looooooooooooooooooong looooooooooooong beautiful morning with amazing sunshine and awesome temperatures. So what are you gonna do about it?', 'very', - ['omission' => '[...]'], - )); + 'This is the ultimate supercalifragilisticexpialidoceous very looooooooooooooooooong looooooooooooong beautiful morning with amazing sunshine and awesome tempera[...]', + Str::excerpt('This is the ultimate supercalifragilisticexpialidoceous very looooooooooooooooooong looooooooooooong beautiful morning with amazing sunshine and awesome temperatures. So what are you gonna do about it?', 'very', + ['omission' => '[...]'], + )); $this->assertSame('...y...', Str::excerpt('taylor', 'y', ['radius' => 0])); $this->assertSame('...ayl...', Str::excerpt('taylor', 'Y', ['radius' => 1])); diff --git a/tests/Testing/TestResponseTest.php b/tests/Testing/TestResponseTest.php index 474ff871bbb..005c1efca23 100644 --- a/tests/Testing/TestResponseTest.php +++ b/tests/Testing/TestResponseTest.php @@ -1950,7 +1950,7 @@ public function testAssertLocation() app()->instance('url', $url = new UrlGenerator(new RouteCollection, new Request)); $response = TestResponse::fromBaseResponse( - (new RedirectResponse($url->to('https://foo.com'))) + new RedirectResponse($url->to('https://foo.com')) ); $response->assertLocation('https://foo.com'); diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php index 61513a2f831..5a3121c896a 100755 --- a/tests/Validation/ValidationValidatorTest.php +++ b/tests/Validation/ValidationValidatorTest.php @@ -803,9 +803,7 @@ public function testCustomException() $v = new Validator($trans, ['name' => ''], ['name' => 'required']); - $exception = new class($v) extends ValidationException - { - }; + $exception = new class($v) extends ValidationException {}; $v->setException($exception); try { diff --git a/types/Cache/Repository.php b/types/Cache/Repository.php index a40ee7af8e2..d99bed96877 100644 --- a/types/Cache/Repository.php +++ b/types/Cache/Repository.php @@ -1,6 +1,7 @@ $exception */ diff --git a/types/Http/Request.php b/types/Http/Request.php index a13cec69a1c..6977852c139 100644 --- a/types/Http/Request.php +++ b/types/Http/Request.php @@ -1,6 +1,7 @@ 'Taylor', 'age' => 25, 'user' => new User]); diff --git a/types/Support/LazyCollection.php b/types/Support/LazyCollection.php index 32cbeddc551..104c2c8f3b5 100644 --- a/types/Support/LazyCollection.php +++ b/types/Support/LazyCollection.php @@ -2,6 +2,7 @@ use Illuminate\Contracts\Support\Arrayable; use Illuminate\Support\LazyCollection; + use function PHPStan\Testing\assertType; $collection = new LazyCollection([new User]); diff --git a/types/Support/Timebox.php b/types/Support/Timebox.php index 16c757892aa..39c94f89672 100644 --- a/types/Support/Timebox.php +++ b/types/Support/Timebox.php @@ -1,6 +1,7 @@ call(function ($timebox) {