Fix SiteAccess mapping on inline legacy calls with default site access (

ezsystems#157) * [Travis] Add 1.4 to active branches * Fix unit tests * Fix SiteAccess mapping on inline legacy calls with default site access
ezpublishlegacy · Aug 10, 2018 · afa769f · afa769f
1 parent f1a54f9
commit afa769f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/bundle/LegacyMapper/SiteAccess.php b/bundle/LegacyMapper/SiteAccess.php
@@ -87,8 +87,9 @@ public function onBuildKernelWebHandler(PreBuildKernelWebHandlerEvent $event)
         } else {
             $semanticPathinfo = $request->attributes->get('semanticPathinfo', $pathinfo);
         }
+
         $pos = mb_strrpos($pathinfo, $semanticPathinfo);
-        if ($pathinfo != $semanticPathinfo && $pos !== false) {
+        if ($legacyAccessType !== eZSiteAccess::TYPE_DEFAULT && $pathinfo != $semanticPathinfo && $pos !== false) {
             if ($pos === 0) {
                 $pos = mb_strlen($pathinfo) + 1;
             }

diff --git a/bundle/Tests/SiteAccess/LegacyMapperTest.php b/bundle/Tests/SiteAccess/LegacyMapperTest.php
@@ -99,6 +99,7 @@ public function testOnSiteAccessMatchUriPart($pathinfo, $semanticPathinfo, $view
 
     public function siteAccessMatchProvider()
     {
+        // args: $pathinfo, $semanticPathinfo, $siteaccess, $expectedAccess
         return array(
             array(
                 '/some/pathinfo',
@@ -300,6 +301,16 @@ public function siteAccessMatchProvider()
                     'uri_part' => array(),
                 ),
             ),
+            array(
+                '/_fragment',
+                '/',
+                new SiteAccess('site', 'default'),
+                array(
+                    'name' => 'site',
+                    'type' => 1,
+                    'uri_part' => array(),
+                ),
+            ),
         );
     }