Merge pull request #32 from samsonasik/update-to-php81-syntax

Update to use PHP 8.1 syntax

Author: gsteel

src/Extension/EscaperExtension.php

@@ -10,7 +10,7 @@
 
 class EscaperExtension implements ExtensionInterface
 {
-    private Escaper $escaper;
+    private readonly Escaper $escaper;
 
     public function __construct(?string $encoding = null)
     {

src/Extension/UrlExtension.php

@@ -14,8 +14,10 @@
 /** @psalm-import-type UrlGeneratorOptions from UrlHelperInterface */
 class UrlExtension implements ExtensionInterface
 {
-    public function __construct(private UrlHelper $urlHelper, private ServerUrlHelper $serverUrlHelper)
-    {
+    public function __construct(
+        private readonly UrlHelper $urlHelper,
+        private readonly ServerUrlHelper $serverUrlHelper
+    ) {
     }
 
     /**

test/PlatesRendererFactoryTest.php

@@ -61,7 +61,7 @@ public function getConfigurationPaths(): array
 
     public function assertPathsHasNamespace(?string $namespace, array $paths, ?string $message = null): void
     {
-        $message = $message ?? sprintf('Paths do not contain namespace %s', $namespace ?? 'null');
+        $message ??= sprintf('Paths do not contain namespace %s', $namespace ?? 'null');
 
         $found = false;
         foreach ($paths as $path) {
@@ -80,7 +80,7 @@ public function assertPathNamespaceCount(
         array $paths,
         ?string $message = null
     ): void {
-        $message = $message ?? sprintf('Did not find %d paths with namespace %s', $expected, $namespace ?? 'null');
+        $message ??= sprintf('Did not find %d paths with namespace %s', $expected, $namespace ?? 'null');
 
         $count = 0;
         foreach ($paths as $path) {
@@ -98,7 +98,7 @@ public function assertPathNamespaceContains(
         array $paths,
         ?string $message = null
     ): void {
-        $message = $message ?? sprintf('Did not find path %s in namespace %s', $expected, $namespace ?? '');
+        $message ??= sprintf('Did not find path %s in namespace %s', $expected, $namespace ?? '');
 
         $found = [];
         foreach ($paths as $path) {

test/PlatesRendererTest.php

@@ -37,13 +37,13 @@ public function setUp(): void
 
     public function assertTemplatePath(string $path, TemplatePath $templatePath, ?string $message = null): void
     {
-        $message = $message ?? sprintf('Failed to assert TemplatePath contained path %s', $path);
+        $message ??= sprintf('Failed to assert TemplatePath contained path %s', $path);
         $this->assertEquals($path, $templatePath->getPath(), $message);
     }
 
     public function assertTemplatePathString(string $path, TemplatePath $templatePath, ?string $message = null): void
     {
-        $message = $message ?? sprintf('Failed to assert TemplatePath casts to string path %s', $path);
+        $message ??= sprintf('Failed to assert TemplatePath casts to string path %s', $path);
         $this->assertEquals($path, (string) $templatePath, $message);
     }
 
@@ -52,7 +52,7 @@ public function assertTemplatePathNamespace(
         TemplatePath $templatePath,
         ?string $message = null
     ): void {
-        $message = $message ?? sprintf(
+        $message ??= sprintf(
             'Failed to assert TemplatePath namespace matched %s',
             var_export($namespace, true)
         );
@@ -61,7 +61,7 @@ public function assertTemplatePathNamespace(
 
     public function assertEmptyTemplatePathNamespace(TemplatePath $templatePath, ?string $message = null): void
     {
-        $message = $message ?? 'Failed to assert TemplatePath namespace was empty';
+        $message ??= 'Failed to assert TemplatePath namespace was empty';
         $this->assertEmpty($templatePath->getNamespace(), $message);
     }
 
@@ -70,7 +70,7 @@ public function assertEqualTemplatePath(
         TemplatePath $received,
         ?string $message = null
     ): void {
-        $message = $message ?? 'Failed to assert TemplatePaths are equal';
+        $message ??= 'Failed to assert TemplatePaths are equal';
         if (
             $expected->getPath() !== $received->getPath()
             || $expected->getNamespace() !== $received->getNamespace()