ProtectedContent Bundle compatibility for ibexa 4 (#112)

* ProtectedContent Bundle compatibility for ibexa 4

Author: Yassine HANINI

README.md

@@ -25,7 +25,7 @@ Once a Password is set, the Content becomes Protected. In this situation you wil
 Allowing you do:
 
 ```twig
-<h2>{{ ez_content_name(content) }}</h2>
+<h2>{{ ibexa_content_name(content) }}</h2>
 {% if not canReadProtectedContent %}
     <p>This content has been protected by a password</p>
     <div class="protected-content-form">

bundle/Controller/Admin/ProtectedAccessController.php

@@ -64,8 +64,10 @@ public function handle(
         }
 
         return new RedirectResponse(
-            $router->generate('_ez_content_view', ['contentId' => $location->contentId, 'locationId' => $location->id]).
-            '#ez-tab-location-view-protect-content#tab'
+            $router->generate('ibexa.content.view', ['contentId' => $location->contentId,
+                'locationId' => $location->id,
+                ]).
+            '#ibexa-tab-location-view-protect-content#tab'
         );
     }
 
@@ -90,8 +92,10 @@ public function remove(
         );
 
         return new RedirectResponse(
-            $router->generate('_ez_content_view', ['contentId' => $location->contentId, 'locationId' => $location->id]).
-            '#ez-tab-location-view-protect-content#tab'
+            $router->generate('ibexa.content.view', ['contentId' => $location->contentId,
+                'locationId' => $location->id,
+                ]).
+            '#ibexa-tab-location-view-protect-content#tab'
         );
     }
 }

bundle/Core/SiteAccessAwareEntityManagerFactory.php

@@ -19,7 +19,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
 use Doctrine\Persistence\ManagerRegistry as Registry;
-use eZ\Bundle\EzPublishCoreBundle\ApiLoader\RepositoryConfigurationProvider;
+use Ibexa\Bundle\Core\ApiLoader\RepositoryConfigurationProvider;
 
 class SiteAccessAwareEntityManagerFactory
 {

bundle/Core/Tab/ProtectContent.php

@@ -14,8 +14,8 @@
 
 namespace Novactive\Bundle\eZProtectedContentBundle\Core\Tab;
 
-use EzSystems\EzPlatformAdminUi\Tab\AbstractTab;
-use EzSystems\EzPlatformAdminUi\Tab\OrderedTabInterface;
+use Ibexa\Contracts\AdminUi\Tab\AbstractTab;
+use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface;
 use Novactive\Bundle\eZProtectedContentBundle\Core\Compose\EntityManager;
 use Novactive\Bundle\eZProtectedContentBundle\Entity\ProtectedAccess;
 use Novactive\Bundle\eZProtectedContentBundle\Form\ProtectedAccessType;
@@ -66,7 +66,7 @@ public function renderView(array $parameters): string
         $items = $this->entityManager->getRepository(ProtectedAccess::class)->findByContent($content);
 
         return $this->twig->render(
-            '@NovaeZProtectedContent/tabs/protected_content.html.twig',
+            '@ibexadesign/tabs/protected_content.html.twig',
             [
                 'form' => $form->createView(),
                 'items' => $items,

bundle/Entity/eZ/Content.php

@@ -15,8 +15,8 @@
 namespace Novactive\Bundle\eZProtectedContentBundle\Entity\eZ;
 
 use Doctrine\ORM\Mapping as ORM;
-use eZ\Publish\API\Repository\Values\Content\Content as eZContent;
-use eZ\Publish\API\Repository\Values\Content\Location as eZLocation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content as eZContent;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location as eZLocation;
 use Symfony\Component\Validator\Constraints as Assert;
 
 trait Content

bundle/Entity/eZ/ContentInterface.php

@@ -14,8 +14,8 @@
 
 namespace Novactive\Bundle\eZProtectedContentBundle\Entity\eZ;
 
-use eZ\Publish\API\Repository\Values\Content\Content as eZContent;
-use eZ\Publish\API\Repository\Values\Content\Location as eZLocation;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content as eZContent;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location as eZLocation;
 
 interface ContentInterface
 {

bundle/Listener/EntityContentLink.php

@@ -16,7 +16,7 @@
 
 use Doctrine\ORM\Event\LifecycleEventArgs;
 use Doctrine\ORM\Mapping\PostLoad;
-use eZ\Publish\API\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\Repository;
 use Novactive\Bundle\eZProtectedContentBundle\Entity\eZ\ContentInterface;
 
 /**

bundle/Listener/PreContentView.php

@@ -15,9 +15,9 @@
 namespace Novactive\Bundle\eZProtectedContentBundle\Listener;
 
 use Doctrine\ORM\EntityManagerInterface;
-use eZ\Publish\API\Repository\PermissionResolver;
-use eZ\Publish\Core\MVC\Symfony\Event\PreContentViewEvent;
-use eZ\Publish\Core\MVC\Symfony\View\ContentView;
+use Ibexa\Contracts\Core\Repository\PermissionResolver;
+use Ibexa\Core\MVC\Symfony\Event\PreContentViewEvent;
+use Ibexa\Core\MVC\Symfony\View\ContentView;
 use Novactive\Bundle\eZProtectedContentBundle\Entity\ProtectedAccess;
 use Novactive\Bundle\eZProtectedContentBundle\Form\RequestProtectedAccessType;
 use Symfony\Component\Form\FormFactoryInterface;

bundle/NovaeZProtectedContentBundle.php

@@ -30,7 +30,7 @@ class NovaeZProtectedContentBundle extends Bundle
     public function build(ContainerBuilder $container): void
     {
         parent::build($container);
-        $eZExtension = $container->getExtension('ezpublish');
+        $eZExtension = $container->getExtension('ibexa');
         $eZExtension->addPolicyProvider(new PolicyProvider());
     }
 
@@ -51,8 +51,7 @@ public function getContainerExtension(): ?ExtensionInterface
                 $this->extension = false;
             }
         }
-        if ($this->extension) {
-            return $this->extension;
-        }
+
+        return $this->extension;
     }
 }

bundle/Repository/ProtectedAccessRepository.php

@@ -14,9 +14,9 @@
 
 namespace Novactive\Bundle\eZProtectedContentBundle\Repository;
 
-use eZ\Publish\API\Repository\Repository;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Repository;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 use Novactive\Bundle\eZProtectedContentBundle\Entity\ProtectedAccess;
 
 class ProtectedAccessRepository extends EntityRepository