IBX-9266: Add unit tests

Author: barw4

phpstan-baseline.neon

@@ -2556,30 +2556,12 @@ parameters:
 			count: 1
 			path: tests/lib/RichText/Converter/LinkTest.php
 
-		-
-			message: '#^Parameter \#1 \$locationService of class Ibexa\\FieldTypeRichText\\RichText\\Converter\\Link constructor expects Ibexa\\Contracts\\Core\\Repository\\LocationService, PHPUnit\\Framework\\MockObject\\MockObject given\.$#'
-			identifier: argument.type
-			count: 5
-			path: tests/lib/RichText/Converter/LinkTest.php
-
-		-
-			message: '#^Parameter \#2 \$contentService of class Ibexa\\FieldTypeRichText\\RichText\\Converter\\Link constructor expects Ibexa\\Contracts\\Core\\Repository\\ContentService, PHPUnit\\Framework\\MockObject\\MockObject given\.$#'
-			identifier: argument.type
-			count: 5
-			path: tests/lib/RichText/Converter/LinkTest.php
-
 		-
 			message: '#^Parameter \#2 \$function of class Ibexa\\Core\\Base\\Exceptions\\UnauthorizedException constructor expects string, int given\.$#'
 			identifier: argument.type
 			count: 4
 			path: tests/lib/RichText/Converter/LinkTest.php
 
-		-
-			message: '#^Parameter \#3 \$router of class Ibexa\\FieldTypeRichText\\RichText\\Converter\\Link constructor expects Symfony\\Component\\Routing\\RouterInterface, PHPUnit\\Framework\\MockObject\\MockObject given\.$#'
-			identifier: argument.type
-			count: 5
-			path: tests/lib/RichText/Converter/LinkTest.php
-
 		-
 			message: '#^Call to method expects\(\) on an unknown class Ibexa\\FieldTypeRichText\\RichText\\RendererInterface\.$#'
 			identifier: class.notFound

src/bundle/Resources/config/fieldtype_services.yaml

@@ -49,7 +49,6 @@ services:
             - '@ibexa.api.service.location'
             - '@ibexa.api.service.content'
             - '@router'
-            - '@Ibexa\AdminUi\Siteaccess\NonAdminSiteaccessResolver'
             - '@?logger'
         tags:
             - {name: ibexa.field_type.richtext.converter.output.xhtml5, priority: 0}

src/lib/RichText/Converter/Link.php

@@ -10,7 +10,6 @@
 
 use DOMDocument;
 use DOMXPath;
-use Ibexa\AdminUi\Siteaccess\SiteaccessResolverInterface;
 use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException as APINotFoundException;
 use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException as APIUnauthorizedException;
@@ -44,19 +43,15 @@ class Link implements Converter
      */
     protected $logger;
 
-    private SiteaccessResolverInterface $siteAccessResolver;
-
     public function __construct(
         LocationService $locationService,
         ContentService $contentService,
         RouterInterface $router,
-        SiteaccessResolverInterface $siteAccessResolver,
         ?LoggerInterface $logger = null
     ) {
         $this->locationService = $locationService;
         $this->contentService = $contentService;
         $this->router = $router;
-        $this->siteAccessResolver = $siteAccessResolver;
         $this->logger = $logger;
     }
 
@@ -153,7 +148,7 @@ private function generateUrlAliasForLocation(
         ?string $siteaccess
     ): string {
         $params = ['location' => $location];
-        if ($siteaccess !== null) {
+        if (!empty($siteaccess)) {
             $params['siteaccess'] = $siteaccess;
         }
 

tests/lib/RichText/Converter/LinkTest.php

@@ -28,23 +28,23 @@
 class LinkTest extends TestCase
 {
     /**
-     * @return \PHPUnit\Framework\MockObject\MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject&\Ibexa\Core\Repository\ContentService
      */
     protected function getMockContentService()
     {
         return $this->createMock(ContentService::class);
     }
 
     /**
-     * @return \PHPUnit\Framework\MockObject\MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject&\Ibexa\Core\Repository\LocationService
      */
     protected function getMockLocationService()
     {
         return $this->createMock(LocationService::class);
     }
 
     /**
-     * @return \PHPUnit\Framework\MockObject\MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject&\Symfony\Component\Routing\RouterInterface
      */
     protected function getMockRouter()
     {
@@ -144,7 +144,7 @@ public function testLink($input, $output)
     /**
      * @return array
      */
-    public function providerLocationLink()
+    public function providerLocationLink(): array
     {
         return [
             [
@@ -197,6 +197,24 @@ public function providerLocationLink()
   <ezembed>
     <ezlink xlink:href="ezlocation://106#anchor" href_resolved="test#anchor"/>
   </ezembed>
+</section>',
+                106,
+                'test',
+            ],
+            [
+                '<?xml version="1.0" encoding="UTF-8"?>
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml" version="5.0-variant ezpublish-1.0">
+  <title>Link example with empty site access</title>
+  <ezembed>
+    <ezlink xlink:href="ezlocation://106#anchor" xlink:siteaccess=""/>
+  </ezembed>
+</section>',
+                '<?xml version="1.0" encoding="UTF-8"?>
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml" version="5.0-variant ezpublish-1.0">
+  <title>Link example with empty site access</title>
+  <ezembed>
+    <ezlink xlink:href="ezlocation://106#anchor" xlink:siteaccess="" href_resolved="test#anchor"/>
+  </ezembed>
 </section>',
                 106,
                 'test',
@@ -240,10 +258,61 @@ public function testConvertLocationLink($input, $output, $locationId, $urlResolv
         $this->assertEquals($expectedOutputDocument, $outputDocument);
     }
 
+    /**
+     * Test conversion of ezlocation://<id> links with the 'siteaccess' attribute.
+     */
+    public function testConvertLocationLinkWithSiteAccess(): void
+    {
+        $inputDocument = new DOMDocument();
+        $input = '<?xml version="1.0" encoding="UTF-8"?>
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml" version="5.0-variant ezpublish-1.0">
+  <title>Link example with site access</title>
+  <ezembed>
+    <ezlink xlink:href="ezlocation://106#anchor" xlink:siteaccess="site"/>
+  </ezembed>
+</section>';
+        $output = '<?xml version="1.0" encoding="UTF-8"?>
+<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ezxhtml="http://ibexa.co/xmlns/dxp/docbook/xhtml" version="5.0-variant ezpublish-1.0">
+  <title>Link example with site access</title>
+  <ezembed>
+    <ezlink xlink:href="ezlocation://106#anchor" xlink:siteaccess="site" href_resolved="test#anchor"/>
+  </ezembed>
+</section>';
+        $inputDocument->loadXML($input);
+
+        $contentService = $this->getMockContentService();
+        $locationService = $this->getMockLocationService();
+        $router = $this->getMockRouter();
+
+        $location = $this->createMock(APILocation::class);
+
+        $locationService->expects($this->once())
+            ->method('loadLocation')
+            ->with($this->equalTo(106))
+            ->willReturn($location);
+
+        $router->expects($this->once())
+            ->method('generate')
+            ->with(UrlAliasRouter::URL_ALIAS_ROUTE_NAME, [
+                'location' => $location,
+                'siteaccess' => 'site',
+            ])
+            ->willReturn('test');
+
+        $converter = new Link($locationService, $contentService, $router);
+
+        $outputDocument = $converter->convert($inputDocument);
+
+        $expectedOutputDocument = new DOMDocument();
+        $expectedOutputDocument->loadXML($output);
+
+        $this->assertEquals($expectedOutputDocument, $outputDocument);
+    }
+
     /**
      * @return array
      */
-    public function providerBadLocationLink()
+    public function providerBadLocationLink(): array
     {
         return [
             [