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

Update to use PHP 8.1 syntax
mezzio · Nov 3, 2024 · 9c82de1 · 9c82de1
2 parents ac6af3b + a45a112
commit 9c82de1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/TwigEnvironmentFactory.php b/src/TwigEnvironmentFactory.php
@@ -140,8 +140,8 @@ public function __invoke(ContainerInterface $container): Environment
         // Add template paths
         $allPaths = isset($config['paths']) && is_array($config['paths']) ? $config['paths'] : [];
         foreach ($allPaths as $namespace => $paths) {
-            $namespace = is_numeric($namespace) ? null : $namespace;
-            $namespace = $namespace ?? FilesystemLoader::MAIN_NAMESPACE;
+            $namespace   = is_numeric($namespace) ? null : $namespace;
+            $namespace ??= FilesystemLoader::MAIN_NAMESPACE;
             foreach ((array) $paths as $path) {
                 $loader->addPath($path, $namespace);
             }

diff --git a/src/TwigExtension.php b/src/TwigExtension.php
@@ -16,11 +16,11 @@
 class TwigExtension extends AbstractExtension implements GlobalsInterface
 {
     public function __construct(
-        private ServerUrlHelper $serverUrlHelper,
-        private UrlHelper $urlHelper,
-        private ?string $assetsUrl,
-        private null|string|int $assetsVersion,
-        private array $globals = []
+        private readonly ServerUrlHelper $serverUrlHelper,
+        private readonly UrlHelper $urlHelper,
+        private readonly ?string $assetsUrl,
+        private readonly null|string|int $assetsVersion,
+        private readonly array $globals = []
     ) {
     }
 

diff --git a/src/TwigRenderer.php b/src/TwigRenderer.php
@@ -96,7 +96,7 @@ public function render(string $name, $params = []): string
      */
     public function addPath(string $path, ?string $namespace = null): void
     {
-        $namespace = $namespace ?? FilesystemLoader::MAIN_NAMESPACE;
+        $namespace ??= FilesystemLoader::MAIN_NAMESPACE;
         $this->twigLoader->addPath($path, $namespace);
     }
 

diff --git a/test/TwigExtensionTest.php b/test/TwigExtensionTest.php
@@ -53,7 +53,7 @@ public function createExtension(?string $assetsUrl, $assetsVersion): TwigExtensi
 
     public function assertFunctionExists(string $name, array $functions, ?string $message = null): void
     {
-        $message  = $message ?? sprintf('Failed to identify function by name %s', $name);
+        $message ??= sprintf('Failed to identify function by name %s', $name);
         $function = $this->findFunction($name, $functions);
         $this->assertInstanceOf(TwigFunction::class, $function, $message);
     }

diff --git a/test/TwigRendererFactoryTest.php b/test/TwigRendererFactoryTest.php
@@ -177,7 +177,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) {
@@ -196,7 +196,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) {
@@ -214,7 +214,7 @@ public function assertPathNamespaceContains(
         array $paths,
         ?string $message = null
     ): void {
-        $message = $message ?? sprintf('Did not find path %s in namespace %s', $expected, $namespace ?? 'null');
+        $message ??= sprintf('Did not find path %s in namespace %s', $expected, $namespace ?? 'null');
 
         $found = [];
         foreach ($paths as $path) {

diff --git a/test/TwigRendererTest.php b/test/TwigRendererTest.php
@@ -33,7 +33,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()
@@ -70,19 +70,19 @@ public function testCanAddPathWithEmptyNamespace(): 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);
     }
 
     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);
     }
 
@@ -103,7 +103,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)
         );