minor: update cs

kbond · kbond · commit e4024d1f05a5 · 2024-02-03T16:01:32.000-05:00
diff --git a/src/Attribute/AsLiveComponent.php b/src/Attribute/AsLiveComponent.php
@@ -37,8 +37,8 @@ final class AsLiveComponent extends AsTwigComponent
      * @param int         $urlReferenceType  Which type of URL should be generated for the given route. Use the constants from UrlGeneratorInterface (default: absolute path, e.g. "/dir/file").
      */
     public function __construct(
-        string $name = null,
-        string $template = null,
+        ?string $name = null,
+        ?string $template = null,
         private ?string $defaultAction = null,
         bool $exposePublicProps = true,
         string $attributesVar = 'attributes',
diff --git a/src/Attribute/LiveProp.php b/src/Attribute/LiveProp.php
@@ -96,7 +96,7 @@ public function __construct(
          *
          * @var string|string[]|null
          */
-        private null|string|array $onUpdated = null,
+        private string|array|null $onUpdated = null,
 
         /**
          * If true, this property will be synchronized with a query parameter
@@ -193,7 +193,7 @@ public function acceptUpdatesFromParent(): bool
         return $this->updateFromParent;
     }
 
-    public function onUpdated(): null|string|array
+    public function onUpdated(): string|array|null
     {
         return $this->onUpdated;
     }
diff --git a/src/ComponentToolsTrait.php b/src/ComponentToolsTrait.php
@@ -33,12 +33,12 @@ public function setLiveResponder(LiveResponder $liveResponder): void
         $this->liveResponder = $liveResponder;
     }
 
-    public function emit(string $eventName, array $data = [], string $componentName = null): void
+    public function emit(string $eventName, array $data = [], ?string $componentName = null): void
     {
         $this->liveResponder->emit($eventName, $data, $componentName);
     }
 
-    public function emitUp(string $eventName, array $data = [], string $componentName = null): void
+    public function emitUp(string $eventName, array $data = [], ?string $componentName = null): void
     {
         $this->liveResponder->emitUp($eventName, $data, $componentName);
     }
diff --git a/src/LiveResponder.php b/src/LiveResponder.php
@@ -28,7 +28,7 @@ final class LiveResponder
      */
     private array $browserEventsToDispatch = [];
 
-    public function emit(string $eventName, array $data = [], string $componentName = null): void
+    public function emit(string $eventName, array $data = [], ?string $componentName = null): void
     {
         $this->eventsToEmit[] = [
             'event' => $eventName,
@@ -38,7 +38,7 @@ public function emit(string $eventName, array $data = [], string $componentName
         ];
     }
 
-    public function emitUp(string $eventName, array $data = [], string $componentName = null): void
+    public function emitUp(string $eventName, array $data = [], ?string $componentName = null): void
     {
         $this->eventsToEmit[] = [
             'event' => $eventName,
diff --git a/src/Metadata/LivePropMetadata.php b/src/Metadata/LivePropMetadata.php
@@ -112,7 +112,7 @@ public function getFormat(): ?string
         return $this->liveProp->format();
     }
 
-    public function onUpdated(): null|string|array
+    public function onUpdated(): string|array|null
     {
         return $this->liveProp->onUpdated();
     }
diff --git a/src/Test/InteractsWithLiveComponents.php b/src/Test/InteractsWithLiveComponents.php
@@ -20,7 +20,7 @@
  */
 trait InteractsWithLiveComponents
 {
-    protected function createLiveComponent(string $name, array $data = [], KernelBrowser $client = null): TestLiveComponent
+    protected function createLiveComponent(string $name, array $data = [], ?KernelBrowser $client = null): TestLiveComponent
     {
         if (!$this instanceof KernelTestCase) {
             throw new \LogicException(sprintf('The "%s" trait can only be used on "%s" classes.', __TRAIT__, KernelTestCase::class));
diff --git a/src/Test/TestLiveComponent.php b/src/Test/TestLiveComponent.php
@@ -148,7 +148,7 @@ public function response(): Response
         return $this->client->getResponse();
     }
 
-    private function request(array $content = [], string $action = null): self
+    private function request(array $content = [], ?string $action = null): self
     {
         $csrfToken = $this->csrfToken();
 
diff --git a/src/Twig/DeterministicTwigIdCalculator.php b/src/Twig/DeterministicTwigIdCalculator.php
@@ -41,7 +41,7 @@ class DeterministicTwigIdCalculator
      * @param bool        $increment Whether to increment the counter for this file+line
      * @param string|null $key       An optional key to use instead of the incremented counter
      */
-    public function calculateDeterministicId(bool $increment = true, string $key = null): string
+    public function calculateDeterministicId(bool $increment = true, ?string $key = null): string
     {
         $lineData = $this->guessTemplateInfo();
 
diff --git a/src/Twig/TemplateCacheWarmer.php b/src/Twig/TemplateCacheWarmer.php
@@ -26,7 +26,7 @@ public function __construct(private \IteratorAggregate $templateIterator, privat
     {
     }
 
-    public function warmUp(string $cacheDir, string $buildDir = null): array
+    public function warmUp(string $cacheDir, ?string $buildDir = null): array
     {
         $map = [];
         foreach ($this->templateIterator as $item) {
diff --git a/src/Util/LiveControllerAttributesCreator.php b/src/Util/LiveControllerAttributesCreator.php
@@ -56,7 +56,7 @@ public function __construct(
      * Calculates the array of extra attributes that should be added to the root
      * component element to activate the live controller functionality.
      */
-    public function attributesForRendering(MountedComponent $mounted, ComponentMetadata $metadata, bool $isChildComponent, string $deterministicId = null): LiveAttributesCollection
+    public function attributesForRendering(MountedComponent $mounted, ComponentMetadata $metadata, bool $isChildComponent, ?string $deterministicId = null): LiveAttributesCollection
     {
         $attributesCollection = $this->attributeHelper->create();
         $attributesCollection->setLiveController($mounted->getName());
diff --git a/tests/Functional/Form/ComponentWithFormTest.php b/tests/Functional/Form/ComponentWithFormTest.php
@@ -193,7 +193,7 @@ public function testHandleCheckboxChanges(): void
             ],
         ], $dehydratedProps['form']);
 
-        $getUrl = function (array $props, array $updatedProps = null) {
+        $getUrl = function (array $props, ?array $updatedProps = null) {
             $url = '/_components/form_with_many_different_fields_type?props='.urlencode(json_encode($props));
             if (null !== $updatedProps) {
                 $url .= '&updated='.urlencode(json_encode($updatedProps));
diff --git a/tests/Integration/LiveComponentHydratorTest.php b/tests/Integration/LiveComponentHydratorTest.php
@@ -52,7 +52,7 @@ final class LiveComponentHydratorTest extends KernelTestCase
     use LiveComponentTestHelper;
     use ResetDatabase;
 
-    private function executeHydrationTestCase(callable $testFactory, int $minPhpVersion = null): void
+    private function executeHydrationTestCase(callable $testFactory, ?int $minPhpVersion = null): void
     {
         if (null !== $minPhpVersion && $minPhpVersion > \PHP_VERSION_ID) {
             $this->markTestSkipped(sprintf('Test requires PHP version %s or higher.', $minPhpVersion));
@@ -140,7 +140,7 @@ private function executeHydrationTestCase(callable $testFactory, int $minPhpVers
     /**
      * @dataProvider provideDehydrationHydrationTests
      */
-    public function testCanDehydrateAndHydrateComponentWithTestCases(callable $testFactory, int $minPhpVersion = null): void
+    public function testCanDehydrateAndHydrateComponentWithTestCases(callable $testFactory, ?int $minPhpVersion = null): void
     {
         $this->executeHydrationTestCase($testFactory, $minPhpVersion);
     }
@@ -1199,7 +1199,7 @@ public function __construct()
     /**
      * @dataProvider provideInvalidHydrationTests
      */
-    public function testInvalidTypeHydration(callable $testFactory, int $minPhpVersion = null): void
+    public function testInvalidTypeHydration(callable $testFactory, ?int $minPhpVersion = null): void
     {
         $this->executeHydrationTestCase($testFactory, $minPhpVersion);
     }
@@ -1614,7 +1614,7 @@ public function getTest(LiveComponentMetadataFactory $metadataFactory): Hydratio
         );
     }
 
-    public function expectsExceptionDuringHydration(string $exceptionClass, string $exceptionMessage = null): self
+    public function expectsExceptionDuringHydration(string $exceptionClass, ?string $exceptionMessage = null): self
     {
         $this->expectedHydrationException = $exceptionClass;
         $this->expectHydrationExceptionMessage = $exceptionMessage;

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function __construct(`
`96`	`96`	`*`
`97`	`97`	`* @var string\|string[]\|null`
`98`	`98`	`*/`
`99`		`- private null\|string\|array $onUpdated = null,`
	`99`	`+ private string\|array\|null $onUpdated = null,`
`100`	`100`
`101`	`101`	`/**`
`102`	`102`	`* If true, this property will be synchronized with a query parameter`
`@@ -193,7 +193,7 @@ public function acceptUpdatesFromParent(): bool`
`193`	`193`	`return $this->updateFromParent;`
`194`	`194`	`}`
`195`	`195`
`196`		`- public function onUpdated(): null\|string\|array`
	`196`	`+ public function onUpdated(): string\|array\|null`
`197`	`197`	`{`
`198`	`198`	`return $this->onUpdated;`
`199`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,12 @@ public function setLiveResponder(LiveResponder $liveResponder): void`
`33`	`33`	`$this->liveResponder = $liveResponder;`
`34`	`34`	`}`
`35`	`35`
`36`		`- public function emit(string $eventName, array $data = [], string $componentName = null): void`
	`36`	`+ public function emit(string $eventName, array $data = [], ?string $componentName = null): void`
`37`	`37`	`{`
`38`	`38`	`$this->liveResponder->emit($eventName, $data, $componentName);`
`39`	`39`	`}`
`40`	`40`
`41`		`- public function emitUp(string $eventName, array $data = [], string $componentName = null): void`
	`41`	`+ public function emitUp(string $eventName, array $data = [], ?string $componentName = null): void`
`42`	`42`	`{`
`43`	`43`	`$this->liveResponder->emitUp($eventName, $data, $componentName);`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ final class LiveResponder`
`28`	`28`	`*/`
`29`	`29`	`private array $browserEventsToDispatch = [];`
`30`	`30`
`31`		`- public function emit(string $eventName, array $data = [], string $componentName = null): void`
	`31`	`+ public function emit(string $eventName, array $data = [], ?string $componentName = null): void`
`32`	`32`	`{`
`33`	`33`	`$this->eventsToEmit[] = [`
`34`	`34`	`'event' => $eventName,`
`@@ -38,7 +38,7 @@ public function emit(string $eventName, array $data = [], string $componentName`
`38`	`38`	`];`
`39`	`39`	`}`
`40`	`40`
`41`		`- public function emitUp(string $eventName, array $data = [], string $componentName = null): void`
	`41`	`+ public function emitUp(string $eventName, array $data = [], ?string $componentName = null): void`
`42`	`42`	`{`
`43`	`43`	`$this->eventsToEmit[] = [`
`44`	`44`	`'event' => $eventName,`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function getFormat(): ?string`
`112`	`112`	`return $this->liveProp->format();`
`113`	`113`	`}`
`114`	`114`
`115`		`- public function onUpdated(): null\|string\|array`
	`115`	`+ public function onUpdated(): string\|array\|null`
`116`	`116`	`{`
`117`	`117`	`return $this->liveProp->onUpdated();`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`trait InteractsWithLiveComponents`
`22`	`22`	`{`
`23`		`- protected function createLiveComponent(string $name, array $data = [], KernelBrowser $client = null): TestLiveComponent`
	`23`	`+ protected function createLiveComponent(string $name, array $data = [], ?KernelBrowser $client = null): TestLiveComponent`
`24`	`24`	`{`
`25`	`25`	`if (!$this instanceof KernelTestCase) {`
`26`	`26`	`throw new \LogicException(sprintf('The "%s" trait can only be used on "%s" classes.', __TRAIT__, KernelTestCase::class));`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function response(): Response`
`148`	`148`	`return $this->client->getResponse();`
`149`	`149`	`}`
`150`	`150`
`151`		`- private function request(array $content = [], string $action = null): self`
	`151`	`+ private function request(array $content = [], ?string $action = null): self`
`152`	`152`	`{`
`153`	`153`	`$csrfToken = $this->csrfToken();`
`154`	`154`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class DeterministicTwigIdCalculator`
`41`	`41`	`* @param bool $increment Whether to increment the counter for this file+line`
`42`	`42`	`* @param string\|null $key An optional key to use instead of the incremented counter`
`43`	`43`	`*/`
`44`		`- public function calculateDeterministicId(bool $increment = true, string $key = null): string`
	`44`	`+ public function calculateDeterministicId(bool $increment = true, ?string $key = null): string`
`45`	`45`	`{`
`46`	`46`	`$lineData = $this->guessTemplateInfo();`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function __construct(private \IteratorAggregate $templateIterator, privat`
`26`	`26`	`{`
`27`	`27`	`}`
`28`	`28`
`29`		`- public function warmUp(string $cacheDir, string $buildDir = null): array`
	`29`	`+ public function warmUp(string $cacheDir, ?string $buildDir = null): array`
`30`	`30`	`{`
`31`	`31`	`$map = [];`
`32`	`32`	`foreach ($this->templateIterator as $item) {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function __construct(`
`56`	`56`	`* Calculates the array of extra attributes that should be added to the root`
`57`	`57`	`* component element to activate the live controller functionality.`
`58`	`58`	`*/`
`59`		`- public function attributesForRendering(MountedComponent $mounted, ComponentMetadata $metadata, bool $isChildComponent, string $deterministicId = null): LiveAttributesCollection`
	`59`	`+ public function attributesForRendering(MountedComponent $mounted, ComponentMetadata $metadata, bool $isChildComponent, ?string $deterministicId = null): LiveAttributesCollection`
`60`	`60`	`{`
`61`	`61`	`$attributesCollection = $this->attributeHelper->create();`
`62`	`62`	`$attributesCollection->setLiveController($mounted->getName());`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ final class LiveComponentHydratorTest extends KernelTestCase`
`52`	`52`	`use LiveComponentTestHelper;`
`53`	`53`	`use ResetDatabase;`
`54`	`54`
`55`		`- private function executeHydrationTestCase(callable $testFactory, int $minPhpVersion = null): void`
	`55`	`+ private function executeHydrationTestCase(callable $testFactory, ?int $minPhpVersion = null): void`
`56`	`56`	`{`
`57`	`57`	`if (null !== $minPhpVersion && $minPhpVersion > \PHP_VERSION_ID) {`
`58`	`58`	`$this->markTestSkipped(sprintf('Test requires PHP version %s or higher.', $minPhpVersion));`
`@@ -140,7 +140,7 @@ private function executeHydrationTestCase(callable $testFactory, int $minPhpVers`
`140`	`140`	`/**`
`141`	`141`	`* @dataProvider provideDehydrationHydrationTests`
`142`	`142`	`*/`
`143`		`- public function testCanDehydrateAndHydrateComponentWithTestCases(callable $testFactory, int $minPhpVersion = null): void`
	`143`	`+ public function testCanDehydrateAndHydrateComponentWithTestCases(callable $testFactory, ?int $minPhpVersion = null): void`
`144`	`144`	`{`
`145`	`145`	`$this->executeHydrationTestCase($testFactory, $minPhpVersion);`
`146`	`146`	`}`
`@@ -1199,7 +1199,7 @@ public function __construct()`
`1199`	`1199`	`/**`
`1200`	`1200`	`* @dataProvider provideInvalidHydrationTests`
`1201`	`1201`	`*/`
`1202`		`- public function testInvalidTypeHydration(callable $testFactory, int $minPhpVersion = null): void`
	`1202`	`+ public function testInvalidTypeHydration(callable $testFactory, ?int $minPhpVersion = null): void`
`1203`	`1203`	`{`
`1204`	`1204`	`$this->executeHydrationTestCase($testFactory, $minPhpVersion);`
`1205`	`1205`	`}`
`@@ -1614,7 +1614,7 @@ public function getTest(LiveComponentMetadataFactory $metadataFactory): Hydratio`
`1614`	`1614`	`);`
`1615`	`1615`	`}`
`1616`	`1616`
`1617`		`- public function expectsExceptionDuringHydration(string $exceptionClass, string $exceptionMessage = null): self`
	`1617`	`+ public function expectsExceptionDuringHydration(string $exceptionClass, ?string $exceptionMessage = null): self`
`1618`	`1618`	`{`
`1619`	`1619`	`$this->expectedHydrationException = $exceptionClass;`
`1620`	`1620`	`$this->expectHydrationExceptionMessage = $exceptionMessage;`