IBX-9727: Added missing type hints

src/lib/Asset/AssetPathResolver.php

@@ -19,7 +19,7 @@ class AssetPathResolver implements AssetPathResolverInterface
 
     private ?LoggerInterface $logger;
 
-    public function __construct(array $designPaths, $webRootDir, LoggerInterface $logger = null)
+    public function __construct(array $designPaths, string $webRootDir, LoggerInterface $logger = null)
     {
         $this->designPaths = $designPaths;
         $this->webRootDir = $webRootDir;

src/lib/Asset/ProvisionedPathResolver.php

@@ -20,7 +20,7 @@ class ProvisionedPathResolver implements AssetPathResolverInterface, AssetPathPr
 
     private string $webRootDir;
 
-    public function __construct(array $resolvedPaths, AssetPathResolverInterface $innerResolver, $webRootDir)
+    public function __construct(array $resolvedPaths, AssetPathResolverInterface $innerResolver, string $webRootDir)
     {
         $this->resolvedPaths = $resolvedPaths;
         $this->innerResolver = $innerResolver;

src/lib/Templating/TemplatePathRegistry.php

@@ -16,7 +16,7 @@ class TemplatePathRegistry implements TemplatePathRegistryInterface, Serializabl
 
     private string $kernelRootDir;
 
-    public function __construct($kernelRootDir)
+    public function __construct(string $kernelRootDir)
     {
         $this->kernelRootDir = $kernelRootDir;
     }

src/lib/Templating/Twig/TwigThemeLoader.php

@@ -77,7 +77,7 @@ public function getNamespaces(): array
     /**
      * @param string|string[] $paths
      */
-    public function setPaths(string|array $paths, $namespace = FilesystemLoader::MAIN_NAMESPACE): void
+    public function setPaths(string|array $paths, string $namespace = FilesystemLoader::MAIN_NAMESPACE): void
     {
         $this->innerFilesystemLoader->setPaths($paths, $namespace);
     }

tests/lib/Asset/AssetPathResolverTest.php

@@ -15,7 +15,7 @@
 
 class AssetPathResolverTest extends TestCase
 {
-    public function testResolveAssetPathFail()
+    public function testResolveAssetPathFail(): void
     {
         $logger = $this->createMock(LoggerInterface::class);
         $logger
@@ -30,15 +30,15 @@ public function testResolveAssetPathFail()
     /**
      * @covers \Ibexa\DesignEngine\Asset\AssetPathResolver::resolveAssetPath
      */
-    public function testResolveInvalidDesign()
+    public function testResolveInvalidDesign(): void
     {
         $resolver = new AssetPathResolver([], __DIR__);
         $assetPath = 'images/foo.png';
         $this->expectException(InvalidDesignException::class);
         self::assertSame($assetPath, $resolver->resolveAssetPath($assetPath, 'foo'));
     }
 
-    public function resolveAssetPathProvider()
+    public function resolveAssetPathProvider(): array
     {
         return [
             [
@@ -107,7 +107,7 @@ public function resolveAssetPathProvider()
     /**
      * @dataProvider resolveAssetPathProvider
      */
-    public function testResolveAssetPath(array $designPaths, array $existingPaths, $path, $resolvedPath)
+    public function testResolveAssetPath(array $designPaths, array $existingPaths, string $path, string $resolvedPath): void
     {
         $webrootDir = vfsStream::setup('web');
         foreach ($designPaths['foo'] as $designPath) {

tests/lib/Asset/ProvisionedPathResolverTest.php

@@ -11,14 +11,12 @@
 use Ibexa\DesignEngine\Asset\AssetPathResolverInterface;
 use Ibexa\DesignEngine\Asset\ProvisionedPathResolver;
 use org\bovigo\vfs\vfsStream;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class ProvisionedPathResolverTest extends TestCase
 {
-    /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|\Ibexa\DesignEngine\Asset\AssetPathResolverInterface
-     */
-    private $innerResolver;
+    private AssetPathResolverInterface&MockObject $innerResolver;
 
     /**
      * @var \org\bovigo\vfs\vfsStreamDirectory
@@ -32,7 +30,7 @@ protected function setUp(): void
         $this->webrootDir = vfsStream::setup('web');
     }
 
-    public function testResolvePathNotProvisioned()
+    public function testResolvePathNotProvisioned(): void
     {
         $assetLogicalPath = 'images/some_image.jpg';
         $design = 'foo';
@@ -51,7 +49,7 @@ public function testResolvePathNotProvisioned()
         self::assertSame($expected, $resolver->resolveAssetPath($assetLogicalPath, $design));
     }
 
-    public function testResolveProvisionedPath()
+    public function testResolveProvisionedPath(): void
     {
         $expected = 'some/path/images/some_image.jpg';
         $assetLogicalPath = 'images/some_image.jpg';
@@ -64,7 +62,7 @@ public function testResolveProvisionedPath()
         self::assertSame($expected, $resolver->resolveAssetPath($assetLogicalPath, $design));
     }
 
-    public function testProvisionResolvedPaths()
+    public function testProvisionResolvedPaths(): void
     {
         $design = 'some_design';
         $themesPaths = [

tests/lib/Asset/ThemePackageTest.php

@@ -10,25 +10,17 @@
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\DesignEngine\Asset\AssetPathResolverInterface;
 use Ibexa\DesignEngine\Asset\ThemePackage;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Asset\PackageInterface;
 
 class ThemePackageTest extends TestCase
 {
-    /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|\Ibexa\DesignEngine\Asset\AssetPathResolverInterface
-     */
-    private $assetPathResolver;
+    private AssetPathResolverInterface&MockObject $assetPathResolver;
 
-    /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\Asset\PackageInterface
-     */
-    private $innerPackage;
+    private PackageInterface&MockObject $innerPackage;
 
-    /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|\Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
-     */
-    private $configResolver;
+    private ConfigResolverInterface&MockObject $configResolver;
 
     protected function setUp(): void
     {
@@ -39,7 +31,7 @@ protected function setUp(): void
         $this->configResolver = $this->createMock(ConfigResolverInterface::class);
     }
 
-    public function testGetUrl()
+    public function testGetUrl(): void
     {
         $assetPath = 'images/foo.png';
         $fullAssetPath = 'assets/' . $assetPath;
@@ -65,7 +57,7 @@ public function testGetUrl()
         self::assertSame("/$fullAssetPath", $package->getUrl($assetPath));
     }
 
-    public function testGetVersion()
+    public function testGetVersion(): void
     {
         $assetPath = 'images/foo.png';
         $fullAssetPath = 'assets/' . $assetPath;

tests/lib/Templating/TemplatePathRegistryTest.php

@@ -12,12 +12,12 @@
 
 class TemplatePathRegistryTest extends TestCase
 {
-    private function getExpectedRelativePath($templateFullPath, $kernelRootDir)
+    private function getExpectedRelativePath(string $templateFullPath, string $kernelRootDir): string
     {
         return str_replace($kernelRootDir . '/', '', $templateFullPath);
     }
 
-    public function testMapTemplatePath()
+    public function testMapTemplatePath(): void
     {
         $kernelRootDir = __DIR__;
         $templateLogicalName = '@foo/bar.html.twig';
@@ -32,7 +32,7 @@ public function testMapTemplatePath()
         );
     }
 
-    public function testGetTemplatePath()
+    public function testGetTemplatePath(): void
     {
         $kernelRootDir = __DIR__;
         $templateLogicalName = '@foo/bar.html.twig';
@@ -46,7 +46,7 @@ public function testGetTemplatePath()
         );
     }
 
-    public function testGetTemplatePathNotMapped()
+    public function testGetTemplatePathNotMapped(): void
     {
         $kernelRootDir = __DIR__;
         $templateLogicalName = '@foo/bar.html.twig';

tests/lib/Templating/ThemeTemplateNameResolverTest.php

@@ -9,14 +9,12 @@
 
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\DesignEngine\Templating\ThemeTemplateNameResolver;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class ThemeTemplateNameResolverTest extends TestCase
 {
-    /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|\Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface
-     */
-    private $configResolver;
+    private ConfigResolverInterface&MockObject $configResolver;
 
     protected function setUp(): void
     {
@@ -25,7 +23,7 @@ protected function setUp(): void
         $this->configResolver = $this->createMock(ConfigResolverInterface::class);
     }
 
-    public function templateNameProvider()
+    public function templateNameProvider(): array
     {
         return [
             [null, 'foo.html.twig', 'foo.html.twig'],
@@ -37,7 +35,7 @@ public function templateNameProvider()
     /**
      * @dataProvider templateNameProvider
      */
-    public function testResolveTemplateName($currentDesign, $templateName, $expectedTemplateName)
+    public function testResolveTemplateName(?string $currentDesign, string $templateName, string $expectedTemplateName): void
     {
         $this->configResolver
             ->method('getParameter')
@@ -47,7 +45,7 @@ public function testResolveTemplateName($currentDesign, $templateName, $expected
         self::assertSame($expectedTemplateName, $resolver->resolveTemplateName($templateName));
     }
 
-    public function isTemplateDesignNamespacedProvider()
+    public function isTemplateDesignNamespacedProvider(): array
     {
         return [
             [null, 'foo.html.twig', false],
@@ -60,7 +58,7 @@ public function isTemplateDesignNamespacedProvider()
     /**
      * @dataProvider isTemplateDesignNamespacedProvider
      */
-    public function testIsTemplateDesignNamespaced($currentDesign, $templateName, $expected)
+    public function testIsTemplateDesignNamespaced(?string $currentDesign, string $templateName, bool $expected): void
     {
         $this->configResolver
             ->method('getParameter')